5526 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Robin Mueller	4a386ad3d1	simplification	2023-03-10 15:21:36 +01:00
Robin Mueller	6452242f2f	fix merge conflict properly	2023-03-10 15:06:05 +01:00
Robin Mueller	79abd05820	Merge remote-tracking branch 'origin/develop' into feature_move_acs_event_handling_to_system	2023-03-10 15:05:11 +01:00
Robin Mueller	793d6feaaa	Merge remote-tracking branch 'origin/develop' into feature_move_acs_event_handling_to_system	2023-03-10 15:03:55 +01:00
Robin Müller	8b6a03a3ab	Merge pull request 'ACS Modes Refactoring' (#455) from acs-modes-refactoring into develop ... Reviewed-on: #455	2023-03-10 15:02:25 +01:00
Robin Mueller	b6fc9d65b7	changelog	2023-03-10 15:01:59 +01:00
Robin Mueller	2e431668dd	larger event queues now	2023-03-10 14:59:52 +01:00
Robin Mueller	37a32bb6e9	bump deps	2023-03-10 14:37:02 +01:00
Robin Mueller	2f4f7f088e	add missing break	2023-03-10 13:58:50 +01:00
Robin Mueller	0b09816b4a	bump tmtc	2023-03-10 13:37:31 +01:00
Robin Mueller	c85c2cf4b6	this should be it for OBSW	2023-03-10 13:17:46 +01:00
meggert	c80426309d	fixed automatic switch between safe and detumble	2023-03-10 12:50:18 +01:00
meggert	ba0bc1b98b	anounce mode changes	2023-03-10 12:46:26 +01:00
meggert	170976566b	acsCtrl does not allow ON or NORMAL anymore	2023-03-10 12:11:10 +01:00
meggert	b1c4241b03	changed perform operation	2023-03-10 11:55:18 +01:00
Robin Müller	98ba4a0449	Merge pull request 'Improve SD card manager' (#454) from improve_sd_card_manager into develop ... Reviewed-on: #454	2023-03-10 11:36:36 +01:00
Robin Mueller	68c728cbdb	Merge remote-tracking branch 'origin/develop' into improve_sd_card_manager	2023-03-10 11:19:29 +01:00
Marius Eggert	340b600599	Merge pull request 'Request MGM measurement twice' (#453) from smaller_tweaks into develop ... Reviewed-on: #453 Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>	2023-03-10 11:18:38 +01:00
Robin Mueller	3caa9dea75	changelog	2023-03-10 11:18:34 +01:00
Robin Mueller	86e48eea6d	changelog update	2023-03-10 11:16:02 +01:00
Robin Mueller	cca8734908	add it at actuate step as well	2023-03-10 11:15:08 +01:00
Robin Mueller	a9b514ddc8	solved in different PR	2023-03-10 11:12:44 +01:00
Robin Mueller	677a3f95bd	always update sd state file in blocking manner	2023-03-10 02:45:21 +01:00
Robin Mueller	fae83a0fca	this should avoid lock issues al together	2023-03-10 02:29:28 +01:00
Robin Mueller	55bd87abb6	smaller tweaks	2023-03-09 23:33:53 +01:00
Robin Müller	38907fc0f5	Merge pull request 'set initial mode for system' (#452) from bugfix_set_initial_mode into develop ... Reviewed-on: #452	2023-03-09 21:14:45 +01:00
Robin Mueller	f8d432f6eb	initial mode is off now	2023-03-09 20:55:28 +01:00
Robin Mueller	dd8b6ced8f	set initial mode	2023-03-09 20:51:22 +01:00
Robin Müller	42779e6ace	Merge pull request 'Bugfix Heater Name' (#451) from bugfix_heater_name into develop ... Reviewed-on: #451	2023-03-09 16:58:12 +01:00
Robin Mueller	9f9b1e440a	changelog	2023-03-09 16:52:47 +01:00
Robin Mueller	ac2c4c7abc	heater name bugfix	2023-03-09 16:43:35 +01:00
Robin Müller	087db386d7	Merge pull request 'prep v1.36.0' (#449) from prep_v1.36.0 into develop ... Reviewed-on: #449	2023-03-08 19:23:45 +01:00
Robin Mueller	2f5f47a02c	tmtc bump	2023-03-08 19:20:18 +01:00
Robin Mueller	8821cc1079	prep v1.36.0	2023-03-08 19:17:24 +01:00
Robin Müller	14cea6369a	Merge pull request 'add health handling for TCS ASSY' (#436) from bugfix_tcs_brd_assy into develop ... Reviewed-on: #436	2023-03-08 19:12:34 +01:00
Robin Mueller	0a37db617b	tmtc update	2023-03-08 19:12:10 +01:00
Robin Mueller	101117cebe	small fix	2023-03-08 19:06:48 +01:00
Robin Mueller	4863dad1cd	changelog	2023-03-08 18:59:22 +01:00
Robin Mueller	1154c0e887	move acs event handling to system	2023-03-08 18:56:27 +01:00
Robin Mueller	c6289e27ae	Merge remote-tracking branch 'origin/develop' into bugfix_tcs_brd_assy	2023-03-08 18:54:52 +01:00
Robin Müller	6538005a30	Merge pull request 'Feature: STR Assembly' (#437) from feature_str_assy into develop ... Reviewed-on: #437	2023-03-08 18:13:33 +01:00
Robin Mueller	fa5883bdf3	this contains a bit more now	2023-03-08 18:12:37 +01:00
Robin Mueller	b261a4ecfa	works	2023-03-08 18:09:50 +01:00
Robin Mueller	a6dfe02128	regenerate csvs	2023-03-08 16:45:21 +01:00
Robin Mueller	bcd31c9248	wrong object ID	2023-03-08 16:42:30 +01:00
Robin Mueller	bf73f2ff04	Merge remote-tracking branch 'origin/develop' into feature_str_assy	2023-03-08 16:34:35 +01:00
Marius Eggert	b2a8c5d7ec	Merge pull request 'avoid exceptions' (#447) from bugfix_create_dir_no_exceptions into develop ... Reviewed-on: #447 Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>	2023-03-08 15:07:56 +01:00
Robin Mueller	2dd97a55f8	fixes	2023-03-08 14:59:50 +01:00
Robin Mueller	ccf03b131b	avoid exceptions	2023-03-08 14:50:25 +01:00
Robin Mueller	c48268ffa9	Merge remote-tracking branch 'origin/develop' into feature_str_assy	2023-03-08 13:28:01 +01:00