Commit Graph

5721 Commits

Author SHA1 Message Date
Ulrich Mohr d9730032fd Merge pull request 'DHB Countdown Bug' (#693) from eive/fsfw:mueller/dhb-countdown-bug into development
Reviewed-on: fsfw/fsfw#693
2022-10-10 14:55:43 +02:00
Steffen Gaisser b3ac72b7db Merge pull request 'missing retval conv' (#697) from mueller/missing-retval-conversion into development
Reviewed-on: fsfw/fsfw#697
2022-10-10 14:54:26 +02:00
Steffen Gaisser cd0cb43412 Merge branch 'development' into mueller/missing-retval-conversion 2022-10-10 14:46:10 +02:00
Steffen Gaisser 32c12b3dbf Merge pull request 'small fix for helper' (#698) from mueller/small-helper-script-fix into development
Reviewed-on: fsfw/fsfw#698
2022-10-10 14:43:59 +02:00
Steffen Gaisser 3e9acf476e Merge branch 'development' into mueller/small-helper-script-fix 2022-10-10 14:25:49 +02:00
Steffen Gaisser 99101ce2bf Merge pull request 'hotfix' (#699) from eive/fsfw:mueller/dhb-some-more-fixes into development
Reviewed-on: fsfw/fsfw#699
2022-10-10 14:22:30 +02:00
Robin Müller 6b991045f7 Merge branch 'development' into mueller/smaller-tweaks 2022-10-10 13:41:47 +02:00
Robin Müller df06064df0 Merge branch 'development' into windows-tweaks-upstream 2022-10-10 13:41:09 +02:00
Robin Müller 1d6ccfe5ab
Service 200: Add mode announcement support 2022-10-10 11:06:58 +02:00
Robin Müller 221df7ece6
allow recursive mode announcements 2022-10-10 10:46:29 +02:00
Robin Müller 7f180ac1fa
Merge remote-tracking branch 'origin/develop' into mueller/improve-ss-dhb-logic 2022-10-10 10:29:08 +02:00
Robin Müller 337cb0d6c9
hotfix 2022-10-10 10:21:17 +02:00
Robin Müller 692be9df8d DHB bugfix and addition 2022-10-06 16:57:47 +02:00
Robin Müller 8195587604 Merge branch 'mueller/uart-helper-module' into mueller/simplify-dle-parser 2022-10-06 11:14:54 +02:00
Robin Müller 40e7b2dc31
new uart helper module 2022-10-06 11:14:00 +02:00
Robin Müller 1c53b60442
small additional tweak 2022-10-04 23:04:28 +02:00
Robin Müller d1630cdc4c
something is wrong 2022-10-04 21:17:35 +02:00
Robin Müller 49747fc8a4
some bugfixes 2022-10-04 20:51:58 +02:00
Robin Müller cfc00d0260
try to do this in a simpler way 2022-10-04 18:38:20 +02:00
Robin Müller c283e0c988
okay this is correct 2022-10-04 11:02:08 +02:00
Robin Müller 448d20f3bd
small fix for helper 2022-10-04 10:55:46 +02:00
Robin Müller 2316728d74 Merge branch 'development' into mueller/dhb-countdown-bug 2022-10-04 10:53:26 +02:00
Robin Müller 6f562e5f3e
missing retval conv 2022-10-04 10:25:58 +02:00
Robin Müller 1eceef4645
move retvals 2022-09-30 15:05:32 +02:00
Ulrich Mohr 176f243194 Merge pull request 'Switch to new documentation server' (#694) from mohr/documentation_ci into development
Reviewed-on: fsfw/fsfw#694
2022-09-30 15:05:16 +02:00
Ulrich Mohr d964fa2107 Merge branch 'development' into mohr/documentation_ci 2022-09-30 14:50:20 +02:00
Ulrich Mohr 7b5ae6a445 done? 2022-09-30 14:40:59 +02:00
Ulrich Mohr 8e362a000c Revert "one last check"
This reverts commit 7877776e24.
2022-09-30 14:36:25 +02:00
Ulrich Mohr 7877776e24 one last check 2022-09-30 14:34:25 +02:00
Robin Müller acab5f6bce
added missing health and mode helper init 2022-09-30 14:14:45 +02:00
Robin Müller 10dd855244
expose child itself in interface 2022-09-30 13:30:07 +02:00
Robin Müller f824004897
need to fix all of these TODOs 2022-09-29 19:39:37 +02:00
Robin Müller 7c5308429c
this seems to work 2022-09-29 19:21:24 +02:00
Robin Müller f78344b8fb Merge remote-tracking branch 'origin/develop' into mueller/improve-ss-dhb-logic 2022-09-29 17:46:54 +02:00
Robin Müller 3de0ae5a48 DHB bug 2022-09-29 17:22:44 +02:00
Robin Müller b9d0ff8fb7
DHB bug 2022-09-29 17:20:18 +02:00
Robin Müller 77f7fa2ef1
typo 2022-09-29 16:48:23 +02:00
Robin Müller 78314ad966
this makes a bit more sense 2022-09-29 16:47:23 +02:00
Robin Müller 227535c461
formatting and smaller stuff 2022-09-29 16:46:55 +02:00
Robin Müller c47bed0760 small important bugfix for DLE parser 2022-09-28 17:04:11 +02:00
Robin Müller 9927dbb2e4 Merge branch 'windows-tweaks' into develop 2022-09-28 10:06:08 +02:00
Robin Müller e0c780f21c better comment 2022-09-28 09:59:31 +02:00
Robin Müller 876815b1c9 another small windows tweak 2022-09-28 09:59:22 +02:00
Robin Müller b0ecf87580 last windows tweak 2022-09-28 09:59:12 +02:00
Robin Müller 68ce8b5b08 tweaks to make windows build again 2022-09-28 09:59:02 +02:00
Robin Müller 14a48fe41d
better comment 2022-09-28 09:56:20 +02:00
Robin Müller c932e51818 Merge branch 'windows-tweaks' into develop 2022-09-28 00:03:51 +02:00
Robin Müller 2ca8d72e83
another small windows tweak 2022-09-28 00:03:12 +02:00
Robin Müller 03e1a93250
last windows tweak 2022-09-27 23:57:58 +02:00
Robin Müller 6d2f44a432
tweaks to make windows build again 2022-09-27 21:46:11 +02:00