Commit Graph

1143 Commits

Author SHA1 Message Date
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
muellerr 9e5fb64d0e Merge branch 'eive/develop' into mueller/fixed-seq-task-use-warning 2022-05-05 12:31:12 +02:00
muellerr 71f704c980 remove the dot 2022-05-05 12:29:46 +02:00
muellerr de2d4da161 Merge branch 'eive/develop' into meier/develop 2022-05-05 12:28:34 +02:00
muellerr f59b05c86c use warning instead of error 2022-05-05 02:00:41 +02:00
muellerr 2220120d54 improved i2c error printout 2022-05-03 16:43:15 +02:00
muellerr 15eb22f9ee Merge remote-tracking branch 'origin/eive/develop' into meier/develop 2022-05-03 13:03:44 +02:00
Steffen Gaisser 3332f68ce7 Tested only std::numeric_limits in MSVC 2022-05-02 17:22:13 +02:00
muellerr 7f6c8b8b12 Merge remote-tracking branch 'upstream/development' into eive/develop 2022-05-02 16:15:27 +02:00
Steffen Gaisser 54feb77770 Proposed fix for gcc and clang 2022-05-02 16:14:23 +02:00
Steffen 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
Steffen 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
Jakob Meier 43aad11859 space packet bugfix 2022-04-29 07:43:52 +02:00
muellerr bf2e0f2d73 added option to change initial submode 2022-04-28 16:49:13 +02:00
muellerr 3225a8e350 added option to change initial submode 2022-04-28 16:48:14 +02:00
muellerr 1c4ea6dd0d Merge branch 'eive/develop' into mueller/new-ss-adder-functions-eive 2022-04-28 14:34:20 +02:00
muellerr 29b0a352fc added new functions to add sequences and tables 2022-04-28 14:26:00 +02:00
Jakob Meier 41682aab3f Merge branch 'eive/develop' into meier/develop 2022-04-28 11:45:27 +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 d3e7037759 Merge branch 'development' into mueller/possible-ring-buffer-fix 2022-04-27 08:42:24 +02:00
muellerr 5b7ca8c13c update CHANGELOG.md, apply afmt 2022-04-27 08:39:21 +02:00
muellerr 1739edd9b0 warning fix for modern compilers 2022-04-26 10:32:37 +02:00
Jakob Meier 951c077abc option to use Countdown object to time out replies 2022-04-26 10:03:04 +02:00
muellerr 466a3639a5 Merge remote-tracking branch 'upstream/development' into mueller/update-fsfw 2022-04-26 10:02:43 +02:00
Jakob Meier 900ef5b912 option to use coutdwon object to time out replies 2022-04-26 09:07:03 +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
muellerr 80be937d9d Merge remote-tracking branch 'upstream/development' into mueller/compiler-warning-fixes-upstream-2 2022-04-25 15:24:17 +02:00
muellerr d62ee6a611 Merge remote-tracking branch 'upstream/development' into mueller/extend-version-class 2022-04-25 15:23:46 +02:00
Robin Mueller 91ef4ff30b Merge remote-tracking branch 'upstream/development' into mueller/add-tc-scheduler-pus-11 2022-04-25 15:23:15 +02:00
muellerr 755dcf66a3 Merge remote-tracking branch 'upstream/development' into mueller/possible-ring-buffer-fix 2022-04-25 15:16:52 +02:00
muellerr 4032228005 Merge remote-tracking branch 'upstream/development' into mueller/extend-version-class 2022-04-25 15:15:54 +02:00
muellerr 50ce13d596 Merge branch 'development' into mueller/power-switcher-component-upstream 2022-04-25 15:14:38 +02:00
Robin Mueller 68302e7c5e Merge remote-tracking branch 'upstream/development' into mueller/add-tc-scheduler-pus-11 2022-04-25 15:14:13 +02:00