Commit Graph
100 Commits
Author SHA1 Message Date
muellerr c83cc492c0 Merge pull request 'Compile Time Size Check fixed' (#614) from gaisser/fsfw:gaisser_fix_compile_check into development
fsfw/fsfw/pipeline/head This commit looks good
Reviewed-on: #614
2022-05-09 16:14:44 +02:00
muellerr ece32f88f4 Merge remote-tracking branch 'origin/development' into mueller/tcp-server-bugfix
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-05-09 16:14:17 +02:00
muellerr 96eb8fc21f Merge branch 'development' into gaisser_fix_compile_check
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-05-09 15:59:44 +02:00
muellerr 88fa4f1d9d Merge remote-tracking branch 'origin/development' into mueller/tcp-server-bugfix
fsfw/fsfw/pipeline/pr-development There was a failure building this commit
2022-05-09 15:55:07 +02:00
muellerr 281f91ec5d Merge remote-tracking branch 'origin/development' into mueller/health-srv-bugfix
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-05-09 15:41:10 +02:00
muellerr 8b0508d50a Merge branch 'development' into gaisser_fix_compile_check
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-05-09 15:17:28 +02:00
muellerr 10cc954d27 update changelog
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-05-09 15:09:07 +02:00
muellerr 73ff9b97db bump CMAKE_CXX_STANDARD to C++17
fsfw/fsfw/pipeline/head Build started...
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-05-09 15:07:46 +02:00
muellerr b0d71597f0 update changelog
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-05-09 14:58:39 +02:00
muellerr 226f28dc7b Move some directives up top
fsfw/fsfw/pipeline/head This commit looks good
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-05-09 14:53:52 +02:00
muellerr 6bfdace512 update changelog
fsfw/fsfw/pipeline/pr-development There was a failure building this commit
2022-05-09 11:00:31 +02:00
muellerr 16e55a98ce important bugfix for TCP server
fsfw/fsfw/pipeline/head Build started...
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-05-09 10:57:23 +02:00
muellerr 79f17843d8 update changelog
fsfw/fsfw/pipeline/pr-development There was a failure building this commit
2022-05-09 10:50:29 +02:00
muellerr e5e163bdbf mark unused function
fsfw/fsfw/pipeline/head Build started...
fsfw/fsfw/pipeline/pr-development This commit looks good
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 a72cc487df Merge pull request 'DHB Reply Timeout' (#74) from meier/develop into eive/develop
Reviewed-on: eive/fsfw#74
2022-05-05 12:28:48 +02:00
muellerr de2d4da161 Merge branch 'eive/develop' into meier/develop 2022-05-05 12:28:34 +02:00
muellerr 2220120d54 improved i2c error printout 2022-05-03 16:43:15 +02:00
muellerr 1a07864a5f Merge pull request 'CCSDS Time CUC Tests' (#593) from gaisser/fsfw:gaisser_cuc_tests into development
fsfw/fsfw/pipeline/head This commit looks good
Reviewed-on: #593
2022-05-02 15:29:48 +02:00
muellerr cddf16f941 Merge branch 'development' into mueller/mac-os
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-05-02 15:15:53 +02:00
muellerr a3dee05fe3 Merge pull request 'space packet bug fix' (#607) from meier/spacePacketBugFix into development
fsfw/fsfw/pipeline/head This commit looks good
Reviewed-on: #607
2022-05-02 15:15:28 +02:00
muellerr daffb6b666 Merge branch 'development' into gaisser_cuc_tests
fsfw/fsfw/pipeline/pr-development Build started...
2022-05-02 14:45:33 +02:00
muellerr 7cfb1e6076 Merge branch 'development' into mueller/bump-catch2
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-05-02 14:36:44 +02:00
muellerr 4c65109ac0 Merge branch 'development' into meier/spacePacketBugFix
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-05-02 14:36:24 +02:00
muellerr 861bd15eda Merge branch 'development' into mueller/hotfix-etl
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-05-02 14:20:40 +02:00
muellerr fea301bcc9 Merge remote-tracking branch 'origin/mueller/hotfix-etl' into mueller/mac-os
fsfw/fsfw/pipeline/pr-development Build queued...
2022-05-02 09:35:28 +02:00
muellerr 77450eb4b7 removed flag which does not exist
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-05-02 09:09:41 +02:00
muellerr 7a2269262b Merge branch 'development' into meier/spacePacketBugFix
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-04-29 08:45:10 +02:00
muellerr bf2e0f2d73 added option to change initial submode
fsfw/fsfw/pipeline/pr-development This commit looks good
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 e98857fab4 update changelog
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-04-28 14:37:21 +02:00
muellerr 1c4ea6dd0d Merge branch 'eive/develop' into mueller/new-ss-adder-functions-eive 2022-04-28 14:34:20 +02:00
muellerr e2eb4bfea4 Merge remote-tracking branch 'upstream/development' into mueller/update-from-upstream 2022-04-28 14:30:08 +02:00
muellerr 29b0a352fc added new functions to add sequences and tables 2022-04-28 14:26:00 +02:00
muellerr 8642b13fd1 Merge branch 'mueller/hotfix-etl' into mueller/bump-catch2
fsfw/fsfw/pipeline/pr-development There was a failure building this commit
2022-04-27 21:55:45 +02:00
muellerr 6aa72892ed clean usage of FetchContent_MakeAvailable
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-04-27 21:53:57 +02:00
muellerr 70f0a72f1b added explicit checkout of v3.0.0-preview5
fsfw/fsfw/pipeline/head There was a failure building this commit
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-04-27 13:54:15 +02:00
muellerr b5d890eedd install Catch2 for docker_d2 and update Jenkinsfile
fsfw/fsfw/pipeline/head This commit looks good
2022-04-27 13:43:49 +02:00
muellerr 50b1b48678 link Catch2 issue
fsfw/fsfw/pipeline/head This commit looks good
2022-04-27 13:36:26 +02:00
muellerr 0e0dbc74aa Merge branch 'mueller/hotfix-etl' into mueller/bump-catch2 2022-04-27 09:45:42 +02:00
muellerr 8c34051d8b bump Catch2 revision 2022-04-27 09:45:20 +02:00
muellerr b00d83cb1a bump ETL revision
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-04-27 09:41:16 +02:00
muellerr 17e609c3a5 some more var replacements
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-04-27 09:37:11 +02:00
muellerr 64f0166b64 hotfix for new ETL dependency
fsfw/fsfw/pipeline/head This commit looks good
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-04-27 09:16:52 +02:00
muellerr c80f06fbcb hotfix for ETL lib dep 2022-04-27 09:08:17 +02:00
muellerr 70eb8325a0 Merge remote-tracking branch 'upstream/development' into mueller/compiler-warning-fixes-upstream-2
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-04-27 08:47:45 +02:00
muellerr e796f82203 Merge pull request 'gpio bug fix' (#602) from KSat/fsfw:hoffmann/gpioBugfix into development
fsfw/fsfw/pipeline/head This commit looks good
Reviewed-on: #602
2022-04-27 08:41:54 +02:00
muellerr 5b7ca8c13c update CHANGELOG.md, apply afmt 2022-04-27 08:39:21 +02:00
muellerr c1be1fe232 update CMakeLists.txt etl handling 2022-04-26 20:06:26 +02:00
muellerr ec2e274f22 find_package call for Catch2 quiet 2022-04-26 16:31:45 +02:00
muellerr c5a7b98a7d name correction 2022-04-26 16:24:14 +02:00
muellerr 6a8da303fb exporting etl target 2022-04-26 14:06:30 +02:00
muellerr 031739ef51 Merge branch 'development' into hoffmann/gpioBugfix
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-04-25 15:45:21 +02:00
muellerr 80be937d9d Merge remote-tracking branch 'upstream/development' into mueller/compiler-warning-fixes-upstream-2
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-04-25 15:24:17 +02:00
muellerr 29015b340b update changelog
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-04-25 15:10:50 +02:00
muellerr ff98c42514 Merge branch 'development' into mueller/clock-addition
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-04-25 14:54:22 +02:00
muellerr 24ef96d1b8 Merge branch 'eive/develop' into mueller/extend-version-class-fork 2022-04-22 16:04:55 +02:00
muellerr 18f9958332 add git CST and sha info to version ctor
fsfw/fsfw/pipeline/pr-development There was a failure building this commit
2022-04-22 15:39:44 +02:00
muellerr 68231db9a1 changelog typo
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-04-22 15:37:14 +02:00
muellerr 85e849ca00 small remaining fix
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-04-22 15:10:08 +02:00
muellerr 617d41c7d5 maybe this fixed CI/CD issues
fsfw/fsfw/pipeline/pr-development There was a failure building this commit
2022-04-22 15:08:16 +02:00
muellerr cccdced74d unique helper file name
fsfw/fsfw/pipeline/pr-development There was a failure building this commit
2022-04-22 15:00:04 +02:00
muellerr 750369b0a6 small addition and possible fix
fsfw/fsfw/pipeline/pr-development There was a failure building this commit
2022-04-22 14:55:17 +02:00
muellerr 539e01deee minor form change
fsfw/fsfw/pipeline/pr-development There was a failure building this commit
2022-04-22 14:53:12 +02:00
muellerr 4079edc80e update changelog 2022-04-22 14:52:55 +02:00
muellerr a569990ca2 fix tests
fsfw/fsfw/pipeline/pr-development There was a failure building this commit
2022-04-22 14:50:50 +02:00
muellerr 9c7eba4431 git version handler more robust now
fsfw/fsfw/pipeline/pr-development There was a failure building this commit
2022-04-22 14:47:28 +02:00
muellerr 513ae9dc10 prefixed git info variable
fsfw/fsfw/pipeline/pr-development There was a failure building this commit
2022-04-22 14:38:32 +02:00
muellerr effecd4662 include cmake-modules manually instead
- Instead of using FetchContent
- Separate folder for easier update and for distintion
- LICENSE file included
2022-04-22 14:33:34 +02:00
muellerr b951cb736a add fsfw specific cmake message prefix 2022-04-22 14:08:26 +02:00
muellerr 7e1aed6ad9 apply afmt 2022-04-22 14:04:30 +02:00
muellerr 07155e2546 extend version handling with git describe 2022-04-22 14:04:18 +02:00
muellerr 8c6c8ad3c0 exntend version class to allow add info 2022-04-22 11:58:44 +02:00
muellerr befaca78c6 Merge pull request 'space packet default length' (#66) from meier/develop into eive/develop
Reviewed-on: eive/fsfw#66
2022-04-21 14:30:34 +02:00
muellerr af4f002a25 Merge branch 'eive/develop' into meier/develop 2022-04-21 14:30:11 +02:00
muellerr f0d7eaf35a Merge branch 'merge-upstream' into mueller/lis3-handler-nullptr-check
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-04-21 10:38:43 +02:00
muellerr b128ef9da9 Merge remote-tracking branch 'upstream/development' into merge-upstream 2022-04-21 10:37:01 +02:00
muellerr 085213c60f add nullptr check
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-04-21 10:30:46 +02:00
muellerr 935a8e13a5 uart cookie API change 2022-04-13 14:57:43 +02:00
muellerr 5ff88129b8 added DLE parser 2022-04-13 14:45:36 +02:00
muellerr 07f5dbb9ac Merge branch 'development' into mueller/compiler-warning-fixes-upstream-2
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-04-12 17:08:56 +02:00
muellerr 97e98eae24 Merge branch 'development' into mueller/ipc-pass-arbitrary-args-to-mq
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-04-12 17:06:30 +02:00
muellerr b03a6684f9 Merge branch 'development' into mueller/small-stm32-hal-bugifx
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-04-11 17:34:39 +02:00
muellerr afce942bf8 Merge branch 'development' into mueller/compiler-warning-fixes-upstream-2
fsfw/fsfw/pipeline/pr-development There was a failure building this commit
2022-04-11 17:33:04 +02:00
muellerr a1d7a56dfa small fix
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-04-11 17:14:43 +02:00
muellerr cb78fefbb3 afmt
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-04-11 17:14:04 +02:00
muellerr f0d996ffd2 Merge branch 'development' into mueller/add-etl-dependency 2022-04-11 16:17:46 +02:00
muellerr f4d05c2c9c Merge branch 'mueller/ipc-pass-arbitrary-args-to-mq' of https://egit.irs.uni-stuttgart.de/eive/fsfw into mueller/ipc-pass-arbitrary-args-to-mq
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-04-11 16:13:55 +02:00
muellerr d1151ca707 changelog update 2022-04-11 16:13:47 +02:00
muellerr 82f46992f6 Merge branch 'development' into mueller/ipc-pass-arbitrary-args-to-mq
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-04-11 16:11:57 +02:00
muellerr 9947a648df fix compiler warnings
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-04-11 16:06:13 +02:00
muellerr c45328b34d Merge branch 'eive/develop' into mueller/compiler-warning-fixes-upstream 2022-04-11 16:03:52 +02:00
muellerr 478b305fbe fix compiler warnings 2022-04-11 16:02:20 +02:00
muellerr 942d1e5e4b Merge remote-tracking branch 'origin/eive/develop' into mueller/ipc-pass-arbitrary-args-to-mq-eive 2022-04-11 14:40:43 +02:00
muellerr c0f80680ef Merge branch 'mueller/propagate-pool-manage-retval' of https://egit.irs.uni-stuttgart.de/eive/fsfw into mueller/propagate-pool-manage-retval
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-04-11 14:35:28 +02:00
muellerr 7761b66fe2 delete data from ipc store if reply fails 2022-04-11 14:35:16 +02:00
muellerr acc4c8d975 check serialize result as well 2022-04-11 14:33:28 +02:00
muellerr fe739aa81a Merge branch 'development' into mueller/propagate-pool-manage-retval
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-04-11 14:26:34 +02:00
muellerr 95f018a0b0 update IF method
fsfw/fsfw/pipeline/pr-development This commit looks good
2022-04-11 14:07:02 +02:00