Commit Graph

263 Commits

Author SHA1 Message Date
Robin Müller dd986fefd3
experimenting with PRE_BUILD command 2022-05-10 11:51:25 +02:00
Robin Müller b38329aa0e Merge branch 'development' into mueller/extend-version-class 2022-05-10 11:19:48 +02:00
Ulrich 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
Robin Müller be6a492022 Merge branch 'development' into mueller/extend-version-class 2022-05-09 22:34:09 +02:00
Steffen Gaisser 3448292e8a Merge branch 'development' into mueller/tcp-server-bugfix 2022-05-09 16:56:07 +02:00
Robin Müller 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
Robin Müller ece32f88f4 Merge remote-tracking branch 'origin/development' into mueller/tcp-server-bugfix 2022-05-09 16:14:17 +02:00
Robin Müller 281f91ec5d Merge remote-tracking branch 'origin/development' into mueller/health-srv-bugfix 2022-05-09 15:41:10 +02:00
Robin Müller 80a5ed3c5b
added back fsfw namespace 2022-05-09 11:06:45 +02:00
Robin Müller 5d5a355110 Merge remote-tracking branch 'upstream/development' into mueller/extend-version-class 2022-05-09 11:04:15 +02:00
Robin Müller 16e55a98ce
important bugfix for TCP server 2022-05-09 10:57:23 +02:00
Robin Müller e5e163bdbf
mark unused function 2022-05-09 10:47:56 +02:00
Robin Müller 4e4820af05
bugfix for prepareHealthSetReply function 2022-05-09 10:47:23 +02:00
Steffen Gaisser 3332f68ce7 Tested only std::numeric_limits in MSVC 2022-05-02 17:22:13 +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
Robin Müller cddf16f941 Merge branch 'development' into mueller/mac-os 2022-05-02 15:15:53 +02:00
Robin Müller 7801c6effe Merge remote-tracking branch 'upstream/development' into mueller/new-ss-adder-functions 2022-05-02 15:09:09 +02:00
Robin Müller b62c19a364 Merge branch 'development' into mueller/extend-version-class 2022-05-02 14:48:23 +02:00
Robin Müller daffb6b666 Merge branch 'development' into gaisser_cuc_tests 2022-05-02 14:45:33 +02:00
Robin Müller 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
Robin Müller 28015c4735 it compiles and runs 2022-05-01 17:48:49 +02:00
Robin Müller 7d61e67d20 more macos changes 2022-04-30 19:02:41 +02:00
Robin Müller afcbc8be0a changes for MacOS 2022-04-30 18:40:22 +02:00
Robin Müller 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
Robin Müller bf2e0f2d73 added option to change initial submode 2022-04-28 16:49:13 +02:00
Robin Müller 29b0a352fc
added new functions to add sequences and tables 2022-04-28 14:26:00 +02:00
Robin Müller 70eb8325a0 Merge remote-tracking branch 'upstream/development' into mueller/compiler-warning-fixes-upstream-2 2022-04-27 08:47:45 +02:00
Robin Müller 8e4ad10627 Merge remote-tracking branch 'upstream/development' into mueller/extend-version-class 2022-04-27 08:46:18 +02:00
Robin Müller 5b7ca8c13c
update CHANGELOG.md, apply afmt 2022-04-27 08:39:21 +02:00
Robin Müller 80be937d9d Merge remote-tracking branch 'upstream/development' into mueller/compiler-warning-fixes-upstream-2 2022-04-25 15:24:17 +02:00
Robin Müller d62ee6a611 Merge remote-tracking branch 'upstream/development' into mueller/extend-version-class 2022-04-25 15:23:46 +02:00
Robin Müller 4032228005
Merge remote-tracking branch 'upstream/development' into mueller/extend-version-class 2022-04-25 15:15:54 +02:00
Robin Müller ff98c42514 Merge branch 'development' into mueller/clock-addition 2022-04-25 14:54:22 +02:00
Robin Müller 18f9958332
add git CST and sha info to version ctor 2022-04-22 15:39:44 +02:00
Robin Müller 7e1aed6ad9
apply afmt 2022-04-22 14:04:30 +02:00
Robin Müller 07155e2546
extend version handling with git describe 2022-04-22 14:04:18 +02:00
Robin Müller 8c6c8ad3c0
exntend version class to allow add info 2022-04-22 11:58:44 +02:00
Robin Müller 97e98eae24 Merge branch 'development' into mueller/ipc-pass-arbitrary-args-to-mq 2022-04-12 17:06:30 +02:00
Robin Müller afce942bf8 Merge branch 'development' into mueller/compiler-warning-fixes-upstream-2 2022-04-11 17:33:04 +02:00
Robin Müller a1d7a56dfa
small fix 2022-04-11 17:14:43 +02:00
Robin Müller cb78fefbb3
afmt 2022-04-11 17:14:04 +02:00
Robin Müller 82f46992f6 Merge branch 'development' into mueller/ipc-pass-arbitrary-args-to-mq 2022-04-11 16:11:57 +02:00
Robin Müller 9947a648df fix compiler warnings 2022-04-11 16:06:13 +02:00
Robin Müller c0f80680ef Merge branch 'mueller/propagate-pool-manage-retval' of https://egit.irs.uni-stuttgart.de/eive/fsfw into mueller/propagate-pool-manage-retval 2022-04-11 14:35:28 +02:00
Robin Müller 7761b66fe2
delete data from ipc store if reply fails 2022-04-11 14:35:16 +02:00
Robin Müller acc4c8d975
check serialize result as well 2022-04-11 14:33:28 +02:00
Robin Müller fe739aa81a Merge branch 'development' into mueller/propagate-pool-manage-retval 2022-04-11 14:26:34 +02:00