5498 Commits

Author SHA1 Message Date
dd8b6ced8f
set initial mode 2023-03-09 20:51:22 +01:00
42779e6ace Merge pull request 'Bugfix Heater Name' () from bugfix_heater_name into develop
Reviewed-on: 
2023-03-09 16:58:12 +01:00
9f9b1e440a
changelog 2023-03-09 16:52:47 +01:00
ac2c4c7abc
heater name bugfix 2023-03-09 16:43:35 +01:00
087db386d7 Merge pull request 'prep v1.36.0' () from prep_v1.36.0 into develop
Reviewed-on: 
v1.36.0
2023-03-08 19:23:45 +01:00
2f5f47a02c
tmtc bump 2023-03-08 19:20:18 +01:00
8821cc1079
prep v1.36.0 2023-03-08 19:17:24 +01:00
14cea6369a Merge pull request 'add health handling for TCS ASSY' () from bugfix_tcs_brd_assy into develop
Reviewed-on: 
2023-03-08 19:12:34 +01:00
0a37db617b
tmtc update 2023-03-08 19:12:10 +01:00
101117cebe
small fix 2023-03-08 19:06:48 +01:00
4863dad1cd
changelog 2023-03-08 18:59:22 +01:00
c6289e27ae
Merge remote-tracking branch 'origin/develop' into bugfix_tcs_brd_assy 2023-03-08 18:54:52 +01:00
6538005a30 Merge pull request 'Feature: STR Assembly' () from feature_str_assy into develop
Reviewed-on: 
2023-03-08 18:13:33 +01:00
fa5883bdf3
this contains a bit more now 2023-03-08 18:12:37 +01:00
b261a4ecfa
works 2023-03-08 18:09:50 +01:00
a6dfe02128
regenerate csvs 2023-03-08 16:45:21 +01:00
bcd31c9248
wrong object ID 2023-03-08 16:42:30 +01:00
bf73f2ff04 Merge remote-tracking branch 'origin/develop' into feature_str_assy 2023-03-08 16:34:35 +01:00
b2a8c5d7ec Merge pull request 'avoid exceptions' () from bugfix_create_dir_no_exceptions into develop
Reviewed-on: 
Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>
2023-03-08 15:07:56 +01:00
2dd97a55f8
fixes 2023-03-08 14:59:50 +01:00
ccf03b131b
avoid exceptions 2023-03-08 14:50:25 +01:00
c48268ffa9
Merge remote-tracking branch 'origin/develop' into feature_str_assy 2023-03-08 13:28:01 +01:00
97a78fc4c9
Merge remote-tracking branch 'origin/develop' into bugfix_tcs_brd_assy 2023-03-08 13:26:27 +01:00
0bdc6d3d7c Merge pull request 'now fix loss should always be detected and reported' () from bugfix_gps_fix_logic into develop
Reviewed-on: 
Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>
2023-03-08 13:23:45 +01:00
66583e8009 Merge branch 'develop' into bugfix_gps_fix_logic 2023-03-08 13:21:57 +01:00
c0f01a75e4 Merge pull request 'Feature: Reboot events' () from feature_reboot_events into develop
Reviewed-on: 
2023-03-08 13:21:47 +01:00
6a15aa14a2
changelog and new action cmd 2023-03-08 11:37:11 +01:00
11e9d71775
add new reboot events 2023-03-08 11:31:04 +01:00
d30bab7bc0
Merge remote-tracking branch 'origin/develop' into feature_str_assy 2023-03-08 11:13:02 +01:00
a366ef0960
Merge remote-tracking branch 'origin/develop' into bugfix_gps_fix_logic 2023-03-08 11:11:34 +01:00
930f7a5233 Merge pull request 'Star Tracker : Tweaks and fixes' () from startracker_try_cfg_time_reduction into develop
Reviewed-on: 
2023-03-08 01:26:03 +01:00
68f4323d14
changelog 2023-03-08 01:24:41 +01:00
01e97c8381
OFF -> NORMAL transition works now 2023-03-08 01:21:18 +01:00
1b73e7de7d Merge remote-tracking branch 'origin/develop' into startracker_try_cfg_time_reduction 2023-03-08 00:10:17 +01:00
8759f86889 Merge pull request 'lets hope this fixes the occasional error' () from optimize_lock_handling into develop
Reviewed-on: 
2023-03-08 00:09:34 +01:00
a2d5138c71 Merge branch 'develop' into optimize_lock_handling 2023-03-08 00:09:25 +01:00
f5c4e2b788
changelog 2023-03-07 21:07:58 +01:00
af1c18e8cf
now fix loss should always be detected and reported 2023-03-07 21:02:59 +01:00
c562c4a240
lets hope this fixes the occasional error 2023-03-07 19:35:46 +01:00
45e1e7250b
small comment 2023-03-07 19:13:22 +01:00
70e2a3f5f8
bump arcsec str 2023-03-07 19:02:19 +01:00
e6a5847e9c Merge pull request 'use flight config for FM' () from str_ground_config_off_for_fm into develop
Reviewed-on: 
2023-03-07 18:55:32 +01:00
72ae6aee94
changelog update 2023-03-07 18:55:11 +01:00
25e5f8d2a4 Merge branch 'str_ground_config_off_for_fm' of https://egit.irs.uni-stuttgart.de/eive/eive-obsw into str_ground_config_off_for_fm 2023-03-07 18:54:37 +01:00
0f25f95307 Merge remote-tracking branch 'origin/develop' into str_ground_config_off_for_fm 2023-03-07 18:54:32 +01:00
af5d4e12c5 Merge branch 'develop' into str_ground_config_off_for_fm 2023-03-07 18:54:07 +01:00
fd62efcae2
move json init somewhere else 2023-03-07 18:47:16 +01:00
1b00029202
move those json thingies into the header 2023-03-07 18:16:35 +01:00
72174c76cd Merge pull request 'ACS system updates' () from update_fsfw_submode_mask into develop
Reviewed-on: 
2023-03-07 17:23:04 +01:00
7476f33905
bump tmtc and fsfw 2023-03-07 17:22:08 +01:00