6328 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
meggert	19dd7a0964	?	2023-03-21 11:36:10 +01:00
meggert	a92f664770	Merge branch 'develop' into acs-ctrl-finite-check	2023-03-21 11:30:26 +01:00
Robin Mueller	bb27700cc2	changelog	2023-03-20 18:02:59 +01:00
Robin Mueller	3e3355a926	Merge remote-tracking branch 'origin/develop' into feature_i2c_fatal_error_counter	2023-03-20 18:02:09 +01:00
Robin Mueller	55d32a2bb0	Merge remote-tracking branch 'origin/develop' into ptme_bat_priority_enable	2023-03-20 18:01:13 +01:00
Robin Mueller	68e68afdd6	changelog	2023-03-20 17:59:46 +01:00
Robin Mueller	fede1fc4b3	Merge branch 'tweak_papb_busy_polling' of https://egit.irs.uni-stuttgart.de/eive/eive-obsw into tweak_papb_busy_polling	2023-03-20 17:58:30 +01:00
Robin Mueller	394f0498c5	small compile error	2023-03-20 17:58:23 +01:00
Robin Müller	809e1ecf88	Merge branch 'develop' into tweak_papb_busy_polling	2023-03-20 17:57:47 +01:00
Robin Mueller	a75b4fd951	Merge remote-tracking branch 'origin/develop' into tweak_papb_busy_polling	2023-03-20 17:57:21 +01:00
Robin Müller	2f990d8bbc	Merge pull request 'str transition fixes' (#498) from bugfix_str_mode_transitions into develop ... Reviewed-on: #498	2023-03-20 17:56:10 +01:00
Robin Mueller	8482d56fd0	Merge remote-tracking branch 'origin/develop' into bugfix_str_mode_transitions	2023-03-20 17:56:10 +01:00
Robin Müller	e349504b41	Merge pull request 'GYR Bias Update' (#499) from new-gyr-bias into develop ... Reviewed-on: #499	2023-03-20 17:54:46 +01:00
Robin Mueller	0bb5f08d23	Merge remote-tracking branch 'origin/develop' into bugfix_str_mode_transitions	2023-03-20 17:54:32 +01:00
Robin Mueller	0dbe6b9854	changelog	2023-03-20 17:53:33 +01:00
Robin Mueller	043a458f42	seems to work now	2023-03-20 17:51:10 +01:00
Robin Mueller	c682d75aff	works now	2023-03-20 17:05:57 +01:00
Robin Mueller	aea4313b7d	some more tweaks	2023-03-20 15:52:58 +01:00
meggert	11c54e270f	changelog	2023-03-20 15:50:50 +01:00
Robin Mueller	881a03fbed	direct transition to normal works again	2023-03-20 15:49:41 +01:00
meggert	f9e04ed9a2	updated gyr bias	2023-03-20 15:42:45 +01:00
Robin Mueller	d8f84ed00d	small tweak	2023-03-20 15:17:34 +01:00
Robin Mueller	b516f12a61	str transition fixes	2023-03-20 15:16:20 +01:00
Marius Eggert	de4bf6dd55	Merge pull request 'Dual Side to Single Side Bugfix' (#497) from bugfix_dual_to_single_side into develop ... Reviewed-on: #497 Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>	2023-03-20 14:52:52 +01:00
Robin Mueller	159da20ef2	some tweaks for busy handling	2023-03-20 14:31:10 +01:00
Robin Mueller	22f8d256dd	changelog	2023-03-20 13:09:28 +01:00
Robin Mueller	7cf3247cbd	seems to work now	2023-03-20 13:08:38 +01:00
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