Commit Graph

325 Commits

Author SHA1 Message Date
muellerr ef9d7aa7d3 Merge branch 'development' into mueller/extend-version-class 2022-05-16 14:42:23 +02:00
muellerr 878e32cbe8 Merge branch 'development' into mueller/add-tc-scheduler-pus-11 2022-05-16 14:29:02 +02:00
muellerr 4821706561 Merge branch 'development' into mueller/extend-version-class 2022-05-16 14:16:53 +02:00
muellerr 970f039e85 Merge remote-tracking branch 'origin/development' into mueller/extend-version-class 2022-05-13 13:21:01 +02:00
muellerr 271057ca6b Merge remote-tracking branch 'upstream/development' into mueller/extend-version-class 2022-05-13 11:28:54 +02:00
muellerr 861335212e Merge remote-tracking branch 'upstream/development' into mueller/add-tc-scheduler-pus-11 2022-05-13 00:30:18 +02:00
muellerr 038e47a46e better returncode handling 2022-05-13 00:30:01 +02:00
muellerr 171c48495c Merge remote-tracking branch 'upstream/development' into mueller/power-switcher-component-upstream 2022-05-12 19:07:12 +02:00
muellerr b8cfb36426 added additional explicit returnvalues 2022-05-12 17:05:58 +02:00
muellerr c4c340fde1 lot of refactoring 2022-05-12 16:56:06 +02:00
muellerr 9a4c7589cc Merge remote-tracking branch 'upstream/development' into mueller/add-tc-scheduler-pus-11 2022-05-12 15:52:47 +02:00
muellerr d11f898f70 update dummy power switcher docs 2022-05-12 15:02:06 +02:00
muellerr dd986fefd3 experimenting with PRE_BUILD command 2022-05-10 11:51:25 +02:00
muellerr b38329aa0e Merge branch 'development' into mueller/extend-version-class 2022-05-10 11:19:48 +02:00
muellerr c5b4499d98 Merge remote-tracking branch 'upstream/development' into mueller/refactor-power-switch-if-etc 2022-05-10 09:58:21 +02:00
mohr 4499c9bf04 Merge pull request 'Added new functions to add sequences and tables' (#606) from eive/fsfw:mueller/new-ss-adder-functions into development
Reviewed-on: fsfw/fsfw#606
2022-05-10 09:35:16 +02:00
muellerr be6a492022 Merge branch 'development' into mueller/extend-version-class 2022-05-09 22:34:09 +02:00
gaisser 3448292e8a Merge branch 'development' into mueller/tcp-server-bugfix 2022-05-09 16:56:07 +02:00
muellerr c83cc492c0 Merge pull request 'Compile Time Size Check fixed' (#614) from gaisser/fsfw:gaisser_fix_compile_check into development
Reviewed-on: fsfw/fsfw#614
2022-05-09 16:14:44 +02:00
muellerr ece32f88f4 Merge remote-tracking branch 'origin/development' into mueller/tcp-server-bugfix 2022-05-09 16:14:17 +02:00
muellerr eb494707af Merge remote-tracking branch 'upstream/development' into mueller/power-switcher-component-upstream 2022-05-09 15:51:28 +02:00
muellerr 281f91ec5d Merge remote-tracking branch 'origin/development' into mueller/health-srv-bugfix 2022-05-09 15:41:10 +02:00
muellerr 80a5ed3c5b added back fsfw namespace 2022-05-09 11:06:45 +02:00
muellerr 5d5a355110 Merge remote-tracking branch 'upstream/development' into mueller/extend-version-class 2022-05-09 11:04:15 +02:00
muellerr c78b7c432b Merge branch 'development' into mueller/refactor-power-switch-if-etc 2022-05-09 11:02:45 +02:00
muellerr 16e55a98ce important bugfix for TCP server 2022-05-09 10:57:23 +02:00
muellerr e5e163bdbf mark unused function 2022-05-09 10:47:56 +02:00
muellerr 4e4820af05 bugfix for prepareHealthSetReply function 2022-05-09 10:47:23 +02:00
gaisser 3332f68ce7 Tested only std::numeric_limits in MSVC 2022-05-02 17:22:13 +02:00
gaisser 54feb77770 Proposed fix for gcc and clang 2022-05-02 16:14:23 +02:00
gaisser 3e9d6bdbb9 Merge branch 'development' into gaisser_cuc_tests 2022-05-02 15:24:32 +02:00
muellerr cddf16f941 Merge branch 'development' into mueller/mac-os 2022-05-02 15:15:53 +02:00
muellerr 7801c6effe Merge remote-tracking branch 'upstream/development' into mueller/new-ss-adder-functions 2022-05-02 15:09:09 +02:00
muellerr b62c19a364 Merge branch 'development' into mueller/extend-version-class 2022-05-02 14:48:23 +02:00
muellerr daffb6b666 Merge branch 'development' into gaisser_cuc_tests 2022-05-02 14:45:33 +02:00
muellerr 4c65109ac0 Merge branch 'development' into meier/spacePacketBugFix 2022-05-02 14:36:24 +02:00
gaisser 16714ceb40 Merge branch 'development' into gaisser_cuc_tests 2022-05-02 13:58:17 +02:00
muellerr 28015c4735 it compiles and runs 2022-05-01 17:48:49 +02:00
muellerr 7d61e67d20 more macos changes 2022-04-30 19:02:41 +02:00
muellerr afcbc8be0a changes for MacOS 2022-04-30 18:40:22 +02:00
muellerr 7a2269262b Merge branch 'development' into meier/spacePacketBugFix 2022-04-29 08:45:10 +02:00
Jakob Meier 9731dc1e61 space packet bug fix 2022-04-29 07:47:23 +02:00
muellerr bf2e0f2d73 added option to change initial submode 2022-04-28 16:49:13 +02:00
muellerr 29b0a352fc added new functions to add sequences and tables 2022-04-28 14:26:00 +02:00
muellerr 70eb8325a0 Merge remote-tracking branch 'upstream/development' into mueller/compiler-warning-fixes-upstream-2 2022-04-27 08:47:45 +02:00
muellerr 8e4ad10627 Merge remote-tracking branch 'upstream/development' into mueller/extend-version-class 2022-04-27 08:46:18 +02:00
muellerr 496bc665d6 Merge remote-tracking branch 'upstream/development' into mueller/add-tc-scheduler-pus-11 2022-04-27 08:45:47 +02:00
muellerr 2c8531ea48 Merge remote-tracking branch 'upstream/development' into mueller/refactor-power-switch-if-etc 2022-04-27 08:45:04 +02:00
muellerr 5b7ca8c13c update CHANGELOG.md, apply afmt 2022-04-27 08:39:21 +02:00
muellerr 88051c9302 Merge remote-tracking branch 'upstream/development' into mueller/refactor-power-switch-if-etc 2022-04-25 15:37:03 +02:00