6401 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Robin Mueller	8843a0d8c5	resolve merge conflict	2023-03-20 11:48:23 +01:00
Robin Mueller	ec18cb7007	Merge remote-tracking branch 'origin/develop' into feature_i2c_fatal_error_counter	2023-03-20 11:41:11 +01:00
Robin Mueller	74bb27e61f	some more fixes	2023-03-20 11:12:19 +01:00
Robin Mueller	5890e639fe	bugfix for dual to single side transition	2023-03-20 10:17:41 +01:00
Irini Kosmidou	ba9cf5d79d	small changes	2023-03-18 18:03:59 +01:00
Robin Mueller	7c2755db26	not sure this is correct..	2023-03-18 15:30:24 +01:00
Robin Mueller	0b81a92941	doc	2023-03-18 15:13:02 +01:00
Robin Mueller	f39d03afc2	changelog	2023-03-18 14:50:34 +01:00
Robin Mueller	b54ced65f6	Merge remote-tracking branch 'origin/develop' into ptme_bat_priority_enable	2023-03-18 14:47:34 +01:00
Robin Mueller	ff8ebfe67a	docs	2023-03-18 14:40:07 +01:00
Robin Mueller	99e6ea6000	that should do the job	2023-03-18 14:34:09 +01:00
Robin Mueller	4871479ed5	fixes for q7s build	2023-03-18 11:17:24 +01:00
Robin Müller	a196ab136e	Merge pull request 'afmt' (#494) from auto_fmt into develop ... Reviewed-on: #494	2023-03-17 18:21:08 +01:00
Robin Mueller	ba1cc420c4	afmt	2023-03-17 18:20:41 +01:00
Robin Müller	1dfbb9474c	Merge pull request 'prep v1.38.0' (#493) from prep_v1.38.0 into develop ... Reviewed-on: #493	2023-03-17 18:09:15 +01:00
Robin Mueller	0e8859c278	prep v1.38.0	2023-03-17 18:08:08 +01:00
Robin Mueller	eb46841237	update thermal controller	2023-03-17 17:40:11 +01:00
Robin Mueller	d44142ac26	Merge remote-tracking branch 'origin/develop' into thermal_controller	2023-03-17 17:36:51 +01:00
Robin Müller	a8af3a8447	Merge pull request '2 seconds are important' (#492) from this_will_break_everything_for_sure into develop ... Reviewed-on: #492	2023-03-17 17:17:05 +01:00
Robin Mueller	97a947f5aa	2 seconds are important	2023-03-17 17:16:32 +01:00
Robin Müller	5d63160c57	Merge pull request 'refactor power code' (#470) from refactoring_bugfixes_power_switching into develop ... Reviewed-on: #470	2023-03-17 16:53:50 +01:00
Robin Müller	a4ba52e76d	Merge branch 'develop' into refactoring_bugfixes_power_switching	2023-03-17 16:30:22 +01:00
Robin Müller	a5318b430b	Merge pull request 'scheduling tweaks for i2c' (#491) from scheduling_tweaks_i2c into develop ... Reviewed-on: #491	2023-03-17 16:27:28 +01:00
Robin Mueller	9cec20a550	scheduling tweaks for i2c	2023-03-17 16:27:00 +01:00
Robin Müller	024da6ceef	Merge pull request 'SA DEPLY updates' (#488) from sa_deply_updates into develop ... Reviewed-on: #488	2023-03-17 16:19:01 +01:00
Robin Mueller	d544792e29	Merge branch 'sa_deply_updates' of https://egit.irs.uni-stuttgart.de/eive/eive-obsw into sa_deply_updates	2023-03-17 16:19:09 +01:00
Robin Mueller	9a5901235c	changelog	2023-03-17 16:19:04 +01:00
Robin Müller	e16ee5d6a5	Merge branch 'develop' into sa_deply_updates	2023-03-17 16:17:37 +01:00
Robin Müller	596b6eb46d	Merge pull request 'reset the counter' (#490) from bugfix_acs_safe_fail_event into develop ... Reviewed-on: #490	2023-03-17 16:17:05 +01:00
Robin Mueller	5b84808d7c	reset the counter	2023-03-17 16:16:53 +01:00
Robin Müller	ce59e66c05	Merge pull request 'bugfix in SD card manager' (#489) from sdc_man_bugfix_ctor into develop ... Reviewed-on: #489	2023-03-17 16:05:31 +01:00
Robin Mueller	af85c883fa	bugfix in SD card manager	2023-03-17 16:04:35 +01:00
Robin Mueller	1fd5d065b6	set bat priority bit on transmitter enable	2023-03-17 14:51:00 +01:00
Robin Mueller	509d144117	SA DEPLY updates	2023-03-17 11:09:29 +01:00
Robin Mueller	f7be8ea63c	use supervisor fdir ... controls the power switch	2023-03-16 19:10:05 +01:00
Robin Mueller	3c6eb265c7	PLOC SUPV dummy has switch now	2023-03-16 18:52:32 +01:00
Robin Mueller	b1d2f73b01	move Switches enum	2023-03-16 18:47:51 +01:00
Robin Mueller	eda1f7e212	syrlinks event works	2023-03-16 18:28:51 +01:00
Robin Mueller	56a4378a63	that should be transition safe	2023-03-16 18:05:23 +01:00
Robin Mueller	a16671762d	Merge remote-tracking branch 'origin/develop' into thermal_controller	2023-03-16 17:48:17 +01:00
Robin Mueller	6da3d6f06a	bump tmtc	2023-03-16 17:45:24 +01:00
Robin Mueller	2f0aed97dc	Merge remote-tracking branch 'origin/develop' into refactoring_bugfixes_power_switching	2023-03-16 17:44:46 +01:00
Robin Mueller	350ed59033	handle syrlinks overheating in COM SS	2023-03-15 17:13:25 +01:00
Robin Müller	52ab77eded	Merge pull request 'Init Boot Mode' (#474) from feature_boot_sequence_eive_sys into develop ... Reviewed-on: #474	2023-03-15 16:29:18 +01:00
Robin Müller	4ff1548cf2	Merge branch 'develop' into feature_boot_sequence_eive_sys	2023-03-15 16:29:11 +01:00
Robin Müller	f6d1a41cb9	Merge pull request 'tweak scheduling frequencies' (#471) from feature_scheduling_tweaks into develop ... Reviewed-on: #471	2023-03-15 16:28:36 +01:00
Robin Müller	1623dd1c80	Merge branch 'develop' into feature_scheduling_tweaks	2023-03-15 16:28:26 +01:00
Robin Müller	94ae33a554	Merge branch 'develop' into refactoring_bugfixes_power_switching	2023-03-15 16:27:54 +01:00
Robin Müller	e3c41dd807	Merge pull request 'ACS Safe Ctrl Failure Event' (#484) from acs-safe-mode-failure into develop ... Reviewed-on: #484 Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>	2023-03-15 16:27:42 +01:00
Robin Mueller	096253a9a3	Merge branch 'feature_scheduling_tweaks' into thermal_controller	2023-03-15 16:25:13 +01:00