5797 Commits

Author SHA1 Message Date
11e1222a7c
re-run generators 2023-03-21 12:46:54 +01:00
573ff334b8 fixes 2023-03-21 11:37:54 +01:00
19dd7a0964 ? 2023-03-21 11:36:10 +01:00
a92f664770 Merge branch 'develop' into acs-ctrl-finite-check 2023-03-21 11:30:26 +01:00
2f990d8bbc Merge pull request 'str transition fixes' () from bugfix_str_mode_transitions into develop
Reviewed-on: 
2023-03-20 17:56:10 +01:00
8482d56fd0
Merge remote-tracking branch 'origin/develop' into bugfix_str_mode_transitions 2023-03-20 17:56:10 +01:00
e349504b41 Merge pull request 'GYR Bias Update' () from new-gyr-bias into develop
Reviewed-on: 
2023-03-20 17:54:46 +01:00
0bb5f08d23
Merge remote-tracking branch 'origin/develop' into bugfix_str_mode_transitions 2023-03-20 17:54:32 +01:00
0dbe6b9854
changelog 2023-03-20 17:53:33 +01:00
043a458f42
seems to work now 2023-03-20 17:51:10 +01:00
c682d75aff
works now 2023-03-20 17:05:57 +01:00
aea4313b7d
some more tweaks 2023-03-20 15:52:58 +01:00
11c54e270f changelog 2023-03-20 15:50:50 +01:00
881a03fbed
direct transition to normal works again 2023-03-20 15:49:41 +01:00
f9e04ed9a2 updated gyr bias 2023-03-20 15:42:45 +01:00
d8f84ed00d
small tweak 2023-03-20 15:17:34 +01:00
b516f12a61
str transition fixes 2023-03-20 15:16:20 +01:00
de4bf6dd55 Merge pull request 'Dual Side to Single Side Bugfix' () from bugfix_dual_to_single_side into develop
Reviewed-on: 
Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>
2023-03-20 14:52:52 +01:00
22f8d256dd
changelog 2023-03-20 13:09:28 +01:00
7cf3247cbd
seems to work now 2023-03-20 13:08:38 +01:00
74bb27e61f
some more fixes 2023-03-20 11:12:19 +01:00
5890e639fe
bugfix for dual to single side transition 2023-03-20 10:17:41 +01:00
a196ab136e Merge pull request 'afmt' () from auto_fmt into develop
Reviewed-on: 
v1.38.0
2023-03-17 18:21:08 +01:00
ba1cc420c4
afmt 2023-03-17 18:20:41 +01:00
1dfbb9474c Merge pull request 'prep v1.38.0' () from prep_v1.38.0 into develop
Reviewed-on: 
2023-03-17 18:09:15 +01:00
0e8859c278
prep v1.38.0 2023-03-17 18:08:08 +01:00
a8af3a8447 Merge pull request '2 seconds are important' () from this_will_break_everything_for_sure into develop
Reviewed-on: 
2023-03-17 17:17:05 +01:00
97a947f5aa 2 seconds are important 2023-03-17 17:16:32 +01:00
5d63160c57 Merge pull request 'refactor power code' () from refactoring_bugfixes_power_switching into develop
Reviewed-on: 
2023-03-17 16:53:50 +01:00
a4ba52e76d Merge branch 'develop' into refactoring_bugfixes_power_switching 2023-03-17 16:30:22 +01:00
a5318b430b Merge pull request 'scheduling tweaks for i2c' () from scheduling_tweaks_i2c into develop
Reviewed-on: 
2023-03-17 16:27:28 +01:00
9cec20a550 scheduling tweaks for i2c 2023-03-17 16:27:00 +01:00
024da6ceef Merge pull request 'SA DEPLY updates' () from sa_deply_updates into develop
Reviewed-on: 
2023-03-17 16:19:01 +01:00
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
9a5901235c changelog 2023-03-17 16:19:04 +01:00
e16ee5d6a5 Merge branch 'develop' into sa_deply_updates 2023-03-17 16:17:37 +01:00
596b6eb46d Merge pull request 'reset the counter' () from bugfix_acs_safe_fail_event into develop
Reviewed-on: 
2023-03-17 16:17:05 +01:00
5b84808d7c reset the counter 2023-03-17 16:16:53 +01:00
ce59e66c05 Merge pull request 'bugfix in SD card manager' () from sdc_man_bugfix_ctor into develop
Reviewed-on: 
2023-03-17 16:05:31 +01:00
af85c883fa bugfix in SD card manager 2023-03-17 16:04:35 +01:00
509d144117
SA DEPLY updates 2023-03-17 11:09:29 +01:00
6da3d6f06a
bump tmtc 2023-03-16 17:45:24 +01:00
2f0aed97dc
Merge remote-tracking branch 'origin/develop' into refactoring_bugfixes_power_switching 2023-03-16 17:44:46 +01:00
52ab77eded Merge pull request 'Init Boot Mode' () from feature_boot_sequence_eive_sys into develop
Reviewed-on: 
2023-03-15 16:29:18 +01:00
4ff1548cf2 Merge branch 'develop' into feature_boot_sequence_eive_sys 2023-03-15 16:29:11 +01:00
f6d1a41cb9 Merge pull request 'tweak scheduling frequencies' () from feature_scheduling_tweaks into develop
Reviewed-on: 
2023-03-15 16:28:36 +01:00
1623dd1c80 Merge branch 'develop' into feature_scheduling_tweaks 2023-03-15 16:28:26 +01:00
94ae33a554 Merge branch 'develop' into refactoring_bugfixes_power_switching 2023-03-15 16:27:54 +01:00
e3c41dd807 Merge pull request 'ACS Safe Ctrl Failure Event' () from acs-safe-mode-failure into develop
Reviewed-on: 
Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>
2023-03-15 16:27:42 +01:00
2f263c6aa6
small bugfix 2023-03-15 16:21:05 +01:00