|
6452242f2f
|
fix merge conflict properly
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
|
2023-03-10 15:06:05 +01:00 |
|
|
79abd05820
|
Merge remote-tracking branch 'origin/develop' into feature_move_acs_event_handling_to_system
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
|
2023-03-10 15:05:11 +01:00 |
|
|
793d6feaaa
|
Merge remote-tracking branch 'origin/develop' into feature_move_acs_event_handling_to_system
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
|
2023-03-10 15:03:55 +01:00 |
|
|
c85c2cf4b6
|
this should be it for OBSW
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2023-03-10 13:17:46 +01:00 |
|
|
c80426309d
|
fixed automatic switch between safe and detumble
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
|
2023-03-10 12:50:18 +01:00 |
|
|
55bd87abb6
|
smaller tweaks
EIVE/eive-obsw/pipeline/head This commit looks good
|
2023-03-09 23:33:53 +01:00 |
|
|
1154c0e887
|
move acs event handling to system
EIVE/eive-obsw/pipeline/head Build started...
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2023-03-08 18:56:27 +01:00 |
|
|
c6289e27ae
|
Merge remote-tracking branch 'origin/develop' into bugfix_tcs_brd_assy
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2023-03-08 18:54:52 +01:00 |
|
|
b261a4ecfa
|
works
EIVE/eive-obsw/pipeline/pr-develop Build started...
|
2023-03-08 18:09:50 +01:00 |
|
|
97a78fc4c9
|
Merge remote-tracking branch 'origin/develop' into bugfix_tcs_brd_assy
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2023-03-08 13:26:27 +01:00 |
|
|
d30bab7bc0
|
Merge remote-tracking branch 'origin/develop' into feature_str_assy
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2023-03-08 11:13:02 +01:00 |
|
|
e3389c32a7
|
API change setInheritSubmode
EIVE/eive-obsw/pipeline/head There was a failure building this commit
|
2023-03-07 13:56:51 +01:00 |
|
|
2ccd2a832c
|
tricky
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2023-03-06 17:34:04 +01:00 |
|
|
3016683db3
|
ctor fix
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2023-03-06 15:57:43 +01:00 |
|
|
4e9646fe10
|
add STR assy
EIVE/eive-obsw/pipeline/head There was a failure building this commit
|
2023-03-06 15:51:53 +01:00 |
|
|
ca6556c000
|
add health handling for TCS ASSY
EIVE/eive-obsw/pipeline/head Build started...
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2023-03-06 15:41:56 +01:00 |
|
|
e7a1c9f402
|
some tweaks for acs brd devs
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2023-03-06 14:25:26 +01:00 |
|
|
ff9a5fc1bf
|
Merge remote-tracking branch 'origin/develop' into bugfix_acs_brd_ass
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2023-03-06 14:04:32 +01:00 |
|
|
85d0ac92da
|
some more tweaks and fixes
EIVE/eive-obsw/pipeline/head Build queued...
|
2023-03-06 14:02:03 +01:00 |
|
|
350b892bb7
|
initialize mode table
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2023-03-06 11:46:37 +01:00 |
|
|
0b2aff56e5
|
remove non-generic function
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2023-03-05 20:05:37 +01:00 |
|
|
e8da0885eb
|
Merge remote-tracking branch 'origin/develop' into bugfix_acs_brd_ass
|
2023-03-03 17:05:49 +01:00 |
|
|
f209ac6b2d
|
Merge remote-tracking branch 'origin/develop' into feature_imtq_assy
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2023-03-03 17:03:55 +01:00 |
|
|
04e3d2486d
|
Merge remote-tracking branch 'origin/develop' into feature_imtq_assy
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2023-03-02 18:40:11 +01:00 |
|
|
c4ef164f41
|
Merge branch 'develop' into rework_lock_handling
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2023-03-02 18:29:45 +01:00 |
|
|
d55daebabf
|
Merge remote-tracking branch 'origin/develop' into bugfix_sus_brd_assy
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2023-03-02 18:04:29 +01:00 |
|
|
35caddbfc4
|
handle children lost mode
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2023-03-02 17:27:47 +01:00 |
|
|
196aca241e
|
add missing command table init
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2023-03-02 17:25:32 +01:00 |
|
|
e2cb88da0e
|
imtq assy added
EIVE/eive-obsw/pipeline/head This commit looks good
|
2023-03-02 16:08:31 +01:00 |
|
|
f2ffb12219
|
imtq assy init
|
2023-03-02 16:01:36 +01:00 |
|
|
dfb1e88f55
|
lockslockslocks
EIVE/eive-obsw/pipeline/head This commit looks good
|
2023-03-02 15:32:12 +01:00 |
|
|
26d8e852dc
|
actually call the function
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2023-03-02 15:02:02 +01:00 |
|
|
0fc17624f3
|
sus brd assy health handling
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2023-03-02 14:59:27 +01:00 |
|
|
e52c909580
|
health handling for ACS brd assy
EIVE/eive-obsw/pipeline/head Build queued...
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2023-03-02 13:32:02 +01:00 |
|
|
90175e5c9d
|
add health handling
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
|
2023-03-02 11:27:19 +01:00 |
|
|
24b939c50b
|
add syrlinks assembly
EIVE/eive-obsw/pipeline/head This commit looks good
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
|
2023-03-01 18:06:36 +01:00 |
|
|
11f476878d
|
rework SUS polling
EIVE/eive-obsw/pipeline/head Build started...
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2023-02-28 19:14:15 +01:00 |
|
|
6e6dff56f2
|
Merge remote-tracking branch 'origin/develop' into rework_acs_board_polling
|
2023-02-28 11:53:10 +01:00 |
|
Jakob Meier
|
316971c6bc
|
* added event when transmitter is turned on due to bitlock detection
* added event when tx timer has expired
|
2023-02-27 07:49:09 +01:00 |
|
|
828b6adf77
|
vieles
EIVE/eive-obsw/pipeline/head This commit looks good
|
2023-02-26 14:55:33 +01:00 |
|
Jakob Meier
|
7af7eff316
|
Merge branch 'develop' into meier/pdec-config-persistent
|
2023-02-24 10:03:09 +01:00 |
|
|
59b80807ba
|
possible fix but not sure
EIVE/eive-obsw/pipeline/head This commit looks good
|
2023-02-23 18:34:28 +01:00 |
|
|
33d552693f
|
Merge branch 'develop' into bugfix_shadowed_variables_dual_assys
EIVE/eive-obsw/pipeline/pr-develop Build started...
|
2023-02-23 15:53:09 +01:00 |
|
|
91af3ac497
|
skip private retval
EIVE/eive-obsw/pipeline/head This commit looks good
|
2023-02-23 15:40:06 +01:00 |
|
Jakob Meier
|
5db1f71854
|
run clang formatting script
EIVE/eive-obsw/pipeline/head There was a failure building this commit
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
|
2023-02-23 15:27:24 +01:00 |
|
|
0ee7bdad0a
|
Merge remote-tracking branch 'origin/develop' into bugfix_shadowed_variables_dual_assys
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2023-02-23 15:27:15 +01:00 |
|
Jakob Meier
|
481e546e6d
|
Merge branch 'develop' into meier/pdec-config-persistent
|
2023-02-23 15:24:53 +01:00 |
|
Jakob Meier
|
513dcf9be1
|
bugfixes in pdec handler parameter commands
|
2023-02-23 15:19:48 +01:00 |
|
|
66d3b06f9e
|
Merge remote-tracking branch 'origin/develop' into meier/com-ss
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2023-02-23 13:06:22 +01:00 |
|
|
9f83a49690
|
remove shadowed member variables
EIVE/eive-obsw/pipeline/head Build started...
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2023-02-23 11:46:30 +01:00 |
|