8157 Commits

Author SHA1 Message Date
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
ddeb9d37bd
it's back! 2023-12-06 11:31:39 +01:00
c6a0518515 bump fsfw 2023-12-06 10:41:51 +01:00
6c6b7ff53f this is less confusing 2023-12-05 15:11:22 +01:00
dab10596f6 fixes 2023-12-05 15:02:17 +01:00
a05fd75828 bump fsfw 2023-12-05 13:12:42 +01:00
f22236b419 fixed datasets 2023-12-04 18:07:22 +01:00
fec4f64a07 bump fsfw 2023-12-04 17:54:21 +01:00
9f5a198c5d small fix 2023-12-04 17:13:41 +01:00
b0b279e313 Merge branch 'dev-7.5.0' into higher-acs-modes-only-str 2023-12-04 13:19:28 +01:00
d0588b144a Merge branch 'dev-7.5.0' into higher-acs-modes-only-str 2023-12-04 13:15:25 +01:00
5b5d891131 Merge pull request 'Once upon a time Robin was made happy' () from make-robin-happy-about-timestuff into dev-7.5.0
Reviewed-on: 
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 2023-12-04 11:15:08 +01:00
4ea1e16880 cpu goes brrrr 2023-12-04 10:59:44 +01:00
064200e730
yesyes clangd shush now 2023-12-04 09:58:37 +01:00
08d0619b11 bump fsfw 2023-12-01 15:20:30 +01:00
aab705ca04 changelog 2023-12-01 14:22:10 +01:00
6d2bfbcfe6 this is cleaner 2023-12-01 14:20:11 +01:00
6540d85c99 Merge branch 'dev-7.5.0' into make-robin-happy-about-timestuff 2023-12-01 13:08:44 +01:00
64069aa5c1 Merge pull request 'Store TLE presistent' () from persistent-tle-store into dev-7.5.0
Reviewed-on: 
Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>
2023-12-01 13:04:56 +01:00
b86ee21da0 fix for failed handling 2023-12-01 12:56:31 +01:00
d22a2abf64 added action cmd to read tle from file 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 2023-12-01 10:30:06 +01:00
03b43da57f Merge branch 'main' into persistent-tle-store 2023-12-01 10:23:13 +01:00
c6d0357ac9 changelog fix 2023-12-01 10:22:52 +01:00
99195565f6 Merge branch 'main' into dev-7.5.0 2023-12-01 10:21:14 +01:00
fa727b1e44 bump tmtc to v5.11.0 v7.4.0 2023-11-30 15:47:12 +01:00
cdfdb9a053 Merge pull request 'prep v7.4.0' () from prep_v7.4.0 into main
Reviewed-on: 
2023-11-30 15:45:28 +01:00
325a6ff70b prep v7.4.0 2023-11-30 15:20:50 +01:00
3c24dfad8c Merge branch 'dev-7.5.0' into persistent-tle-store 2023-11-30 11:51:17 +01:00
cf6c86fabc Merge pull request 'Set B-Side as Default for ACS Board' () from acs-board-b-as-default into dev-7.5.0
Reviewed-on: 
Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>
2023-11-30 11:49:29 +01:00
7239b2e26d small fixes 2023-11-30 11:43:12 +01:00
c475c8fd8d Merge branch 'dev-7.5.0' into acs-board-b-as-default 2023-11-29 18:51:25 +01:00
3969d05476 Merge branch 'main' into persistent-tle-store 2023-11-29 17:13:07 +01:00
f395c71fd0 changelog 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