Commit Graph
100 Commits
Author SHA1 Message Date
muellerr f0debecbbc Merge pull request 'Extend version handling and class' (#601) from eive/fsfw:mueller/extend-version-class into development
Reviewed-on: fsfw/fsfw#601
2022-05-16 14:52:15 +02:00
muellerr ef9d7aa7d3 Merge branch 'development' into mueller/extend-version-class 2022-05-16 14:42:23 +02:00
muellerr b8fd2db434 Merge pull request 'Add PUS TC scheduler service' (#594) from KSat/fsfw:mueller/add-tc-scheduler-pus-11 into development
Reviewed-on: fsfw/fsfw#594
2022-05-16 14:32:19 +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 eed6a64597 Merge pull request 'Power Switcher Component' (#596) from eive/fsfw:mueller/power-switcher-component-upstream into development
Reviewed-on: fsfw/fsfw#596
2022-05-13 22:42:23 +02:00
muellerr 5736023ffa Merge branch 'development' into mueller/extend-version-class 2022-05-13 17:22:57 +02:00
muellerr e98aa005cb Merge branch 'development' into mueller/power-switcher-component-upstream 2022-05-13 13:25:13 +02:00
muellerr 52310f7d32 Merge remote-tracking branch 'upstream/development' into mueller/add-tc-scheduler-pus-11 2022-05-13 13:24:26 +02:00
muellerr e3d1308205 Merge pull request 'preproc guards' (#612) from eive/fsfw:mueller/missing-preproc-defs into development
Reviewed-on: fsfw/fsfw#612
2022-05-13 13:22:38 +02:00
muellerr 970f039e85 Merge remote-tracking branch 'origin/development' into mueller/extend-version-class 2022-05-13 13:21:01 +02:00
muellerr 5a4539def4 Merge branch 'mueller/add-tc-scheduler-pus-11' of https://egit.irs.uni-stuttgart.de/KSat/fsfw into mueller/add-tc-scheduler-pus-11 2022-05-13 11:58:45 +02:00
muellerr 13a34cd677 Merge remote-tracking branch 'upstream/development' into mueller/add-tc-scheduler-pus-11 2022-05-13 11:58:41 +02:00
muellerr 811287aac8 delete old scripts 2022-05-13 11:57:22 +02:00
muellerr 23fb06578b this is better 2022-05-13 11:56:37 +02:00
muellerr c86e99e6dc rename auto-formatter 2022-05-13 11:56:20 +02:00
muellerr 4092de911c use variable for repeated section 2022-05-13 11:55:19 +02:00
muellerr 00952e15b0 Merge branch 'development' into mueller/missing-preproc-defs 2022-05-13 11:50:24 +02:00
muellerr 01ebf0f4d3 tab size 2022-05-13 11:49:01 +02:00
muellerr 99fe6487c8 another small improvement 2022-05-13 11:48:18 +02:00
muellerr d4a6f987bc small fix 2022-05-13 11:46:59 +02:00
muellerr 57bac4f262 Merge remote-tracking branch 'origin/development' into mueller/amft-cmakelists 2022-05-13 11:46:17 +02:00
muellerr cfa6843c8f check whether clang-format is installed 2022-05-13 11:46:04 +02:00
muellerr deee4c43c0 finally this works 2022-05-13 11:37:58 +02:00
muellerr ad0b6f1ed1 another small fix 2022-05-13 11:35:59 +02:00
muellerr ec03a674bd Merge branch 'mueller/amft-cmakelists' of https://egit.irs.uni-stuttgart.de/fsfw/fsfw into mueller/amft-cmakelists 2022-05-13 11:35:28 +02:00
muellerr 9e3d5b6a0c small fix 2022-05-13 11:35:18 +02:00
muellerr 994c7299b9 add cmake-format command to shell script 2022-05-13 11:34:44 +02:00
muellerr 57a830cb46 Merge branch 'development' into mueller/amft-cmakelists 2022-05-13 11:30:52 +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 ccadbb5942 Merge branch 'development' into mueller/missing-preproc-defs 2022-05-13 00:24:04 +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 3046822e88 run cmake-format 2022-05-12 17:27:39 +02:00
muellerr 6442dd0c38 Merge branch 'mueller/amft-cmakelists' of https://egit.irs.uni-stuttgart.de/fsfw/fsfw into mueller/amft-cmakelists 2022-05-12 17:16:15 +02:00
muellerr 9b6fa646ed Merge remote-tracking branch 'origin/development' into mueller/amft-cmakelists 2022-05-12 17:16:10 +02:00
muellerr e77bde459b Merge remote-tracking branch 'upstream/development' into mueller/extend-version-class 2022-05-12 17:12:26 +02:00
muellerr 2d9d83a1c5 Merge branch 'development' into mueller/missing-preproc-defs 2022-05-12 17:10:54 +02:00
muellerr c561271070 Merge branch 'development' into mueller/refactor-power-switch-if-etc 2022-05-12 17:09:27 +02:00
muellerr 70d4fc1e0a Merge branch 'mueller/add-tc-scheduler-pus-11' of https://egit.irs.uni-stuttgart.de/KSat/fsfw into mueller/add-tc-scheduler-pus-11 2022-05-12 17:06:12 +02:00
muellerr b8cfb36426 added additional explicit returnvalues 2022-05-12 17:05:58 +02:00
muellerr e5c140e0ae Merge branch 'development' into mueller/add-tc-scheduler-pus-11 2022-05-12 16:59:01 +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 34e124f2db Merge branch 'development' into mueller/amft-cmakelists 2022-05-11 11:30:40 +02:00
muellerr e05c72b062 minor formatting fix 2022-05-10 13:08:14 +02:00
muellerr 2ca8523215 Merge branch 'mueller/add-lto-support' of https://egit.irs.uni-stuttgart.de/fsfw/fsfw into mueller/add-lto-support 2022-05-10 11:57:01 +02:00
muellerr 25775614de only check IPO support if enabled 2022-05-10 11:56:51 +02:00
muellerr b38329aa0e Merge branch 'development' into mueller/extend-version-class 2022-05-10 11:19:48 +02:00
muellerr 0fe1b70bae keep LTO option off by default 2022-05-10 11:19:29 +02:00
muellerr 458aa5c265 Merge branch 'development' into mueller/missing-preproc-defs 2022-05-10 09:56:29 +02:00
muellerr eb0223bc51 Merge branch 'development' into mueller/add-lto-support 2022-05-09 22:34:28 +02:00
muellerr be6a492022 Merge branch 'development' into mueller/extend-version-class 2022-05-09 22:34:09 +02:00
muellerr d8bd08dd8c Merge branch 'development' into mueller/amft-cmakelists 2022-05-09 17:22:40 +02:00
muellerr 18c2847b08 Merge branch 'development' into mueller/missing-preproc-defs 2022-05-09 17:21:48 +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 dd9e28fca1 Merge branch 'development' into mueller/add-lto-support 2022-05-09 16:09:31 +02:00
muellerr 7b7f5d7e0a Merge branch 'mueller/add-lto-support' of https://egit.irs.uni-stuttgart.de/fsfw/fsfw into mueller/add-lto-support 2022-05-09 16:07:19 +02:00
muellerr fd112ed597 enable lto for test target 2022-05-09 16:07:05 +02:00
muellerr 96eb8fc21f Merge branch 'development' into gaisser_fix_compile_check 2022-05-09 15:59:44 +02:00
muellerr 88fa4f1d9d Merge remote-tracking branch 'origin/development' into mueller/tcp-server-bugfix 2022-05-09 15:55:07 +02:00
muellerr 5989c88c88 indentation 2022-05-09 15:54:29 +02:00
muellerr da8a108cb7 Merge remote-tracking branch 'origin/development' into mueller/amft-cmakelists 2022-05-09 15:54:10 +02:00
muellerr 75132c1e39 Merge branch 'development' into mueller/add-lto-support 2022-05-09 15:52:28 +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 736f8d0238 order fix 2022-05-09 15:50:49 +02:00
muellerr f1acf8e18b Merge remote-tracking branch 'upstream/development' into mueller/extend-version-class 2022-05-09 15:48:04 +02:00
muellerr 281f91ec5d Merge remote-tracking branch 'origin/development' into mueller/health-srv-bugfix 2022-05-09 15:41:10 +02:00
muellerr 15352b539d Merge remote-tracking branch 'upstream/development' into mueller/refactor-power-switch-if-etc 2022-05-09 15:37:32 +02:00
muellerr 4015e85506 Merge branch 'development' into mueller/missing-preproc-defs 2022-05-09 15:35:49 +02:00
muellerr 8b0508d50a Merge branch 'development' into gaisser_fix_compile_check 2022-05-09 15:17:28 +02:00
muellerr 8a40878eb5 Merge remote-tracking branch 'origin/development' into mueller/add-lto-support 2022-05-09 15:17:16 +02:00
muellerr 220469a2dd Merge remote-tracking branch 'origin/development' into mueller/amft-cmakelists 2022-05-09 15:16:12 +02:00
muellerr 10cc954d27 update changelog 2022-05-09 15:09:07 +02:00
muellerr 73ff9b97db bump CMAKE_CXX_STANDARD to C++17 2022-05-09 15:07:46 +02:00
muellerr b0d71597f0 update changelog 2022-05-09 14:58:39 +02:00
muellerr 226f28dc7b Move some directives up top 2022-05-09 14:53:52 +02:00
muellerr 6308427d03 run auto-formatter over cmakelists.txt 2022-05-09 11:18:56 +02:00
muellerr 398d04dc50 fixed tests 2022-05-09 11:15:18 +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 6bfdace512 update changelog 2022-05-09 11:00:31 +02:00
muellerr 16e55a98ce important bugfix for TCP server 2022-05-09 10:57:23 +02:00
muellerr 79f17843d8 update changelog 2022-05-09 10:50:29 +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 637512ad77 changelog update 2022-05-09 10:34:14 +02:00
muellerr a4bd5a2aaa update changelog 2022-05-09 10:31:03 +02:00
muellerr a943e4eebb enable LTO where applicable 2022-05-09 02:23:20 +02:00
muellerr cb0c80d8dc add option and cmake module for lto support 2022-05-09 02:22:16 +02:00
muellerr 2fbf847367 Merge branch 'development' into mueller/missing-preproc-defs 2022-05-02 16:16:33 +02:00
muellerr 1a07864a5f Merge pull request 'CCSDS Time CUC Tests' (#593) from gaisser/fsfw:gaisser_cuc_tests into development
Reviewed-on: fsfw/fsfw#593
2022-05-02 15:29:48 +02:00
muellerr 57e6c46e72 Merge branch 'development' into mueller/missing-preproc-defs 2022-05-02 15:16:37 +02:00
muellerr cddf16f941 Merge branch 'development' into mueller/mac-os 2022-05-02 15:15:53 +02:00
muellerr a3dee05fe3 Merge pull request 'space packet bug fix' (#607) from meier/spacePacketBugFix into development
Reviewed-on: fsfw/fsfw#607
2022-05-02 15:15:28 +02:00
muellerr b62c19a364 Merge branch 'development' into mueller/extend-version-class 2022-05-02 14:48:23 +02:00