|
|
7f6c8b8b12
|
Merge remote-tracking branch 'upstream/development' into eive/develop
|
2022-05-02 16:15:27 +02:00 |
|
|
|
54feb77770
|
Proposed fix for gcc and clang
|
2022-05-02 16:14:23 +02:00 |
|
|
|
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 |
|
|
|
3e9d6bdbb9
|
Merge branch 'development' into gaisser_cuc_tests
|
2022-05-02 15:24:32 +02:00 |
|
|
|
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 |
|
|
|
57e6c46e72
|
Merge branch 'development' into mueller/missing-preproc-defs
|
2022-05-02 15:16:37 +02:00 |
|
|
|
cddf16f941
|
Merge branch 'development' into mueller/mac-os
|
2022-05-02 15:15:53 +02:00 |
|
|
|
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 |
|
|
|
a3617cad11
|
preproc guards
|
2022-05-02 15:12:38 +02:00 |
|
|
|
8edf4c3c8d
|
Merge branch 'development' into meier/spacePacketBugFix
|
2022-05-02 15:10:32 +02:00 |
|
|
|
7801c6effe
|
Merge remote-tracking branch 'upstream/development' into mueller/new-ss-adder-functions
|
2022-05-02 15:09:09 +02:00 |
|
|
|
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 |
|
|
|
b62c19a364
|
Merge branch 'development' into mueller/extend-version-class
|
2022-05-02 14:48:23 +02:00 |
|
|
|
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 |
|
|
|
7cfb1e6076
|
Merge branch 'development' into mueller/bump-catch2
|
2022-05-02 14:36:44 +02:00 |
|
|
|
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 |
|
|
|
4c65109ac0
|
Merge branch 'development' into meier/spacePacketBugFix
|
2022-05-02 14:36:24 +02:00 |
|
|
|
861bd15eda
|
Merge branch 'development' into mueller/hotfix-etl
|
2022-05-02 14:20:40 +02:00 |
|
|
|
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 |
|
|
|
16714ceb40
|
Merge branch 'development' into gaisser_cuc_tests
|
2022-05-02 13:58:17 +02:00 |
|
|
|
fea301bcc9
|
Merge remote-tracking branch 'origin/mueller/hotfix-etl' into mueller/mac-os
|
2022-05-02 09:35:28 +02:00 |
|
|
|
77450eb4b7
|
removed flag which does not exist
|
2022-05-02 09:09:41 +02:00 |
|
|
|
28015c4735
|
it compiles and runs
|
2022-05-01 17:48:49 +02:00 |
|
|
|
7d61e67d20
|
more macos changes
|
2022-04-30 19:02:41 +02:00 |
|
|
|
afcbc8be0a
|
changes for MacOS
|
2022-04-30 18:40:22 +02:00 |
|
|
|
7760b3063e
|
Merge pull request 'New Subsystem adder functions' (#73) from mueller/new-ss-adder-functions-eive into eive/develop
Reviewed-on: eive/fsfw#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 |
|
|
|
e867d09111
|
Merge pull request 'Update from upstream' (#72) from mueller/update-from-upstream into eive/develop
Reviewed-on: eive/fsfw#72
|
2022-04-30 16:55:35 +02:00 |
|
|
|
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 |
|
|
|
bf2e0f2d73
|
added option to change initial submode
|
2022-04-28 16:49:13 +02:00 |
|
|
|
3225a8e350
|
added option to change initial submode
|
2022-04-28 16:48:14 +02:00 |
|
|
|
e98857fab4
|
update changelog
|
2022-04-28 14:37:21 +02:00 |
|
|
|
1c4ea6dd0d
|
Merge branch 'eive/develop' into mueller/new-ss-adder-functions-eive
|
2022-04-28 14:34:20 +02:00 |
|
|
|
e2eb4bfea4
|
Merge remote-tracking branch 'upstream/development' into mueller/update-from-upstream
|
2022-04-28 14:30:08 +02:00 |
|
|
|
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 |
|
|
|
8642b13fd1
|
Merge branch 'mueller/hotfix-etl' into mueller/bump-catch2
|
2022-04-27 21:55:45 +02:00 |
|
|
|
6aa72892ed
|
clean usage of FetchContent_MakeAvailable
|
2022-04-27 21:53:57 +02:00 |
|
|
|
70f0a72f1b
|
added explicit checkout of v3.0.0-preview5
|
2022-04-27 13:54:15 +02:00 |
|
|
|
b5d890eedd
|
install Catch2 for docker_d2 and update Jenkinsfile
|
2022-04-27 13:43:49 +02:00 |
|
|
|
50b1b48678
|
link Catch2 issue
|
2022-04-27 13:36:26 +02:00 |
|
|
|
0e0dbc74aa
|
Merge branch 'mueller/hotfix-etl' into mueller/bump-catch2
|
2022-04-27 09:45:42 +02:00 |
|
|
|
8c34051d8b
|
bump Catch2 revision
|
2022-04-27 09:45:20 +02:00 |
|
|
|
b00d83cb1a
|
bump ETL revision
|
2022-04-27 09:41:16 +02:00 |
|
|
|
17e609c3a5
|
some more var replacements
|
2022-04-27 09:37:11 +02:00 |
|
|
|
64f0166b64
|
hotfix for new ETL dependency
|
2022-04-27 09:16:52 +02:00 |
|
|
|
c80f06fbcb
|
hotfix for ETL lib dep
|
2022-04-27 09:08:17 +02:00 |
|
