132 Commits

Author	SHA1	Message	Date
Robin Mueller	0f57810a9a	re-run afmt	2022-10-10 17:40:30 +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	49efbc4725	some bugfixes	2022-09-29 13:53: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	269de1782a	Merge branch 'mueller/obsw-update-cmds' into mueller/acs-ss-init	2022-09-27 19:26:23 +02:00
Irini Kosmidou	5f2a0e107d	Merge branch 'scex-additions' of https://egit.irs.uni-stuttgart.de/eive/eive-obsw into scex-additions	2022-09-27 19:18:19 +02:00
Irini Kosmidou	071e00e0ef	dog fixed	2022-09-27 19:17:24 +02:00
ikosmidou	aab2dc6367	Merge branch 'develop' into scex-additions	2022-09-27 19:14:40 +02:00
Irini Kosmidou	308a855d8c	bugfix for scex testcode	2022-09-27 18:54:48 +02:00
Irini Kosmidou	a1cc5b0ca7	Merge remote-tracking branch 'origin/develop' into irini	2022-09-27 17:36:19 +02:00
Robin Mueller	2b41b3ee26	Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init	2022-09-27 14:57:01 +02:00
Robin Mueller	8aa412e865	add CFDP APID to TCP parse list	2022-09-16 18:10:23 +02:00
Robin Mueller	9411b740ae	CFDP integration almost complete	2022-09-16 17:28:43 +02:00
Robin Mueller	54f73661fc	fix init error	2022-09-16 14:01:54 +02:00
Robin Mueller	547fcf22dd	add very basic test in Q7S Test task for FS helpers	2022-09-16 12:05:50 +02:00
Robin Mueller	8ebc62cbe6	new ACS preproc defines	2022-09-15 13:03:22 +02:00
Robin Mueller	57331380c3	small fix for ACS task	2022-09-15 11:38:29 +02:00
Robin Mueller	86d3732f65	retval replacements	2022-08-29 15:57:26 +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	447c4d5c88	all retval replacements	2022-08-24 17:27:47 +02:00
Robin Mueller	c99cb4a81e	schedule ACS controller	2022-08-15 09:58:18 +02:00
Robin Mueller	b133a0538c	Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init	2022-07-04 10:47:23 +02:00
Cleanroom Laptop L15	593cc68b84	rtd dataset	2022-05-31 16:44:57 +02:00
Cleanroom Laptop L15	0e6d2354fc	thermal set fix	2022-05-30 14:32:50 +02:00
Jakob Meier	9e93f1c814	adaptions for EM	2022-05-27 13:44:40 +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	83c7ec8067	solve merge conflicts	2022-05-25 10:12:37 +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	3fff3ba21e	add and schedule PUS11	2022-05-24 15:21:37 +02:00
Robin Mueller	49a06772d2	Merge remote-tracking branch 'origin/develop' into mueller/rtds-update	2022-05-20 08:18:57 +02:00
Robin Mueller	d274f5647d	fix EM cofig	2022-05-19 15:28:02 +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	036024db7e	perm loop not necessary anymore	2022-05-14 17:22:57 +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	1c9f411e75	new RTD handler working	2022-05-14 09:41:28 +02:00
Robin Mueller	e25c492aa4	create and schedule health PUS service	2022-05-12 19:22:20 +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	c1faf65409	schedule new rtd reader component	2022-05-12 12:35:05 +02:00
Robin Mueller	df7e0007d0	schedule RW ASS	2022-05-11 01:02:29 +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	d9085e81a1	Merge remote-tracking branch 'origin/develop' into mueller/heater-health-if	2022-05-08 13:06:47 +02:00
Jakob Meier	f8addd9365	preprocessor define fixes	2022-05-07 13:38:09 +02:00
Jakob Meier	43b0ed4b04	preprocessor define adjustments	2022-05-06 20:33:46 +02:00
Jakob Meier	6dd57a3f5e	fixed merge conflicts	2022-05-06 19:44:18 +02:00