Commit Graph

8118 Commits

Author SHA1 Message Date
215bc8022b Merge branch 'main' into dev-7.5.0
All checks were successful
EIVE/eive-obsw/pipeline/pr-main This commit looks good
2023-12-06 13:04:51 +01:00
2aca517f71 Merge pull request 'SCEX is back!' (#831) from scex-back-in-the-house into main
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #831
Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>
2023-12-06 12:09:35 +01:00
0931d0ebac
it works
All checks were successful
EIVE/eive-obsw/pipeline/pr-main This commit looks good
2023-12-06 11:54:28 +01:00
263ac1f663
wtf is this 2023-12-06 11:44:28 +01:00
7d54ecaee3
small CMake fix
Some checks failed
EIVE/eive-obsw/pipeline/pr-main There was a failure building this commit
2023-12-06 11:36:35 +01:00
3294cc85fc
bump patch version
Some checks failed
EIVE/eive-obsw/pipeline/head Build queued...
EIVE/eive-obsw/pipeline/pr-main There was a failure building this commit
2023-12-06 11:33:13 +01:00
ddeb9d37bd
it's back! 2023-12-06 11:31:39 +01:00
5b5d891131 Merge pull request 'Once upon a time Robin was made happy' (#800) from make-robin-happy-about-timestuff into dev-7.5.0
All checks were successful
EIVE/eive-obsw/pipeline/pr-main This commit looks good
Reviewed-on: #800
Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>
2023-12-04 11:21:51 +01:00
41c8d7e0dd replaced one ToDo with another one
All checks were successful
EIVE/eive-obsw/pipeline/pr-dev-7.5.0 This commit looks good
2023-12-04 11:15:08 +01:00
4ea1e16880 cpu goes brrrr
All checks were successful
EIVE/eive-obsw/pipeline/pr-dev-7.5.0 This commit looks good
2023-12-04 10:59:44 +01:00
064200e730
yesyes clangd shush now
All checks were successful
EIVE/eive-obsw/pipeline/pr-dev-7.5.0 This commit looks good
2023-12-04 09:58:37 +01:00
aab705ca04 changelog
All checks were successful
EIVE/eive-obsw/pipeline/pr-dev-7.5.0 This commit looks good
2023-12-01 14:22:10 +01:00
6d2bfbcfe6 this is cleaner
All checks were successful
EIVE/eive-obsw/pipeline/pr-dev-7.5.0 This commit looks good
2023-12-01 14:20:11 +01:00
6540d85c99 Merge branch 'dev-7.5.0' into make-robin-happy-about-timestuff
All checks were successful
EIVE/eive-obsw/pipeline/pr-dev-7.5.0 This commit looks good
2023-12-01 13:08:44 +01:00
64069aa5c1 Merge pull request 'Store TLE presistent' (#789) from persistent-tle-store into dev-7.5.0
All checks were successful
EIVE/eive-obsw/pipeline/pr-main This commit looks good
Reviewed-on: #789
Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>
2023-12-01 13:04:56 +01:00
b86ee21da0 fix for failed handling
All checks were successful
EIVE/eive-obsw/pipeline/pr-dev-7.5.0 This commit looks good
2023-12-01 12:56:31 +01:00
d22a2abf64 added action cmd to read tle from file
All checks were successful
EIVE/eive-obsw/pipeline/pr-dev-7.5.0 This commit looks good
2023-12-01 11:42:27 +01:00
c28ff551db small fix 2023-12-01 11:41:35 +01:00
f9ab7962cd Merge branch 'dev-7.5.0' into persistent-tle-store
All checks were successful
EIVE/eive-obsw/pipeline/pr-dev-7.5.0 This commit looks good
2023-12-01 10:30:06 +01:00
03b43da57f Merge branch 'main' into persistent-tle-store
All checks were successful
EIVE/eive-obsw/pipeline/pr-dev-7.5.0 This commit looks good
2023-12-01 10:23:13 +01:00
c6d0357ac9 changelog fix
All checks were successful
EIVE/eive-obsw/pipeline/pr-main This commit looks good
2023-12-01 10:22:52 +01:00
99195565f6 Merge branch 'main' into dev-7.5.0
All checks were successful
EIVE/eive-obsw/pipeline/pr-main This commit looks good
2023-12-01 10:21:14 +01:00
fa727b1e44 bump tmtc to v5.11.0
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2023-11-30 15:47:12 +01:00
cdfdb9a053 Merge pull request 'prep v7.4.0' (#830) from prep_v7.4.0 into main
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #830
2023-11-30 15:45:28 +01:00
325a6ff70b prep v7.4.0
Some checks are pending
EIVE/eive-obsw/pipeline/head Build queued...
EIVE/eive-obsw/pipeline/pr-main This commit looks good
2023-11-30 15:20:50 +01:00
3c24dfad8c Merge branch 'dev-7.5.0' into persistent-tle-store
All checks were successful
EIVE/eive-obsw/pipeline/pr-dev-7.5.0 This commit looks good
2023-11-30 11:51:17 +01:00
cf6c86fabc Merge pull request 'Set B-Side as Default for ACS Board' (#822) from acs-board-b-as-default into dev-7.5.0
All checks were successful
EIVE/eive-obsw/pipeline/pr-main This commit looks good
Reviewed-on: #822
Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>
2023-11-30 11:49:29 +01:00
7239b2e26d small fixes
All checks were successful
EIVE/eive-obsw/pipeline/pr-dev-7.5.0 This commit looks good
2023-11-30 11:43:12 +01:00
c475c8fd8d Merge branch 'dev-7.5.0' into acs-board-b-as-default
All checks were successful
EIVE/eive-obsw/pipeline/pr-dev-7.5.0 This commit looks good
2023-11-29 18:51:25 +01:00
3969d05476 Merge branch 'main' into persistent-tle-store
All checks were successful
EIVE/eive-obsw/pipeline/pr-dev-7.5.0 This commit looks good
2023-11-29 17:13:07 +01:00
f395c71fd0 changelog
All checks were successful
EIVE/eive-obsw/pipeline/pr-dev-7.5.0 This commit looks good
2023-11-29 17:12:10 +01:00
a481fc23f2 bump fsfw 2023-11-29 17:11:46 +01:00
ce620243ce Merge branch 'main' into make-robin-happy-about-timestuff 2023-11-29 17:11:01 +01:00
882c5ce598 changelog
All checks were successful
EIVE/eive-obsw/pipeline/pr-dev-7.5.0 This commit looks good
2023-11-29 17:03:34 +01:00
370eff5204 get correct sd card
All checks were successful
EIVE/eive-obsw/pipeline/pr-dev-7.5.0 This commit looks good
2023-11-29 16:59:03 +01:00
3c8b0d1a71 bump fsfw 2023-11-29 16:58:43 +01:00
bbcb10c2d9 Merge pull request 'run afmt, re-run generators' (#829) from afmt-generators into main
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
EIVE/eive-obsw/pipeline/pr-main This commit looks good
Reviewed-on: #829
Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>
2023-11-29 15:49:46 +01:00
89b6a2de2d
run afmt, re-run generators
Some checks are pending
EIVE/eive-obsw/pipeline/head Build queued...
EIVE/eive-obsw/pipeline/pr-main This commit looks good
2023-11-29 15:15:29 +01:00
4d21d2761f Merge pull request 'Disable Order Check PL PCDU' (#825) from disable-order-check-plpcdu into main
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #825
Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>
2023-11-29 15:13:57 +01:00
e1e8b525b3 Merge branch 'main' into disable-order-check-plpcdu
Some checks are pending
EIVE/eive-obsw/pipeline/pr-main Build queued...
2023-11-29 15:13:37 +01:00
64cb3c6a6c Merge pull request 'revert some changes in com IF' (#826) from revert-str-com-if-changes into main
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #826
Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>
2023-11-29 15:13:27 +01:00
faf213d3b8 Merge branch 'main' into revert-str-com-if-changes
Some checks are pending
EIVE/eive-obsw/pipeline/pr-main Build queued...
2023-11-29 15:13:19 +01:00
a5bbc33e1c Merge pull request 'bugfix for virt channel: clear invalid state' (#827) from virt-channel-bugfix into main
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #827
Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>
2023-11-29 15:13:07 +01:00
d553afcc5b Merge branch 'main' into revert-str-com-if-changes
All checks were successful
EIVE/eive-obsw/pipeline/pr-main This commit looks good
2023-11-29 14:57:05 +01:00
6b6793d93f
Merge remote-tracking branch 'origin/main' into disable-order-check-plpcdu
All checks were successful
EIVE/eive-obsw/pipeline/pr-main This commit looks good
2023-11-29 14:56:44 +01:00
30964a9648 Merge remote-tracking branch 'origin/main' into virt-channel-bugfix
All checks were successful
EIVE/eive-obsw/pipeline/pr-main This commit looks good
2023-11-29 14:52:40 +01:00
66d4fa1806 Merge pull request 'PLOC SUPV extensions' (#821) from ploc-supv-extensions into main
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #821
Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>
2023-11-29 14:52:08 +01:00
210ee7b6d9 Merge remote-tracking branch 'origin/main' into ploc-supv-extensions
All checks were successful
EIVE/eive-obsw/pipeline/pr-main This commit looks good
2023-11-29 14:24:01 +01:00
8c1e7ae418
bump fsfw and tmtc
All checks were successful
EIVE/eive-obsw/pipeline/pr-main This commit looks good
2023-11-29 14:23:29 +01:00
2fd30a2f38
Merge remote-tracking branch 'origin/main' into virt-channel-bugfix
All checks were successful
EIVE/eive-obsw/pipeline/pr-main This commit looks good
2023-11-29 14:21:40 +01:00