7365 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Robin Mueller	a52d116857	move CD reset	2023-07-19 15:36:06 +02:00
Robin Mueller	910addc27a	reset the timer	2023-07-18 18:26:57 +02:00
Robin Mueller	b2d2c38c58	changelog	2023-07-18 18:24:36 +02:00
Robin Mueller	a4a5800cba	that should do the job	2023-07-18 11:01:53 +02:00
Robin Müller	2c9df747e8	Merge pull request 'Add RAD sensor dummy' (#745) from add-rad-sensor-dummy into main ... Reviewed-on: #745 Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>	2023-07-18 10:52:05 +02:00
Robin Müller	4fe921b2cc	Merge branch 'main' into add-rad-sensor-dummy	2023-07-18 10:14:33 +02:00
Marius Eggert	e5f8b08e4b	Merge pull request 'sus dummy bugfix' (#746) from small-sus-dummy-bugfix into main ... Reviewed-on: #746 Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>	2023-07-18 10:10:01 +02:00
Robin Mueller	ba0fe5f7da	bump fsfw	2023-07-18 10:08:04 +02:00
Robin Mueller	c9a4cf53ca	changelog	2023-07-18 10:06:35 +02:00
Robin Mueller	fa10b6fd95	sus dummy bugfix	2023-07-18 10:04:31 +02:00
Robin Mueller	5102bd4d69	changelog	2023-07-18 10:03:15 +02:00
Robin Mueller	ba6f55b93b	map rad sensor set	2023-07-18 10:02:14 +02:00
Robin Mueller	2b8a44f390	always schedule rad sensor	2023-07-18 09:57:24 +02:00
Robin Mueller	08c98bd354	add rad sensor dummy	2023-07-18 09:52:26 +02:00
Robin Mueller	0587f40874	add rad sensor dummy	2023-07-18 09:44:44 +02:00
Robin Müller	320b460179	Merge pull request 'small FSFW bump' (#744) from small-fsfw-bump into main ... Reviewed-on: #744 Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>	2023-07-17 13:11:31 +02:00
Robin Mueller	1510de19a6	small FSFW bump	2023-07-17 10:43:48 +02:00
Robin Müller	6ae72db32d	Merge pull request 'Add SCEX handler for EM' (#743) from add-scex-for-em into main ... Reviewed-on: #743 Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>	2023-07-14 15:16:12 +02:00
Robin Mueller	88d1f9940f	changelog	2023-07-14 15:16:08 +02:00
Robin Mueller	8c4a35fc42	some adaptions for SCEX	2023-07-14 14:31:02 +02:00
Robin Mueller	e7c8d15773	add SCEX for EM	2023-07-14 14:04:23 +02:00
Robin Müller	19a86ac29e	Merge pull request 'STR Auto Threshold Config' (#742) from str-auto-threshold-cfg into main ... Reviewed-on: #742 Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>	2023-07-14 14:03:52 +02:00
Robin Mueller	1d4e2a70a2	changelog	2023-07-14 12:49:24 +02:00
Robin Mueller	f1028eb1d9	bump tmtc	2023-07-14 12:47:35 +02:00
Robin Müller	c028a696ce	Merge branch 'main' into str-auto-threshold-cfg	2023-07-14 12:44:08 +02:00
Robin Müller	f832c4522e	Merge pull request 'STR time' (#611) from str_set_time into main ... Reviewed-on: #611 Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>	2023-07-14 12:43:19 +02:00
Robin Mueller	4e58614c56	changelog	2023-07-13 21:21:42 +02:00
Robin Mueller	93ea8519b0	works	2023-07-13 21:19:30 +02:00
Robin Mueller	16dbba6545	done	2023-07-13 21:14:39 +02:00
Robin Mueller	9a451e3d5f	COM error event	2023-07-13 21:09:27 +02:00
Robin Mueller	7870a2015e	add auto threshold config	2023-07-13 20:49:42 +02:00
Robin Mueller	80155285c8	remove an unnecessary tweak	2023-07-13 17:37:13 +02:00
Robin Mueller	c61b0f55a4	some tweaks	2023-07-13 17:35:12 +02:00
Robin Mueller	6d220692d5	changelog	2023-07-13 17:33:04 +02:00
Robin Mueller	db61358639	Merge branch 'smaller-str-fix' into str_set_time	2023-07-13 17:31:53 +02:00
Robin Mueller	fec85ffa6c	correct fix	2023-07-13 17:30:43 +02:00
Robin Mueller	462da5228a	back to default FDIR	2023-07-13 17:23:46 +02:00
Robin Mueller	e9d4104f88	some further investigation	2023-07-13 17:03:56 +02:00
Robin Mueller	39022ce2f6	different max missed reply thresholds for STR FDIR	2023-07-13 16:52:33 +02:00
Robin Mueller	0cefef8a35	rough but possible fix..	2023-07-13 16:38:20 +02:00
Robin Mueller	d3f3a3efd0	Merge branch 'smaller-str-fix' into str_set_time	2023-07-13 14:57:53 +02:00
Robin Mueller	6398532462	only enable STR set for normal mode	2023-07-13 14:57:24 +02:00
Robin Mueller	16f26d7758	afmt	2023-07-13 14:52:32 +02:00
Robin Mueller	0e3980dc37	this works	2023-07-13 14:52:07 +02:00
Robin Mueller	cc7e39c484	Merge remote-tracking branch 'origin/main' into str_set_time	2023-07-13 13:26:41 +02:00
Robin Mueller	448e24e69f	Merge branch 'str_set_time' of https://egit.irs.uni-stuttgart.de/eive/eive-obsw into str_set_time	2023-07-13 13:21:56 +02:00
Robin Müller	70c4f8f3fd	Merge pull request 'v6.1.0' (#740) from prep_v6.1.0 into main ... Reviewed-on: #740	2023-07-13 13:07:07 +02:00
Robin Mueller	1f44533b3e	bump minor version	2023-07-13 12:00:57 +02:00
Robin Mueller	863c0af2a1	what the hell is wrong with the thing?	2023-07-13 10:53:58 +02:00
Robin Mueller	0fb85883a5	always add STR, rename set field	2023-07-13 10:16:52 +02:00