5553 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Robin Müller	af5d4e12c5	Merge branch 'develop' into str_ground_config_off_for_fm	2023-03-07 18:54:07 +01:00
Robin Mueller	fd62efcae2	move json init somewhere else	2023-03-07 18:47:16 +01:00
Robin Mueller	1b00029202	move those json thingies into the header	2023-03-07 18:16:35 +01:00
Robin Müller	72174c76cd	Merge pull request 'ACS system updates' (#441) from update_fsfw_submode_mask into develop ... Reviewed-on: #441	2023-03-07 17:23:04 +01:00
Robin Mueller	7476f33905	bump tmtc and fsfw	2023-03-07 17:22:08 +01:00
Robin Mueller	e48d080673	small tweak	2023-03-07 17:08:33 +01:00
Robin Mueller	888ade0bfb	bump fsfw	2023-03-07 17:05:34 +01:00
Robin Mueller	a2fd590280	bump fsfw for possible bugfix	2023-03-07 16:29:19 +01:00
Robin Mueller	23c9e8eed7	remove old code	2023-03-07 16:18:24 +01:00
Robin Mueller	1f8f62457d	remove stopwatch	2023-03-07 16:10:17 +01:00
Robin Mueller	cb43688f38	higher SD card lock timeout	2023-03-07 16:09:44 +01:00
Robin Mueller	f84e7e42d6	Merge remote-tracking branch 'origin/develop' into update_fsfw_submode_mask	2023-03-07 16:05:42 +01:00
Robin Mueller	51317782c3	small bugfix	2023-03-07 16:03:47 +01:00
Robin Müller	97bb255d53	Merge pull request 'Persistent TM store: Always create new file' (#440) from feature_always_create_new_active_file into develop ... Reviewed-on: #440	2023-03-07 15:36:58 +01:00
Robin Mueller	97888953ec	Merge remote-tracking branch 'origin/develop' into feature_always_create_new_active_file	2023-03-07 15:36:40 +01:00
Robin Mueller	112cfa3ee7	changelog update	2023-03-07 15:34:34 +01:00
Robin Mueller	5de7653600	TM store bugfixes	2023-03-07 15:34:08 +01:00
Robin Mueller	bf7e4b4b8c	changelog	2023-03-07 14:20:42 +01:00
Robin Mueller	e3389c32a7	API change setInheritSubmode	2023-03-07 13:56:51 +01:00
Robin Mueller	58db0d7184	Merge remote-tracking branch 'origin/develop' into bugfix_tcs_brd_assy	2023-03-07 10:16:49 +01:00
Robin Mueller	5218202824	bump tmtc	2023-03-07 10:16:32 +01:00
Robin Mueller	c169229107	Merge remote-tracking branch 'origin/develop' into feature_str_assy	2023-03-07 09:50:52 +01:00
Robin Müller	d2daa89d89	Merge pull request 'Decrease of Transmitter Timeout' (#438) from meier/transmitter-timeout-decrease into develop ... Reviewed-on: #438 Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>	2023-03-07 09:49:50 +01:00
Jakob Meier	ca7fbcf6a9	reduced transmitter timeout to 2 minutes	2023-03-07 07:26:09 +01:00
Robin Mueller	db2905c834	order bugfix for TCS subsystem	2023-03-06 17:59:28 +01:00
Robin Mueller	2ccd2a832c	tricky	2023-03-06 17:34:04 +01:00
Robin Mueller	892d2f5939	use flight config for FM	2023-03-06 16:52:58 +01:00
Robin Mueller	cee56f6d02	changelog update	2023-03-06 15:58:19 +01:00
Robin Mueller	3016683db3	ctor fix	2023-03-06 15:57:43 +01:00
Robin Mueller	f66777a23c	changelog	2023-03-06 15:56:37 +01:00
Robin Mueller	e38b39b3b2	command STR_ASSY instead of handler	2023-03-06 15:55:12 +01:00
Robin Mueller	4e9646fe10	add STR assy	2023-03-06 15:51:53 +01:00
Robin Mueller	ca6556c000	add health handling for TCS ASSY	2023-03-06 15:41:56 +01:00
Robin Müller	6aae94823e	Merge pull request 'prep v1.35.1' (#435) from prep_v1.35.1 into develop ... Reviewed-on: #435	2023-03-06 14:50:46 +01:00
Robin Mueller	0dc26ec8b2	prep v1.35.1	2023-03-06 14:42:23 +01:00
Robin Müller	3b5ecb43cc	Merge pull request 'Health handling for ACS brd assy' (#415) from bugfix_acs_brd_ass into develop ... Reviewed-on: #415	2023-03-06 14:36:19 +01:00
Robin Mueller	e7a1c9f402	some tweaks for acs brd devs	2023-03-06 14:25:26 +01:00
Robin Mueller	ff9a5fc1bf	Merge remote-tracking branch 'origin/develop' into bugfix_acs_brd_ass	2023-03-06 14:04:32 +01:00
Robin Müller	2fcba4028c	Merge pull request 'some more tweaks and fixes' (#434) from feature_imtq_assy into develop ... Reviewed-on: #434	2023-03-06 14:02:32 +01:00
Robin Mueller	85d0ac92da	some more tweaks and fixes	2023-03-06 14:02:03 +01:00
Robin Müller	b3a14e9a9b	Merge pull request 'IMTQ Assembly' (#420) from feature_imtq_assy into develop ... Reviewed-on: #420	2023-03-06 13:57:41 +01:00
Robin Mueller	bf61724374	bump tmtc	2023-03-06 13:09:44 +01:00
Robin Mueller	8c9424f02b	bump tmtc	2023-03-06 12:04:06 +01:00
Robin Mueller	350b892bb7	initialize mode table	2023-03-06 11:46:37 +01:00
Robin Mueller	586f04e488	add imtq assy object	2023-03-06 11:39:14 +01:00
Robin Mueller	1f7ab7c2ce	Merge remote-tracking branch 'origin/develop' into feature_imtq_assy	2023-03-06 11:35:12 +01:00
Robin Müller	9d8991491a	Merge pull request 'Watchdog Bugfixes' (#432) from bugfix_watchdog_init into develop ... Reviewed-on: #432	2023-03-06 11:34:38 +01:00
Robin Müller	b64cc8f404	Merge branch 'develop' into bugfix_watchdog_init	2023-03-06 11:34:27 +01:00
Robin Müller	acae88c67c	Merge pull request 'More buffer time' (#433) from bugfix_imtq_timing into develop ... Reviewed-on: #433	2023-03-06 11:33:39 +01:00
Robin Mueller	4fa5aa6b84	remove printout and re-polling	2023-03-06 11:28:25 +01:00