Commit Graph

4550 Commits

Author SHA1 Message Date
Jakob Meier b0b75b85a9 Merge branch 'meier/sequenceCount' into meier/develop 2022-05-11 16:54:06 +02:00
Jakob Meier bc994595da sequence count init value 2022-05-11 14:31:49 +02:00
Robin Müller de2d4da161 Merge branch 'eive/develop' into meier/develop 2022-05-05 12:28:34 +02:00
Jakob Meier 19bd26d998 Merge branch 'meier/develop' of https://egit.irs.uni-stuttgart.de/eive/fsfw into meier/develop 2022-05-05 09:15:23 +02:00
Jakob Meier 80cb0e682f Merge pull request 'Update GPIO API' (#76) from mueller/update-gpio-api into eive/develop
Reviewed-on: #76
2022-05-04 14:03:28 +02:00
Jakob Meier 8ee26f81f9 dedicated returnvalue for line get failure 2022-05-04 10:36:32 +02:00
Jakob Meier 3556eca8e8 error check on line getter 2022-05-04 10:33:55 +02:00
Jakob Meier a9041b84a3 update read gpio API 2022-05-04 10:27:20 +02:00
Jakob Meier 83d9dbc052 Merge pull request 'improved i2c error printout' (#75) from mueller/i2c-error-handling-improvement into eive/develop
Reviewed-on: #75
2022-05-03 16:50:48 +02:00
Robin Müller 2220120d54
improved i2c error printout 2022-05-03 16:43:15 +02:00
Robin Müller 15eb22f9ee Merge remote-tracking branch 'origin/eive/develop' into meier/develop 2022-05-03 13:03:44 +02:00
Robin Müller 7f6c8b8b12
Merge remote-tracking branch 'upstream/development' into eive/develop 2022-05-02 16:15:27 +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
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 daffb6b666 Merge branch 'development' into gaisser_cuc_tests 2022-05-02 14:45:33 +02:00
Jakob Meier 789668ae50 Merge branch 'eive/develop' into meier/develop 2022-05-02 14:45:23 +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
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
Jakob Meier 7760b3063e Merge pull request 'New Subsystem adder functions' (#73) from mueller/new-ss-adder-functions-eive into eive/develop
Reviewed-on: #73
2022-04-30 17:00:34 +02:00
Jakob Meier d04f88bee0 Merge branch 'eive/develop' into mueller/new-ss-adder-functions-eive 2022-04-30 16:59:48 +02:00
Jakob Meier e867d09111 Merge pull request 'Update from upstream' (#72) from mueller/update-from-upstream into eive/develop
Reviewed-on: #72
2022-04-30 16:55:35 +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
Jakob Meier 43aad11859 space packet bugfix 2022-04-29 07:43:52 +02:00
Robin Müller 3225a8e350
added option to change initial submode 2022-04-28 16:48:14 +02:00
Robin Müller 1c4ea6dd0d Merge branch 'eive/develop' into mueller/new-ss-adder-functions-eive 2022-04-28 14:34:20 +02:00
Robin Müller e2eb4bfea4 Merge remote-tracking branch 'upstream/development' into mueller/update-from-upstream 2022-04-28 14:30:08 +02:00
Robin Müller 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
Robin Müller 8642b13fd1
Merge branch 'mueller/hotfix-etl' into mueller/bump-catch2 2022-04-27 21:55:45 +02:00
Robin Müller 6aa72892ed
clean usage of FetchContent_MakeAvailable 2022-04-27 21:53:57 +02:00
Robin Müller 70f0a72f1b
added explicit checkout of v3.0.0-preview5 2022-04-27 13:54:15 +02:00
Robin Müller b5d890eedd
install Catch2 for docker_d2 and update Jenkinsfile 2022-04-27 13:43:49 +02:00
Robin Müller 50b1b48678
link Catch2 issue 2022-04-27 13:36:26 +02:00
Robin Müller 0e0dbc74aa Merge branch 'mueller/hotfix-etl' into mueller/bump-catch2 2022-04-27 09:45:42 +02:00
Robin Müller 8c34051d8b
bump Catch2 revision 2022-04-27 09:45:20 +02:00