7387 Commits

Author SHA1 Message Date
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
eb46841237 update thermal controller 2023-03-17 17:40:11 +01:00
d44142ac26 Merge remote-tracking branch 'origin/develop' into thermal_controller 2023-03-17 17:36:51 +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
1fd5d065b6
set bat priority bit on transmitter enable 2023-03-17 14:51:00 +01:00
509d144117
SA DEPLY updates 2023-03-17 11:09:29 +01:00
f7be8ea63c
use supervisor fdir
controls the power switch
2023-03-16 19:10:05 +01:00
3c6eb265c7
PLOC SUPV dummy has switch now 2023-03-16 18:52:32 +01:00
b1d2f73b01
move Switches enum 2023-03-16 18:47:51 +01:00
eda1f7e212
syrlinks event works 2023-03-16 18:28:51 +01:00
56a4378a63
that should be transition safe 2023-03-16 18:05:23 +01:00
a16671762d
Merge remote-tracking branch 'origin/develop' into thermal_controller 2023-03-16 17:48:17 +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
350ed59033
handle syrlinks overheating in COM SS 2023-03-15 17:13:25 +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
096253a9a3 Merge branch 'feature_scheduling_tweaks' into thermal_controller 2023-03-15 16:25:13 +01:00
11e5866f31
added some defines 2023-03-15 16:24:46 +01:00
9b8092fb09
this seems to work 2023-03-15 16:24:01 +01:00
f546df50a1 Merge branch 'feature_boot_sequence_eive_sys' into thermal_controller 2023-03-15 16:21:14 +01:00
2f263c6aa6
small bugfix 2023-03-15 16:21:05 +01:00
8201a4140a
works better now 2023-03-15 16:19:37 +01:00
364342855d
maybe force a mode command? 2023-03-15 15:52:20 +01:00
c688a51838 Merge remote-tracking branch 'origin/feature_boot_sequence_eive_sys' into thermal_controller 2023-03-15 15:52:14 +01:00
8c83ec78fd Merge branch 'develop' into feature_boot_sequence_eive_sys 2023-03-15 15:51:38 +01:00
715a69db89
this should cover upper bound checking when heater is off 2023-03-15 15:43:20 +01:00
dc44af5b29
copy and paste error 2023-03-15 15:20:47 +01:00
27f29eda40
small error 2023-03-15 15:16:12 +01:00
50a62b9243
sth broke.. 2023-03-15 15:13:53 +01:00
da7c450e06
most temps should be valid now 2023-03-15 15:00:06 +01:00
a92fa31cb5
better variable names, tweaks for less init events 2023-03-15 14:56:26 +01:00