5837 Commits

Author SHA1 Message Date
7d29da1263 Merge pull request 'eive-tmtc version' () from note into develop
Reviewed-on: 
2023-03-21 23:45:29 +01:00
dec13c7d13
eive-tmtc version 2023-03-21 23:45:25 +01:00
577e45fec3 Merge pull request 'v1.39.0' () from prep_v1.39.0 into develop
Reviewed-on: 
v1.39.0
2023-03-21 23:40:10 +01:00
8611144a70
re-run generators again 2023-03-21 23:34:59 +01:00
25de385766
pre v1.39.0 2023-03-21 23:32:41 +01:00
4277a98c16 Merge pull request 'PTME Bandwidth Allocation Table' () from ptme_bat_priority_enable into develop
Reviewed-on: 
2023-03-21 14:44:03 +01:00
34cd92840f
belongs in separate PR 2023-03-21 15:43:59 +01:00
3f94bf7855 Merge remote-tracking branch 'origin/develop' into ptme_bat_priority_enable 2023-03-21 15:40:14 +01:00
1b05f45e24
Merge remote-tracking branch 'origin/develop' into ptme_bat_priority_enable 2023-03-21 15:07:11 +01:00
be4a6b2434 Merge pull request 'Update Jenkins Buildjob' () from update_jenkins_buildjob into develop
Reviewed-on: 
2023-03-21 14:39:24 +01:00
f68f4066be
small jenkinsfile fix 2023-03-21 15:30:09 +01:00
3f1f3fa916
update jenkins buildjob 2023-03-21 15:28:14 +01:00
379c868abb Merge pull request 'EM build fix' () from bugfix_em_buld into develop
Reviewed-on: 
2023-03-21 14:18:27 +01:00
c9ec0f67bd
EM build fix 2023-03-21 15:18:17 +01:00
eee829919b Merge pull request 'Stop the Spam!' () from stop-the-spam into develop
Reviewed-on: 
2023-03-21 13:46:48 +01:00
3150261e3e Merge branch 'develop' into stop-the-spam 2023-03-21 13:46:34 +01:00
fe01d3d4b5 Merge pull request 'only set time valid if at least 1 sat in view' () from bugfix_gps into develop
Reviewed-on: 
Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>
2023-03-21 13:41:26 +01:00
bc6b492976 Merge branch 'develop' into bugfix_gps 2023-03-21 13:39:31 +01:00
11ccd1f535 Merge pull request 'I2C fatal error counter' () from feature_i2c_fatal_error_counter into develop
Reviewed-on: 
Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>
2023-03-21 13:38:28 +01:00
b891198bee Merge branch 'develop' into feature_i2c_fatal_error_counter 2023-03-21 13:38:29 +01:00
da831ff789 changelog 2023-03-21 13:25:22 +01:00
078299a07c Merge branch 'develop' into stop-the-spam 2023-03-21 13:24:21 +01:00
2f5ec84237 stop the spam 2023-03-21 13:23:50 +01:00
2694f0cbc8
changelog 2023-03-21 12:56:22 +01:00
6e4d27a454
bump tmtc, additonal changelog entry 2023-03-21 12:55:39 +01:00
ab74382c12
only set time valid if at least 1 sat in view 2023-03-21 12:54:14 +01:00
2be5cdabb0 Merge pull request 'Finite check for MEKF' () from acs-ctrl-finite-check into develop
Reviewed-on: 
2023-03-21 11:47:32 +01:00
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
bb27700cc2
changelog 2023-03-20 18:02:59 +01:00
3e3355a926 Merge remote-tracking branch 'origin/develop' into feature_i2c_fatal_error_counter 2023-03-20 18:02:09 +01:00
55d32a2bb0
Merge remote-tracking branch 'origin/develop' into ptme_bat_priority_enable 2023-03-20 18:01:13 +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