8194 Commits

Author SHA1 Message Date
2abfb4a6b3 prep next patch 2023-12-19 11:55:48 +01:00
649949ce0a Merge pull request 'STR tweak' () from str-tweak into main
Reviewed-on: 
Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>
2023-12-19 11:43:29 +01:00
c0358d29ce update CHANGELOG 2023-12-19 11:29:59 +01:00
1308c546fd STR tweak 2023-12-19 11:07:45 +01:00
e51dd33d82 Merge pull request 'prep v7.5.2' () from prep_v7.5.2 into main
Reviewed-on: 
Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>
v7.5.2
2023-12-14 10:13:14 +01:00
262cc78e7e
prep v7.5.2 2023-12-14 10:00:59 +01:00
26b9343ca4 Merge pull request 'Quest Fix III' () from i-should-quit into main
Reviewed-on: 
Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>
2023-12-14 09:59:28 +01:00
4701276523 changelog 2023-12-13 16:53:35 +01:00
9833a4e043 and i wasted a day for this little shit bug 2023-12-13 16:52:42 +01:00
51ccbc6898 Merge pull request 'prepare v7.5.1' () from prep_v7.5.1 into main
Reviewed-on: 
Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>
v7.5.1
2023-12-13 11:35:20 +01:00
9ceaa6817c
bump tmtc version 2023-12-13 11:32:19 +01:00
5cdb8db42a
prep v7.5.1 2023-12-13 11:31:59 +01:00
8ab6296abf Merge pull request 'increase max num of scheduled commands to 4000' () from allow-more-scheduled-commands into main
Reviewed-on: 
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' () from quest-fix2 into main
Reviewed-on: 
Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>
2023-12-13 11:24:21 +01:00
be2c4379a7 smoll refactor 2023-12-13 10:31:29 +01:00
f9b56d206e changelog 2023-12-13 10:13:21 +01:00
1dfcc238ed ... 2023-12-13 10:12:29 +01:00
795b63c34f
Merge remote-tracking branch 'origin/main' into allow-more-scheduled-commands 2023-12-13 10:01:43 +01:00
a13fbe6f54 Merge pull request 'QUEST Fixes' () from quest-fix into main
Reviewed-on: 
Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>
2023-12-12 17:56:47 +01:00
9723bf70a0 changelog update 2023-12-12 17:54:29 +01:00
4858c1ea57 changelog 2023-12-12 17:03:58 +01:00
8a50746251 i blame robin for not finding this in his review 2023-12-12 16:01:30 +01:00
46ffee3e5d bump fsfw 2023-12-12 11:34:20 +01:00
efc4e83857 make robin happy 2023-12-12 11:16:13 +01:00
cda88cdc56 increase max num of scheduled commands to 1500 2023-12-12 10:40:18 +01:00
cb6992e0f3 Merge pull request 'v7.5.0' () from dev-7.5.0 into main
Reviewed-on: 
Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>
v7.5.0
2023-12-06 17:44:22 +01:00
30fb60bd2b
OH MY GOD 2023-12-06 17:43:57 +01:00
91a12a7b72
changelog shenanigans 2023-12-06 17:43:00 +01:00
fe0ceac9b4
something went wrong here 2023-12-06 17:42:30 +01:00
acf693636a
auto-formatting 2023-12-06 17:27:43 +01:00
87798f9e52
bump minor version 2023-12-06 17:27:23 +01:00
30f8c31ad0
repoint tmtc submodule 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 2023-12-06 17:20:20 +01:00
2c9500c7aa Merge pull request 'Higher ACS Modes STR Only' () from higher-acs-modes-only-str into dev-7.5.0
Reviewed-on: 
Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>
2023-12-06 17:15:51 +01:00
d762a2b703 fix 2023-12-06 16:02:08 +01:00
8cd773d18b maybe this makes him happy 2023-12-06 15:56:15 +01:00
42036f45f9 Merge branch 'dev-7.5.0' into higher-acs-modes-only-str 2023-12-06 15:43:31 +01:00
f05d380ad3 Merge remote-tracking branch 'origin/main' into dev-7.5.0 2023-12-06 15:32:11 +01:00
4cad1176d0 changelog 2023-12-06 14:46:36 +01:00
71193495f3 welp i guess i also deleted stuff i still needed 2023-12-06 14:36:23 +01:00
fafec82908
auto-formatter v7.4.1 2023-12-06 13:35:37 +01:00
09aa7bb439 Merge branch 'dev-7.5.0' into higher-acs-modes-only-str 2023-12-06 13:06:38 +01:00
215bc8022b Merge branch 'main' into dev-7.5.0 2023-12-06 13:04:51 +01:00
2aca517f71 Merge pull request 'SCEX is back!' () from scex-back-in-the-house into main
Reviewed-on: 
Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>
2023-12-06 12:09:35 +01:00
0931d0ebac
it works 2023-12-06 11:54:28 +01:00
263ac1f663
wtf is this 2023-12-06 11:44:28 +01:00
7d54ecaee3
small CMake fix 2023-12-06 11:36:35 +01:00
3294cc85fc
bump patch version 2023-12-06 11:33:13 +01:00