Commit Graph

6613 Commits

Author SHA1 Message Date
51f9d5e1fe Merge branch 'main' into possible_bugfix_dual_lane_assy
Some checks are pending
EIVE/eive-obsw/pipeline/pr-main Build queued...
2023-04-28 15:35:10 +02:00
a17f57cbb5
changelog
Some checks are pending
EIVE/eive-obsw/pipeline/pr-main Build queued...
2023-04-28 15:34:45 +02:00
26f5eff6d5 Merge pull request 'More System Modes' (#612) from more-system-modes into main
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #612
2023-04-28 15:32:03 +02:00
8a0f13bafb Merge branch 'main' into more-system-modes
Some checks are pending
EIVE/eive-obsw/pipeline/pr-main Build queued...
2023-04-28 15:31:51 +02:00
14baa3563c
hello
Some checks are pending
EIVE/eive-obsw/pipeline/pr-main Build started...
2023-04-28 15:30:09 +02:00
7045b6034a
changelog
All checks were successful
EIVE/eive-obsw/pipeline/pr-main This commit looks good
2023-04-28 15:18:47 +02:00
37b9615525
changelog
All checks were successful
EIVE/eive-obsw/pipeline/pr-main This commit looks good
2023-04-28 15:18:16 +02:00
4074e08480 Merge pull request 'Adaption for EM: Add P60 dock without ACU' (#620) from adaption_em_p60_dock_without_acu into main
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #620
Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>
2023-04-28 15:12:46 +02:00
23796345d9
changelog and stop payload tracking
All checks were successful
EIVE/eive-obsw/pipeline/pr-main This commit looks good
2023-04-28 15:04:30 +02:00
b10275ca43
changelog
All checks were successful
EIVE/eive-obsw/pipeline/pr-main This commit looks good
2023-04-28 14:28:05 +02:00
383849c5cb
that is more robust
All checks were successful
EIVE/eive-obsw/pipeline/pr-main This commit looks good
2023-04-28 14:25:14 +02:00
c66cef9129
changelog
All checks were successful
EIVE/eive-obsw/pipeline/pr-main This commit looks good
2023-04-28 14:23:21 +02:00
02ea8a7298
changelog
All checks were successful
EIVE/eive-obsw/pipeline/pr-main This commit looks good
2023-04-28 14:22:21 +02:00
38686ac3f6 Merge branch 'possible_bugfix_dual_lane_assy' into adaption_em_p60_dock_without_acu
All checks were successful
EIVE/eive-obsw/pipeline/pr-main This commit looks good
2023-04-28 14:04:03 +02:00
74d5d70973
this bugfix might be super important
Some checks are pending
EIVE/eive-obsw/pipeline/head Build queued...
EIVE/eive-obsw/pipeline/pr-main This commit looks good
2023-04-28 13:58:08 +02:00
48355e8263 Merge branch 'main' into more-system-modes
All checks were successful
EIVE/eive-obsw/pipeline/pr-main This commit looks good
2023-04-28 10:25:50 +02:00
189a312628
Merge remote-tracking branch 'origin/main' into adaption_em_p60_dock_without_acu
All checks were successful
EIVE/eive-obsw/pipeline/pr-main This commit looks good
2023-04-28 10:23:46 +02:00
a12794281b
changelog
Some checks are pending
EIVE/eive-obsw/pipeline/head Build started...
EIVE/eive-obsw/pipeline/pr-main This commit looks good
2023-04-28 10:20:31 +02:00
fcaabb4e42 Merge remote-tracking branch 'origin/main' into adaption_em_p60_dock_without_acu 2023-04-28 10:20:02 +02:00
6c326489cb
adapt EM SW: GS PCDU added, but use dummy for ACU 2023-04-28 10:18:46 +02:00
862a4f2685 Merge pull request 'Host SW bugfixes' (#618) from try_fix_host_obsw into main
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #618
Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>
2023-04-28 09:37:55 +02:00
5691fe8e72 Merge branch 'main' into more-system-modes
All checks were successful
EIVE/eive-obsw/pipeline/pr-main This commit looks good
2023-04-27 15:40:31 +02:00
2daca272f8
changelog
All checks were successful
EIVE/eive-obsw/pipeline/pr-main This commit looks good
2023-04-27 11:29:18 +02:00
03762f9620
lower live TM handler frequency
All checks were successful
EIVE/eive-obsw/pipeline/pr-main This commit looks good
2023-04-26 17:38:06 +02:00
a296f16e5c
host SW works properly again
All checks were successful
EIVE/eive-obsw/pipeline/pr-main This commit looks good
2023-04-26 17:36:38 +02:00
83f07a6e16
configurable event manager queue depth
All checks were successful
EIVE/eive-obsw/pipeline/pr-main This commit looks good
2023-04-26 17:26:32 +02:00
00dab64628 Merge remote-tracking branch 'origin/main' into try_fix_host_obsw
Some checks failed
EIVE/eive-obsw/pipeline/pr-main There was a failure building this commit
2023-04-26 17:03:35 +02:00
4aafca64a6 Merge pull request 'EM adaptions' (#619) from em_adaptions into main
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #619
2023-04-26 17:03:01 +02:00
6901eae816 Merge remote-tracking branch 'origin/main' into em_adaptions
Some checks are pending
EIVE/eive-obsw/pipeline/pr-main Build queued...
EIVE/eive-obsw/pipeline/head Build started...
2023-04-26 17:02:24 +02:00
7d630ebcf3 EM adaptions
Some checks are pending
EIVE/eive-obsw/pipeline/head Build started...
2023-04-26 17:00:04 +02:00
641b8e847d add back tm funnel handler for hosted build
Some checks failed
EIVE/eive-obsw/pipeline/pr-main There was a failure building this commit
2023-04-26 16:41:40 +02:00
1314268682 host build requires dedicated live TM task..
Some checks failed
EIVE/eive-obsw/pipeline/pr-main There was a failure building this commit
2023-04-26 16:23:50 +02:00
4040304ef0
this is annoying
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
EIVE/eive-obsw/pipeline/pr-main There was a failure building this commit
2023-04-26 13:15:42 +02:00
9672d6d6cc
changelog
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2023-04-26 11:11:09 +02:00
f271242d66 Merge pull request 'the hottest fix' (#614) from hottest_fix_acs into main
Some checks failed
EIVE/eive-obsw/pipeline/pr-main This commit looks good
EIVE/eive-obsw/pipeline/head There was a failure building this commit
Reviewed-on: #614
2023-04-19 18:17:54 +02:00
1756b5edcc patch revision
Some checks are pending
EIVE/eive-obsw/pipeline/pr-main Build queued...
2023-04-19 18:14:28 +02:00
9c1fc44c60 Merge branch 'hottest_fix_acs' of https://egit.irs.uni-stuttgart.de/eive/eive-obsw into hottest_fix_acs
Some checks are pending
EIVE/eive-obsw/pipeline/pr-main Build queued...
2023-04-19 18:12:40 +02:00
f46a705900 changelog 2023-04-19 18:12:32 +02:00
9183d18acc Merge branch 'main' into hottest_fix_acs
Some checks are pending
EIVE/eive-obsw/pipeline/pr-main Build queued...
2023-04-19 18:10:50 +02:00
befa84a74b the hottest fix
Some checks are pending
EIVE/eive-obsw/pipeline/head Build queued...
EIVE/eive-obsw/pipeline/pr-main Build started...
2023-04-19 18:09:57 +02:00
097be17a29 added remaining acs modes as system modes
Some checks are pending
EIVE/eive-obsw/pipeline/head Build started...
EIVE/eive-obsw/pipeline/pr-main This commit looks good
2023-04-19 15:07:21 +02:00
432b400835
bump tmtc
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2023-04-18 10:28:01 +02:00
0eb6b7cccb
bump patch revision to 3
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2023-04-17 11:58:44 +02:00
74ee291983
add tmtc release version
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2023-04-17 11:58:13 +02:00
a146c34140
CI/CD: Use 8 jobs
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2023-04-17 11:55:08 +02:00
61ced11766 Merge pull request 'fixes and tweaks TCS and EM build' (#610) from fixes_and_tweaks into develop
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #610
Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>
2023-04-17 11:53:15 +02:00
468fb096c9
high event severity
Some checks are pending
EIVE/eive-obsw/pipeline/pr-develop Build queued...
2023-04-17 11:44:51 +02:00
4a2dd19a73 Merge branch 'fixes_and_tweaks' of https://egit.irs.uni-stuttgart.de/eive/eive-obsw into fixes_and_tweaks
Some checks are pending
EIVE/eive-obsw/pipeline/pr-develop Build started...
2023-04-17 11:41:26 +02:00
2658cabc9d
remove TODO 2023-04-17 11:41:21 +02:00
dc83061f80 Merge branch 'develop' into fixes_and_tweaks
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2023-04-17 11:38:21 +02:00