419 Commits

Author	SHA1	Message	Date
Robin Mueller	d432443545	Merge remote-tracking branch 'origin/develop' into heater_handling	2023-01-25 14:07:48 +01:00
Robin Mueller	a761b3f83c	Merge remote-tracking branch 'origin/develop' into mueller/pus-15-tm-storage	2023-01-23 14:22:05 +01:00
Robin Mueller	fe80ff4070	move some config and tweak queue sizes	2023-01-23 11:52:46 +01:00
Robin Mueller	eb6f397bb8	Merge remote-tracking branch 'origin/develop' into mueller/tcs_subsystem	2023-01-20 14:26:42 +01:00
Robin Mueller	4b396884c6	Merge remote-tracking branch 'origin/develop' into heater_handling	2023-01-20 14:25:44 +01:00
Robin Mueller	694d626081	some fixes, this should work now	2023-01-20 11:51:29 +01:00
Robin Mueller	d447f4ba42	now it compiles	2023-01-17 15:55:36 +01:00
Robin Mueller	5431dfc9bd	basic packet routing	2022-12-14 13:51:24 +01:00
Robin Mueller	fa245d3c4a	Merge remote-tracking branch 'origin/develop' into mueller/tcs_subsystem	2022-12-14 11:02:13 +01:00
Robin Mueller	ff9bcd6b14	added remaining missing stores	2022-12-14 10:54:18 +01:00
Robin Mueller	d37f48336b	ok im done	2022-12-13 15:56:40 +01:00
Robin Mueller	8c10cbe37b	the stores only keep references to the current time	2022-12-13 15:24:51 +01:00
Robin Mueller	3965c08bfb	add misc store	2022-12-13 14:19:43 +01:00
Robin Mueller	141a3e9be8	Merge remote-tracking branch 'origin/develop' into heater_handling	2022-12-02 18:05:55 +01:00
Robin Mueller	b1f861b59c	Merge remote-tracking branch 'origin/develop' into mueller/tcs_subsystem	2022-12-02 16:24:50 +01:00
Robin Mueller	c6c2469487	allow consecutive tcp and udp server	2022-12-02 13:55:19 +01:00
Robin Mueller	5be341d991	Merge remote-tracking branch 'origin/develop' into heater_handling	2022-11-28 18:32:14 +01:00
Robin Mueller	b0f000a42f	new PLOC SUPV baudrate 921600	2022-11-28 18:31:44 +01:00
Robin Mueller	41eefda1bc	move obj ID	2022-11-25 10:53:26 +01:00
Robin Mueller	49524abeb7	create temp sens dummies	2022-11-25 10:27:31 +01:00
Robin Mueller	5aa98a1aff	Merge branch 'heater_handling' of https://egit.irs.uni-stuttgart.de/eive/eive-obsw into heater_handling	2022-11-24 14:50:46 +01:00
Irini Kosmidou	f35ed8101a	renamed heater_7_s_band	2022-11-23 19:45:37 +01:00
Robin Mueller	3eed1508fd	bump tmtc and scex baud	2022-11-21 13:37:05 +01:00
Robin Mueller	7d7efaca42	improve hosted SW	2022-11-15 16:44:07 +01:00
Robin Mueller	2f0f837534	Merge remote-tracking branch 'origin/develop' into mueller/tas_ploc_supv_update	2022-11-15 13:42:22 +01:00
Robin Mueller	0c681a06c7	Merge remote-tracking branch 'origin/develop' into mueller/tcs_subsystem	2022-11-14 13:27:23 +01:00
Robin Mueller	0815380044	create all available TMP devices	2022-11-11 16:24:44 +01:00
Robin Mueller	bc32c51460	add basic TCS mode tree framework	2022-11-11 11:23:13 +01:00
Robin Mueller	a07a55eac1	Merge remote-tracking branch 'origin/develop' into mueller/tas_ploc_supv_update	2022-11-10 18:14:53 +01:00
Robin Mueller	ceba3b9dca	renaming of fsfw_hal components	2022-11-10 18:07:59 +01:00
Robin Mueller	ec7ce5ddb6	ploc components now compile for hosted (linux)	2022-11-10 17:32:11 +01:00
Robin Müller	19cf64f5f0	Merge branch 'develop' into mueller/pl-ss	2022-11-10 15:42:08 +01:00
Robin Mueller	4c0bf18268	fix for object IDs	2022-11-10 14:18:58 +01:00
Robin Mueller	b6dc81da0e	keep old baud for FM	2022-11-09 15:23:40 +01:00
Robin Mueller	fe6b13bb81	start fixing this crap	2022-11-03 22:59:51 +01:00
Robin Mueller	d19ddaa46c	Merge branch 'mueller/acs-ss-init' into mueller/pl-ss	2022-10-27 17:00:14 +02:00
Robin Mueller	51572208a9	Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init	2022-10-27 16:59:32 +02:00
Robin Mueller	745fad2a19	use baudrate 115200 for SCEX now	2022-10-27 16:37:16 +02:00
Robin Mueller	db47e56474	Merge branch 'mueller/acs-ss-init' into mueller/pl-ss	2022-10-27 08:31:47 +02:00
Robin Mueller	592cbf6fad	Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init	2022-10-27 08:31:21 +02:00
Robin Mueller	2256ffecbe	scex speed is now set from cfg	2022-10-26 18:32:53 +02:00
Robin Mueller	f4067abdac	Merge branch 'mueller/acs-ss-init' into mueller/pl-ss	2022-10-21 15:37:52 +02:00
Robin Mueller	dd7521cc4b	Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init	2022-10-21 15:37:25 +02:00
Robin Mueller	c0c83faf64	hosted compiles again	2022-10-21 12:01:07 +02:00
Robin Mueller	d190165bf3	Merge remote-tracking branch 'origin/mueller/acs-ss-init' into mueller/pl-ss	2022-10-17 10:52:05 +02:00
Robin Mueller	a8e03ab8fe	Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init	2022-10-17 10:28:53 +02:00
Robin Mueller	43f25e8002	default time windows	2022-10-14 20:37:02 +02:00
Robin Mueller	3cff1c48e9	some more testing and bugfixes	2022-10-14 14:55:37 +02:00
Robin Mueller	5d721706f3	bugfix for autonomous handling	2022-10-14 14:17:20 +02:00
Robin Mueller	773747dd54	implemented alternating GPIO SA Deployment	2022-10-13 17:34:33 +02:00
Robin Mueller	0ebd0a0c0b	completed impl	2022-10-13 15:59:56 +02:00
Robin Mueller	2bc7c7b3ae	continue autonomous depl handling	2022-10-12 15:19:21 +02:00
Robin Mueller	63d660119e	Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init	2022-10-10 17:39:47 +02:00
Robin Mueller	c82c4cf9d1	Merge remote-tracking branch 'origin/develop' into scex-additions	2022-10-10 11:16:19 +02:00
Robin Mueller	20b7f8b46b	Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init	2022-10-10 11:10:07 +02:00
Robin Mueller	454c2f0ad1	Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init	2022-10-10 10:30:45 +02:00
Robin Mueller	fd1d53aa23	Merge remote-tracking branch 'origin/develop' into scex-additions	2022-10-10 10:18:29 +02:00
Robin Mueller	50d41215fa	Merge remote-tracking branch 'origin/develop' into mueller/em-sw-updates	2022-10-10 10:15:55 +02:00
Robin Mueller	aa56c26e25	Merge remote-tracking branch 'origin/develop' into petri_dev	2022-09-29 13:45:42 +02:00
Robin Mueller	151d27985f	Merge remote-tracking branch 'origin/develop' into scex-additions	2022-09-29 13:43:58 +02:00
Robin Mueller	a152553d00	Merge remote-tracking branch 'origin/develop' into mueller/em-sw-updates	2022-09-29 13:32:10 +02:00
Robin Mueller	1463963532	unittest builds now	2022-09-29 13:20:05 +02:00
Robin Mueller	269de1782a	Merge branch 'mueller/obsw-update-cmds' into mueller/acs-ss-init	2022-09-27 19:26:23 +02:00
Robin Mueller	8161d1cd88	finished update cmd impl	2022-09-26 12:26:08 +02:00
Robin Mueller	b3275d015f	start update handler impl	2022-09-26 11:50:35 +02:00
Robin Mueller	05adc91f94	moved definitions	2022-09-26 11:39:17 +02:00
Robin Mueller	8aa412e865	add CFDP APID to TCP parse list	2022-09-16 18:10:23 +02:00
Robin Mueller	2f18347430	move object ID definition	2022-09-16 15:12:32 +02:00
Robin Mueller	65f4daf305	move config define	2022-09-16 12:35:10 +02:00
Robin Mueller	68039d5d4a	clean up config code	2022-09-16 12:28:39 +02:00
Robin Mueller	0b43c3137f	add new constants for CFDP, clean up	2022-09-16 12:22:46 +02:00
Robin Mueller	6b48fb64d8	start integrating cfdp code	2022-09-16 12:14:27 +02:00
Robin Mueller	3ad7a35f0e	Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init	2022-08-29 15:53:57 +02:00
Robin Mueller	975f202ddb	Merge remote-tracking branch 'origin/develop' into mueller/pl-ss	2022-08-29 15:50:55 +02:00
Robin Mueller	bddaf120f4	Merge remote-tracking branch 'origin/develop' into irini	2022-08-24 16:54:39 +02:00
Robin Mueller	7455514797	it compiles now	2022-08-17 09:05:58 +02:00
Robin Mueller	a134f3f100	Merge remote-tracking branch 'origin/develop' into irini	2022-08-16 18:52:16 +02:00
Robin Mueller	b81218e2d4	Merge branch 'mueller/tmtc-stack-refactoring' into petri_dev	2022-08-16 18:48:10 +02:00
Robin Mueller	8ecf04f005	Merge remote-tracking branch 'origin/develop' into petri_dev	2022-08-16 18:48:06 +02:00
Robin Mueller	a669137d5c	Merge remote-tracking branch 'origin/develop' into mueller/tmtc-stack-refactoring	2022-08-16 17:39:35 +02:00
Robin Mueller	676b94b139	map dataset to sid	2022-08-16 11:56:17 +02:00
Robin Mueller	0c371623c6	change PLOC/MPSOC code to using new SP code	2022-08-15 17:25:16 +02:00
Robin Mueller	4649c97205	Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init	2022-08-08 17:12:12 +02:00
Robin Mueller	89b3b2ff42	Merge remote-tracking branch 'origin/develop' into mueller/pl-ss	2022-08-08 17:08:56 +02:00
Robin Mueller	2c3c05e2d4	Merge remote-tracking branch 'origin/develop' into petri_dev	2022-07-14 17:31:08 +02:00
petriVM18	84c4f47ed1	Removed obsolete stuff	2022-07-13 09:26:22 +02:00
Robin Mueller	563e13765d	Merge remote-tracking branch 'origin/develop' into irini	2022-07-08 16:27:50 +02:00
petriVM18	c4b8fa5444	Merged from development, added unit test for config file handler, removed obsolete stuff from handler	2022-07-05 10:02:43 +02:00
Robin Mueller	76a217ffc2	bump changelog and version	2022-07-05 02:14:32 +02:00
Robin Mueller	62f725beea	bump changelog and version	2022-07-04 11:13:26 +02:00
Irini Kosmidou	005e548059	comntinued scex handler	2022-06-21 16:44:14 +02:00
petriVM18	7cd048b03f	Added events for failure of config file handler functions	2022-06-08 09:18:17 +02:00
Robin Müller	4632a56346	Merge branch 'develop' into mueller/acs-ss-init	2022-05-27 15:28:41 +02:00
Robin Müller	10a82eca25	Merge branch 'develop' into mueller/pl-ss	2022-05-27 15:28:23 +02:00
Robin Mueller	9f42ac9875	Merge branch 'mueller/scex-additions' into irini	2022-05-26 12:08:18 +02:00
Robin Mueller	a1faa3a73c	Merge remote-tracking branch 'origin/develop' into irini	2022-05-26 12:08:07 +02:00
Robin Mueller	1276cc2dc6	scex additions	2022-05-26 12:04:27 +02:00
Robin Mueller	97db44e500	fix raspberry pi build	2022-05-26 11:46:28 +02:00
Robin Mueller	5b0f1efefd	Merge remote-tracking branch 'origin/develop' into mueller/pl-ss	2022-05-25 15:48:00 +02:00
Robin Mueller	95121b5120	Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init	2022-05-25 15:47:21 +02:00
Robin Mueller	c86e000f09	Update PL SS	2022-05-25 10:25:40 +02:00
Robin Mueller	581423a40e	Merge branch 'mueller/acs-ss-init' into mueller/pl-ss	2022-05-25 10:09:24 +02:00
Robin Mueller	e1ed532f91	Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init	2022-05-25 10:01:53 +02:00
Robin Mueller	c0da8aef2e	delete obsolete folder	2022-05-24 15:50:39 +02:00
Robin Mueller	3fff3ba21e	add and schedule PUS11	2022-05-24 15:21:37 +02:00
Robin Mueller	28a4f782f9	Merge remote-tracking branch 'origin/develop' into mueller/rtds-update	2022-05-17 17:55:25 +02:00
Robin Mueller	8a5090b8ee	apply new auto-formatter on all files	2022-05-17 13:40:19 +02:00
Robin Mueller	2fa1061c65	Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init	2022-05-16 15:11:24 +02:00
Robin Mueller	f20fcd9a72	Merge remote-tracking branch 'origin/develop' into mueller/rtds-update	2022-05-14 17:07:27 +02:00
Robin Mueller	017cfb9d56	a lot of fixes, but some stuff doesnt work..	2022-05-14 17:04:51 +02:00
Robin Mueller	478975db26	spi setup more stable now	2022-05-14 11:34:25 +02:00
Robin Mueller	51466e68d7	Merge remote-tracking branch 'origin/develop' into mueller/heater-health-if	2022-05-12 14:11:46 +02:00
Robin Mueller	dd67191044	Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init	2022-05-12 14:02:15 +02:00
Robin Mueller	4864394590	renamed heaters	2022-05-09 16:13:33 +02:00
Robin Mueller	71d9553f90	Merge remote-tracking branch 'origin/develop' into mueller/rw-ass	2022-05-08 13:11:56 +02:00
Robin Mueller	646925c571	removed redundant SUS OBJ ID defs	2022-05-08 13:08:49 +02:00
Robin Mueller	d9085e81a1	Merge remote-tracking branch 'origin/develop' into mueller/heater-health-if	2022-05-08 13:06:47 +02:00
Jakob Meier	6dd57a3f5e	fixed merge conflicts	2022-05-06 19:44:18 +02:00
Robin Mueller	355ca27d31	Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init	2022-05-06 08:58:31 +02:00
Robin Mueller	22060b9b16	Merge remote-tracking branch 'origin/develop' into mueller/rw-ass	2022-05-06 01:12:07 +02:00
Robin Mueller	68938c3b42	remove duplicate object ID	2022-05-05 20:27:20 +02:00
Robin Mueller	a11a8c493d	Merge remote-tracking branch 'origin/develop' into mueller/heater-health-if	2022-05-05 19:53:18 +02:00
Robin Mueller	0c82d06ec4	Merge remote-tracking branch 'origin/develop' into mueller/rename-sus	2022-05-05 19:41:36 +02:00
Robin Mueller	b426475ca4	better RTD names	2022-05-05 16:55:08 +02:00
Robin Mueller	a232b9bf98	assign better sus names	2022-05-05 16:46:04 +02:00
Robin Mueller	4c809e354d	better heater obj id names	2022-05-05 16:23:46 +02:00
Robin Mueller	95a634ea7f	update .cproject file	2022-05-05 01:33:18 +02:00
Robin Mueller	bcb6df87b0	update tmtc, gen files and formatting in config file	2022-05-05 00:47:50 +02:00
Robin Mueller	1508a1e147	Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init	2022-05-04 16:43:31 +02:00
Robin Mueller	a6c6325d41	Merge remote-tracking branch 'origin/develop' into mueller/pl-ss	2022-05-04 16:41:08 +02:00
Robin Mueller	1536a0f94b	named heaters	2022-05-03 18:17:10 +02:00
Robin Mueller	ae0120f3ef	Merge branch 'mueller/refactoring-conf-handling' into mueller/heater-health-if	2022-05-03 17:44:02 +02:00
Robin Mueller	0f4fe7694b	Merge remote-tracking branch 'origin/develop' into mueller/refactoring-conf-handling	2022-05-03 00:01:55 +02:00
Robin Mueller	1f8a68dabe	re-use existing enum	2022-05-02 22:55:39 +02:00
Robin Mueller	9449919b2b	Heaters are own objects with HealthIF now	2022-05-02 22:45:27 +02:00
Robin Mueller	0e97c4ad9a	Merge branch 'mueller/acs-ss-init' into mueller/pl-ss	2022-05-02 12:55:15 +02:00
Robin Mueller	7db0872ee3	Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init	2022-05-02 12:49:53 +02:00
Jakob Meier	be752997eb	fixed merge conflicts	2022-04-30 19:12:21 +02:00
Robin Mueller	c1248dd4e1	building new EM config	2022-04-29 15:47:54 +02:00
Irini Kosmidou	f2cb43a52f	scexDataHandler	2022-04-29 15:46:16 +02:00
Robin Mueller	cb47667d01	Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init	2022-04-28 17:56:33 +02:00
Robin Mueller	f01f63d8e8	Merge remote-tracking branch 'origin/develop' into mueller/gomspace-fdir	2022-04-28 17:55:40 +02:00
Robin Mueller	7e2a993211	create rudimentary syrlinks fdir	2022-04-28 15:25:03 +02:00
Jakob Meier	582d2db05f	fixed conflicts	2022-04-28 14:29:23 +02:00
Robin Mueller	2b33d8772c	fixes most warnings for host build	2022-04-26 10:37:25 +02:00
Robin Mueller	0697cca88a	started acs subsystem	2022-04-25 13:36:11 +02:00
Robin Mueller	c262d1ef90	Merge remote-tracking branch 'origin/develop' into mueller/hand-written-subsystem	2022-04-23 12:21:04 +02:00
Jakob.Meier	9fe2de5244	Merge pull request 'CMake git describe support' (#226) from mueller/cmake-git-describe-support into develop ... Reviewed-on: #226 Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>	2022-04-22 20:03:34 +02:00
Robin Mueller	a0db5dcc7c	add first mode sequence for acs ss	2022-04-22 17:00:23 +02:00
Robin Mueller	8bd7d00ab1	forgot to bump version	2022-04-22 16:15:04 +02:00