6192 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
Robin Mueller	59d40a6794	finish acs and com	2023-03-24 21:01:00 +01:00
Robin Mueller	29ba7b87b7	re-run generators	2023-03-24 20:51:03 +01:00
Robin Mueller	87e1746d71	done	2023-03-24 20:50:33 +01:00
Robin Mueller	da386edd05	cleaniiing	2023-03-24 20:03:35 +01:00
Robin Müller	c40a192c48	Merge pull request 'more cleaning' (#521) from cleaning_com into develop ... Reviewed-on: #521	2023-03-24 19:53:31 +01:00
Robin Müller	58058bd402	Merge branch 'develop' into cleaning_com	2023-03-24 19:53:18 +01:00
Robin Mueller	2fa5024236	more cleaning	2023-03-24 19:53:09 +01:00
Robin Mueller	3135bb923e	afmt	2023-03-24 19:49:08 +01:00
Robin Müller	6f368ef01a	Merge pull request 'Cleaning COM' (#520) from cleaning_com into develop ... Reviewed-on: #520	2023-03-24 19:49:01 +01:00
Robin Mueller	d6409b6112	em adaption	2023-03-24 19:47:48 +01:00
Robin Mueller	72598e2ae6	bump tmtc	2023-03-24 19:43:37 +01:00
Robin Mueller	9dc0c5bde0	cleaning up com	2023-03-24 19:37:03 +01:00
Robin Mueller	ec40044b6e	some bugfixes	2023-03-24 19:14:27 +01:00
Robin Mueller	bea0c31a12	Merge remote-tracking branch 'origin/develop' into feature_allow_side_switch	2023-03-24 17:29:13 +01:00
Robin Müller	04e5c212d7	Merge pull request 'bugfix fsfwgen' (#519) from bugfix_fsfwgen_duplicate_events into develop ... Reviewed-on: #519	2023-03-24 15:40:04 +01:00
Robin Mueller	fe1fb9425e	bugfix fsfwgen	2023-03-24 15:39:45 +01:00
Robin Müller	8fa5777634	Merge pull request 'MEKF invalid handling fix' (#514) from mekf-invalid-reset-counter into develop ... Reviewed-on: #514	2023-03-24 15:03:17 +01:00
Robin Mueller	613d7738a8	update generates files	2023-03-24 15:02:13 +01:00
Robin Mueller	b32e0ef4fb	Merge remote-tracking branch 'origin/develop' into mekf-invalid-reset-counter	2023-03-24 15:01:01 +01:00