Commit Graph

8187 Commits

Author SHA1 Message Date
561fe5aa3c Merge branch 'main' into smaller-ploc-tweaks
All checks were successful
EIVE/eive-obsw/pipeline/pr-main This commit looks good
2023-12-13 11:55:23 +01:00
51ccbc6898 Merge pull request 'prepare v7.5.1' (#835) from prep_v7.5.1 into main
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #835
Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>
2023-12-13 11:35:20 +01:00
9ceaa6817c
bump tmtc version
Some checks are pending
EIVE/eive-obsw/pipeline/head Build queued...
EIVE/eive-obsw/pipeline/pr-main Build queued...
2023-12-13 11:32:19 +01:00
5cdb8db42a
prep v7.5.1
Some checks are pending
EIVE/eive-obsw/pipeline/head Build queued...
2023-12-13 11:31:59 +01:00
8ab6296abf Merge pull request 'increase max num of scheduled commands to 4000' (#832) from allow-more-scheduled-commands into main
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #832
Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>
2023-12-13 11:24:36 +01:00
d8bd52b4e3 Merge branch 'main' into allow-more-scheduled-commands 2023-12-13 11:24:29 +01:00
1e58de635c Merge pull request 'QUEST Fix II' (#834) from quest-fix2 into main
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #834
Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>
2023-12-13 11:24:21 +01:00
be2c4379a7 smoll refactor
All checks were successful
EIVE/eive-obsw/pipeline/pr-main This commit looks good
2023-12-13 10:31:29 +01:00
f9b56d206e changelog
Some checks are pending
EIVE/eive-obsw/pipeline/head Build queued...
EIVE/eive-obsw/pipeline/pr-main This commit looks good
2023-12-13 10:13:21 +01:00
1dfcc238ed ...
Some checks are pending
EIVE/eive-obsw/pipeline/head Build started...
2023-12-13 10:12:29 +01:00
795b63c34f
Merge remote-tracking branch 'origin/main' into allow-more-scheduled-commands
All checks were successful
EIVE/eive-obsw/pipeline/pr-main This commit looks good
2023-12-13 10:01:43 +01:00
a13fbe6f54 Merge pull request 'QUEST Fixes' (#833) from quest-fix into main
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #833
Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>
2023-12-12 17:56:47 +01:00
b000f77f4b smaller PLOC tweaks
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2023-12-12 17:55:09 +01:00
9723bf70a0 changelog update
All checks were successful
EIVE/eive-obsw/pipeline/pr-main This commit looks good
2023-12-12 17:54:29 +01:00
4858c1ea57 changelog
All checks were successful
EIVE/eive-obsw/pipeline/pr-main This commit looks good
2023-12-12 17:03:58 +01:00
8a50746251 i blame robin for not finding this in his review
Some checks are pending
EIVE/eive-obsw/pipeline/head Build started...
EIVE/eive-obsw/pipeline/pr-main This commit looks good
2023-12-12 16:01:30 +01:00
46ffee3e5d bump fsfw
All checks were successful
EIVE/eive-obsw/pipeline/pr-main This commit looks good
2023-12-12 11:34:20 +01:00
efc4e83857 make robin happy
All checks were successful
EIVE/eive-obsw/pipeline/pr-main This commit looks good
2023-12-12 11:16:13 +01:00
cda88cdc56 increase max num of scheduled commands to 1500
Some checks are pending
EIVE/eive-obsw/pipeline/head Build started...
EIVE/eive-obsw/pipeline/pr-main This commit looks good
2023-12-12 10:40:18 +01:00
cb6992e0f3 Merge pull request 'v7.5.0' (#828) from dev-7.5.0 into main
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #828
Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>
2023-12-06 17:44:22 +01:00
30fb60bd2b
OH MY GOD
Some checks are pending
EIVE/eive-obsw/pipeline/pr-main Build queued...
2023-12-06 17:43:57 +01:00
91a12a7b72
changelog shenanigans
Some checks are pending
EIVE/eive-obsw/pipeline/pr-main Build started...
2023-12-06 17:43:00 +01:00
fe0ceac9b4
something went wrong here
Some checks are pending
EIVE/eive-obsw/pipeline/pr-main Build started...
2023-12-06 17:42:30 +01:00
acf693636a
auto-formatting
All checks were successful
EIVE/eive-obsw/pipeline/pr-main This commit looks good
2023-12-06 17:27:43 +01:00
87798f9e52
bump minor version 2023-12-06 17:27:23 +01:00
30f8c31ad0
repoint tmtc submodule
All checks were successful
EIVE/eive-obsw/pipeline/pr-main This commit looks good
2023-12-06 17:23:25 +01:00
160159ff8d
bump eive-tmtc version 2023-12-06 17:21:52 +01:00
b4886822eb
re-run generators
All checks were successful
EIVE/eive-obsw/pipeline/pr-main This commit looks good
2023-12-06 17:20:20 +01:00
2c9500c7aa Merge pull request 'Higher ACS Modes STR Only' (#818) from higher-acs-modes-only-str into dev-7.5.0
All checks were successful
EIVE/eive-obsw/pipeline/pr-main This commit looks good
Reviewed-on: #818
Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>
2023-12-06 17:15:51 +01:00
d762a2b703 fix
All checks were successful
EIVE/eive-obsw/pipeline/pr-dev-7.5.0 This commit looks good
2023-12-06 16:02:08 +01:00
8cd773d18b maybe this makes him happy
All checks were successful
EIVE/eive-obsw/pipeline/pr-dev-7.5.0 This commit looks good
2023-12-06 15:56:15 +01:00
42036f45f9 Merge branch 'dev-7.5.0' into higher-acs-modes-only-str
All checks were successful
EIVE/eive-obsw/pipeline/pr-dev-7.5.0 This commit looks good
2023-12-06 15:43:31 +01:00
f05d380ad3 Merge remote-tracking branch 'origin/main' into dev-7.5.0
All checks were successful
EIVE/eive-obsw/pipeline/pr-main This commit looks good
2023-12-06 15:32:11 +01:00
4cad1176d0 changelog
All checks were successful
EIVE/eive-obsw/pipeline/pr-dev-7.5.0 This commit looks good
2023-12-06 14:46:36 +01:00
71193495f3 welp i guess i also deleted stuff i still needed
All checks were successful
EIVE/eive-obsw/pipeline/pr-dev-7.5.0 This commit looks good
2023-12-06 14:36:23 +01:00
fafec82908
auto-formatter
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2023-12-06 13:35:37 +01:00
09aa7bb439 Merge branch 'dev-7.5.0' into higher-acs-modes-only-str
All checks were successful
EIVE/eive-obsw/pipeline/pr-dev-7.5.0 This commit looks good
2023-12-06 13:06:38 +01:00
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
c6a0518515 bump fsfw
All checks were successful
EIVE/eive-obsw/pipeline/pr-dev-7.5.0 This commit looks good
2023-12-06 10:41:51 +01:00
6c6b7ff53f this is less confusing
All checks were successful
EIVE/eive-obsw/pipeline/pr-dev-7.5.0 This commit looks good
2023-12-05 15:11:22 +01:00
dab10596f6 fixes 2023-12-05 15:02:17 +01:00
a05fd75828 bump fsfw
All checks were successful
EIVE/eive-obsw/pipeline/pr-dev-7.5.0 This commit looks good
2023-12-05 13:12:42 +01:00
f22236b419 fixed datasets
All checks were successful
EIVE/eive-obsw/pipeline/pr-dev-7.5.0 This commit looks good
2023-12-04 18:07:22 +01:00
fec4f64a07 bump fsfw
All checks were successful
EIVE/eive-obsw/pipeline/pr-dev-7.5.0 This commit looks good
2023-12-04 17:54:21 +01:00