eive/fsfw
eive
/
fsfw
forked from fsfw/fsfw
14
1
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity
4,360 Commits 28 Branches 1 Tag 24 MiB
Commit Graph

4360 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 d45cda93b2 Merge pull request 'important bugfix for TCP server' (#618) from mueller/tcp-server-bugfix into development 
Reviewed-on: fsfw/fsfw#618
 2022-05-09 16:59:54 +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
Steffen Gaisser 46cfe65321 Merge pull request 'Health Service Bugfix' (#617) from mueller/health-srv-bugfix into development 
Reviewed-on: fsfw/fsfw#617
 2022-05-09 16:08:28 +02:00
Robin Müller 96eb8fc21f Merge branch 'development' into gaisser_fix_compile_check 2022-05-09 15:59:44 +02:00
Robin Müller 88fa4f1d9d Merge remote-tracking branch 'origin/development' into mueller/tcp-server-bugfix 2022-05-09 15:55:07 +02:00
Robin Müller 736f8d0238 order fix 2022-05-09 15:50:49 +02:00
Robin Müller f1acf8e18b Merge remote-tracking branch 'upstream/development' into mueller/extend-version-class 2022-05-09 15:48:04 +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
Steffen Gaisser 118f1da8dd Merge pull request 'Bump C++ standard to C++17' (#622) from mueller/cpp17-update into development 
Reviewed-on: fsfw/fsfw#622
 2022-05-09 15:33:52 +02:00
Robin Müller 8b0508d50a Merge branch 'development' into gaisser_fix_compile_check 2022-05-09 15:17:28 +02:00
Steffen Gaisser 83de5b4ec1 Merge branch 'development' into mueller/cpp17-update 2022-05-09 15:13:50 +02:00
Steffen Gaisser fe1c51ae6d Merge pull request 'CMake move some directives up top' (#621) from mueller/cmake-fixes into development 
Reviewed-on: fsfw/fsfw#621
 2022-05-09 15:13:02 +02:00
Robin Müller 10cc954d27 update changelog 2022-05-09 15:09:07 +02:00
Robin Müller 73ff9b97db bump CMAKE_CXX_STANDARD to C++17 2022-05-09 15:07:46 +02:00
Robin Müller b0d71597f0 update changelog 2022-05-09 14:58:39 +02:00
Robin Müller 226f28dc7b Move some directives up top 2022-05-09 14:53:52 +02:00
Robin Müller 398d04dc50
fixed tests 2022-05-09 11:15:18 +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 6bfdace512
update changelog 2022-05-09 11:00:31 +02:00
Robin Müller 16e55a98ce
important bugfix for TCP server 2022-05-09 10:57:23 +02:00
Robin Müller 79f17843d8
update changelog 2022-05-09 10:50:29 +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
Robin Müller 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
Steffen Gaisser 3e9d6bdbb9 Merge branch 'development' into gaisser_cuc_tests 2022-05-02 15:24:32 +02:00
Steffen Gaisser c295539c79 Merge pull request 'Fixes to allow compilation on MacOS' (#611) from mueller/mac-os into development 
Reviewed-on: fsfw/fsfw#611
 2022-05-02 15:22:19 +02:00
Robin Müller cddf16f941 Merge branch 'development' into mueller/mac-os 2022-05-02 15:15:53 +02:00
Robin Müller 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
Steffen Gaisser 8edf4c3c8d Merge branch 'development' into meier/spacePacketBugFix 2022-05-02 15:10:32 +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
Steffen Gaisser 8cc94a55ab Merge pull request 'Bump Catch2 dependency & Catch2 pre-installed for CI/CD' (#605) from mueller/bump-catch2 into development 
Reviewed-on: fsfw/fsfw#605
 2022-05-02 15:03:08 +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 7cfb1e6076 Merge branch 'development' into mueller/bump-catch2 2022-05-02 14:36:44 +02:00
Steffen Gaisser cc36baff78 Merge pull request 'Hotfix CMake & ETL' (#604) from mueller/hotfix-etl into development 
Reviewed-on: fsfw/fsfw#604
 2022-05-02 14:36:29 +02:00
Robin Müller 4c65109ac0 Merge branch 'development' into meier/spacePacketBugFix 2022-05-02 14:36:24 +02:00
Robin Müller 861bd15eda Merge branch 'development' into mueller/hotfix-etl 2022-05-02 14:20:40 +02:00
Steffen Gaisser 7b979eadff Merge pull request 'fix compiler warnings and auto-formatting' (#598) from eive/fsfw:mueller/compiler-warning-fixes-upstream-2 into development 
Reviewed-on: fsfw/fsfw#598
 2022-05-02 14:17:00 +02:00
Steffen Gaisser 16714ceb40 Merge branch 'development' into gaisser_cuc_tests 2022-05-02 13:58:17 +02:00
Robin Müller fea301bcc9 Merge remote-tracking branch 'origin/mueller/hotfix-etl' into mueller/mac-os 2022-05-02 09:35:28 +02:00
Robin Müller 77450eb4b7
removed flag which does not exist 2022-05-02 09:09:41 +02:00