Commit Graph

2407 Commits

Author SHA1 Message Date
5da55c3c99 Merge pull request 'PLOC SUPV TM handling' (#293) from ploc-supv-tm-handling into main
All checks were successful
EIVE/-/pipeline/head This commit looks good
Reviewed-on: #293
Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>
2024-04-29 11:44:20 +02:00
3b903e5639 Merge branch 'main' into ploc-supv-tm-handling
Some checks are pending
EIVE/-/pipeline/pr-main Build queued...
2024-04-29 11:43:14 +02:00
da35c7fdf1 Merge pull request 'added missing act cmd' (#295) from gnss-improv into main
All checks were successful
EIVE/-/pipeline/head This commit looks good
Reviewed-on: #295
2024-04-29 11:42:51 +02:00
8c7cbd1bd6 changelog
Some checks are pending
EIVE/-/pipeline/pr-main Build queued...
2024-04-29 11:41:03 +02:00
ba0a3e35d2 cleanup
Some checks are pending
EIVE/-/pipeline/pr-main Build started...
2024-04-29 11:40:00 +02:00
fc2667c150 Merge branch 'main' into gnss-improv
Some checks are pending
EIVE/-/pipeline/pr-main Build started...
2024-04-29 11:33:10 +02:00
3c0ac91227 Merge pull request 'CLock Events' (#291) from clock-events into main
All checks were successful
EIVE/-/pipeline/head This commit looks good
Reviewed-on: #291
Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>
2024-04-17 16:43:29 +02:00
f61c485979 Merge branch 'main' into clock-events
All checks were successful
EIVE/-/pipeline/pr-main This commit looks good
2024-04-17 16:20:09 +02:00
2ebbf750bd
handling for new clock events 2024-04-17 16:19:58 +02:00
847fccbe66 Merge pull request 'test script' (#294) from bestest-script into main
All checks were successful
EIVE/-/pipeline/head This commit looks good
Reviewed-on: #294
Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>
2024-04-17 16:19:24 +02:00
c8292f4ee1 Merge branch 'main' into bestest-script
All checks were successful
EIVE/-/pipeline/pr-main This commit looks good
2024-04-17 15:05:45 +02:00
3700769e46 Merge remote-tracking branch 'origin/main' into ploc-supv-tm-handling
Some checks failed
EIVE/-/pipeline/head Build queued...
EIVE/-/pipeline/pr-main There was a failure building this commit
2024-04-17 15:04:57 +02:00
1cafdc817f
clock events
All checks were successful
EIVE/-/pipeline/head This commit looks good
EIVE/-/pipeline/pr-main This commit looks good
2024-04-10 17:34:54 +02:00
5967dede97
add new events for clock handling
All checks were successful
EIVE/-/pipeline/head This commit looks good
2024-04-10 17:27:24 +02:00
a8d0143b1e Merge pull request 'Prep v6.2.0' (#290) from prep-v6.2.0 into main
All checks were successful
EIVE/-/pipeline/head This commit looks good
Reviewed-on: #290
2024-04-10 11:51:24 +02:00
a0ad5f8948 reran gens 2024-04-10 11:50:15 +02:00
20ecef5838 linter
Some checks are pending
EIVE/-/pipeline/head Build queued...
2024-04-10 11:48:04 +02:00
6d97841cbf bump version
Some checks are pending
EIVE/-/pipeline/head Build queued...
2024-04-10 11:47:05 +02:00
512f0e4530 changelog 2024-04-10 11:46:35 +02:00
e2f0221681 Merge pull request 'GNSS Fixes' (#289) from gnss-fixes into main
All checks were successful
EIVE/-/pipeline/head This commit looks good
Reviewed-on: #289
Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>
2024-04-10 11:34:58 +02:00
e9eb45c088 Merge branch 'main' into gnss-fixes 2024-04-10 11:34:39 +02:00
ea72087d87 Merge pull request 'allow setting health for payload components' (#287) from set-health-cmd-payload into main
All checks were successful
EIVE/-/pipeline/head This commit looks good
Reviewed-on: #287
Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>
2024-04-10 11:34:30 +02:00
d48c029b85 Merge branch 'main' into gnss-fixes
Some checks are pending
EIVE/-/pipeline/pr-main Build queued...
2024-04-10 11:30:01 +02:00
b5f4f2ddab
changelog
Some checks are pending
EIVE/-/pipeline/pr-main Build started...
2024-04-10 11:29:19 +02:00
64dd19bd12 Merge branch 'main' into set-health-cmd-payload
Some checks are pending
EIVE/-/pipeline/pr-main Build started...
2024-04-10 11:28:43 +02:00
102821fc71 Merge pull request 'Some PLOC commanding fixes' (#288) from ploc-tree-test into main
All checks were successful
EIVE/-/pipeline/head This commit looks good
Reviewed-on: #288
Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>
2024-04-09 14:41:10 +02:00
24f3abdd5a Merge branch 'main' into ploc-tree-test 2024-04-09 14:40:36 +02:00
a880db5655 changelog
All checks were successful
EIVE/-/pipeline/pr-main This commit looks good
2024-04-09 14:34:23 +02:00
4e0cbb1034 Merge branch 'main' into gnss-fixes 2024-04-09 14:33:33 +02:00
96636d59e9 Merge pull request 'relative timeshift' (#286) from relative-timeshift into main
All checks were successful
EIVE/-/pipeline/head This commit looks good
Reviewed-on: #286
Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>
2024-04-09 14:32:28 +02:00
7dfdd40963 fixed PLOC mode commanding
Some checks are pending
EIVE/-/pipeline/pr-main Build queued...
2024-04-09 14:31:41 +02:00
6282686f2f lets just change the tmtc structure he said. everything will still work he said
All checks were successful
EIVE/-/pipeline/head This commit looks good
2024-04-09 13:29:01 +02:00
b160f079b1 small bugfix
All checks were successful
EIVE/-/pipeline/head This commit looks good
2024-04-09 13:19:25 +02:00
11d7ad0f8d start fixing PLOC tree
All checks were successful
EIVE/-/pipeline/head This commit looks good
2024-04-09 11:32:57 +02:00
5af69eb14e add supervisor
All checks were successful
EIVE/-/pipeline/pr-main This commit looks good
2024-04-08 13:40:37 +02:00
5a0edbefa8 fix comment block
All checks were successful
EIVE/-/pipeline/pr-main This commit looks good
2024-04-08 13:38:28 +02:00
5bdba2dbad update events
All checks were successful
EIVE/-/pipeline/pr-main This commit looks good
2024-04-08 13:35:34 +02:00
3ae6ccfb77 this should do the job 2024-04-08 13:35:06 +02:00
de84bf112b changelog
All checks were successful
EIVE/-/pipeline/pr-main This commit looks good
2024-04-08 13:25:45 +02:00
d182a9d5ec re-run black 2024-04-08 13:24:40 +02:00
c72a04b262 allow setting health for payload components
All checks were successful
EIVE/-/pipeline/head This commit looks good
2024-04-08 11:36:25 +02:00
492d364246 relative timeshift
All checks were successful
EIVE/-/pipeline/head This commit looks good
2024-04-08 11:35:05 +02:00
33cf7b1613 Merge pull request 'Fix for Heater Cmd' (#284) from heater-health into main
All checks were successful
EIVE/-/pipeline/head This commit looks good
Reviewed-on: #284
2024-04-02 13:28:06 +02:00
d8c49aed80 Merge branch 'main' into heater-health 2024-04-02 13:27:56 +02:00
97afd24e52 Merge pull request 'EPS command bugfix' (#285) from eps-bugfix into main
All checks were successful
EIVE/-/pipeline/head This commit looks good
Reviewed-on: #285
Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>
2024-03-27 09:01:22 +01:00
4704616ca7 changelog
All checks were successful
EIVE/-/pipeline/head This commit looks good
2024-03-26 17:52:41 +01:00
92c0172b59 bugfix for EPS
All checks were successful
EIVE/-/pipeline/head This commit looks good
2024-03-26 17:50:37 +01:00
344f16099e test script
All checks were successful
EIVE/-/pipeline/head This commit looks good
2024-03-19 11:48:24 +01:00
49b55f01e3 s
All checks were successful
EIVE/-/pipeline/head This commit looks good
EIVE/-/pipeline/pr-main This commit looks good
2024-03-18 11:11:20 +01:00
f87095bf68 Merge pull request 'STR Improv' (#283) from str-version into main
All checks were successful
EIVE/-/pipeline/head This commit looks good
Reviewed-on: #283
Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>
2024-03-14 10:55:59 +01:00