6061 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Robin Mueller	520b41c53b	transition basic mode handling	2023-03-28 17:21:43 +02:00
Robin Mueller	28d7dcf177	Merge remote-tracking branch 'origin/develop' into thermal_controller	2023-03-28 16:37:09 +02:00
Irini Kosmidou	36d7852c1d	changes	2023-03-28 16:35:49 +02:00
Robin Müller	6a37503154	Merge pull request 'undefined init mode for power switcher' (#536) from bump_fsfw_power_switcher_component_undefined_init_mode into develop ... Reviewed-on: #536	2023-03-28 15:28:57 +02:00
Robin Mueller	12c7ed2cb5	undefined init mode	2023-03-28 15:28:28 +02:00
Irini Kosmidou	5c97020087	small change	2023-03-28 15:11:21 +02:00
Robin Müller	6dbb9b5e37	Merge pull request 'add some docs' (#532) from com_docs into develop ... Reviewed-on: #532	2023-03-27 17:06:19 +02:00
Robin Mueller	31e2205e71	Merge remote-tracking branch 'origin/develop' into com_docs	2023-03-27 17:06:35 +02:00
Robin Müller	be41d4f819	Merge pull request 'shorter delay between file swaps' (#531) from tweaks_tm_dumps into develop ... Reviewed-on: #531	2023-03-27 17:03:09 +02:00
Robin Mueller	5adde9c1c4	Merge remote-tracking branch 'origin/develop' into tweaks_tm_dumps	2023-03-27 17:03:15 +02:00
Robin Müller	8dfdc62125	Merge pull request 'ACS board devs go to on first' (#530) from improvement_acs_devs_go_to_on into develop ... Reviewed-on: #530	2023-03-27 17:02:15 +02:00
Robin Mueller	f8ff9c355c	shorter delay between file swaps	2023-03-27 16:10:50 +02:00
Robin Mueller	e0f5d049e3	compile fixes	2023-03-27 15:15:20 +02:00
Robin Mueller	4c85b5d951	add some docs	2023-03-27 15:10:35 +02:00
Robin Mueller	80ad923181	SUS goes to MODE_ON in startup now	2023-03-27 15:03:54 +02:00
Robin Mueller	ec95792bc3	ACS board devs go to on first	2023-03-27 15:00:40 +02:00
Robin Müller	68bc7f7682	Merge pull request 'enable periodic HK' (#525) from feature_set_up_periodic_hk into develop ... Reviewed-on: #525	2023-03-27 13:50:51 +02:00
Robin Mueller	efa3c11c7a	bump tmtc again	2023-03-26 20:10:03 +02:00
Robin Mueller	19723e88d3	configurable HK service queue depth	2023-03-26 20:05:24 +02:00
Robin Mueller	b469455b9b	bump tmtc	2023-03-26 20:01:32 +02:00
Robin Müller	861bee8083	Merge branch 'develop' into thermal_controller	2023-03-26 16:58:30 +02:00
Robin Müller	bb8d4fbc57	Merge branch 'develop' into feature_set_up_periodic_hk	2023-03-26 16:58:18 +02:00
Robin Müller	dc92770c01	Merge pull request 'bugfix EM and Host build' (#528) from bugfix_em_build into develop ... Reviewed-on: #528	2023-03-26 16:58:09 +02:00
Robin Mueller	935f49094f	fix host build as well	2023-03-26 16:58:05 +02:00
Robin Mueller	11acfbbc91	bugfix EM build	2023-03-26 16:54:40 +02:00
Robin Mueller	3e7901f060	Merge remote-tracking branch 'origin/develop' into thermal_controller	2023-03-26 16:52:39 +02:00
Robin Mueller	58c343b8de	Merge remote-tracking branch 'origin/develop' into feature_set_up_periodic_hk	2023-03-26 16:45:28 +02:00
Robin Müller	0ef3104e2e	Merge pull request 'cleanup everything' (#527) from cleanup_everything into develop ... Reviewed-on: #527	2023-03-26 16:43:29 +02:00
Robin Mueller	b92924881b	changelog	2023-03-26 16:43:36 +02:00
Robin Mueller	63b50e6101	clean up op done	2023-03-26 16:42:00 +02:00
Robin Mueller	e7eaaa9295	finished power clean up	2023-03-26 16:16:54 +02:00
Robin Mueller	7c700a9e19	clean up power code	2023-03-26 16:13:54 +02:00
Robin Müller	9af7b6a39b	Merge pull request 'more ACS cleaning' (#526) from more_acs_cleaning into develop ... Reviewed-on: #526	2023-03-26 16:06:02 +02:00
Robin Mueller	079da3b0e4	more ACS cleaning ... - STR code is now in mission folder, but still only conpiled for Q7S code because wire library is proprietary	2023-03-26 16:05:01 +02:00
Robin Mueller	cb2fe300b2	enable periodic HK	2023-03-26 15:28:00 +02:00
Robin Müller	e9901f3c85	Merge pull request 'v1.40.0' (#524) from prep_v1.40.0 into develop ... Reviewed-on: #524	2023-03-24 22:34:47 +01:00
Robin Mueller	c37f26021c	changelog	2023-03-24 21:36:31 +01:00
Robin Mueller	58e427d51d	small order fix	2023-03-24 21:35:28 +01:00
Robin Mueller	3d93431278	prep v1.40.0	2023-03-24 21:34:03 +01:00
Robin Müller	b301cbc750	Merge pull request 'improve sd lock handling again' (#523) from another_imrovement_sd_lock_handling into develop ... Reviewed-on: #523	2023-03-24 21:29:39 +01:00
Robin Mueller	e69812b48b	improve sd lock handling again	2023-03-24 21:29:13 +01:00
Robin Mueller	0301c18af2	resolve some merge conflicts	2023-03-24 21:20:27 +01:00
Robin Mueller	f71972609c	Merge remote-tracking branch 'origin/develop' into thermal_controller	2023-03-24 21:15:29 +01:00
Robin Müller	61c26fe53a	Merge pull request 'Dual Lane Boards: Allow Side Switches' (#412) from feature_allow_side_switch into develop ... Reviewed-on: #412	2023-03-24 21:10:55 +01:00
Robin Mueller	40c000b183	changelog	2023-03-24 21:10:59 +01:00
Robin Mueller	bee8838010	Merge remote-tracking branch 'origin/develop' into feature_allow_side_switch	2023-03-24 21:09:43 +01:00
Robin Müller	ff25f6ff3f	Merge pull request 'Finish COM and ACS restructuring' (#522) from cleaning_com_acs into develop ... Reviewed-on: #522	2023-03-24 21:08:32 +01:00
Robin Mueller	dd28767d68	changelog	2023-03-24 21:08:44 +01:00
Robin Mueller	13f269e6aa	fix unittest	2023-03-24 21:08:00 +01:00
Robin Mueller	6331aef987	EM bugfix	2023-03-24 21:05:11 +01:00