|
5eb52133ac
|
Merge pull request 'sequence count init value' (#81) from meier/sequenceCount into develop
Reviewed-on: eive/fsfw#81
|
2022-05-11 15:43:49 +02:00 |
|
|
025e7647d3
|
Merge branch 'develop' into meier/sequenceCount
|
2022-05-11 15:43:35 +02:00 |
|
Jakob Meier
|
bc994595da
|
sequence count init value
|
2022-05-11 14:31:49 +02:00 |
|
|
d72b212fa6
|
cmakelists.txt hotfix
|
2022-05-06 10:36:01 +02:00 |
|
|
43f0841d0a
|
Merge pull request 'Fixed Seq Task use warning' (#78) from mueller/fixed-seq-task-use-warning into eive/develop
Reviewed-on: eive/fsfw#78
|
2022-05-05 13:10:07 +02:00 |
|
|
9e5fb64d0e
|
Merge branch 'eive/develop' into mueller/fixed-seq-task-use-warning
|
2022-05-05 12:31:12 +02:00 |
|
|
71f704c980
|
remove the dot
|
2022-05-05 12:29:46 +02:00 |
|
|
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 |
|
|
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 |
|
|
f59b05c86c
|
use warning instead of error
|
2022-05-05 02:00:41 +02:00 |
|
|
80cb0e682f
|
Merge pull request 'Update GPIO API' (#76) from mueller/update-gpio-api into eive/develop
Reviewed-on: eive/fsfw#76
|
2022-05-04 14:03:28 +02:00 |
|
|
8ee26f81f9
|
dedicated returnvalue for line get failure
|
2022-05-04 10:36:32 +02:00 |
|
|
3556eca8e8
|
error check on line getter
|
2022-05-04 10:33:55 +02:00 |
|
|
a9041b84a3
|
update read gpio API
|
2022-05-04 10:27:20 +02:00 |
|
|
83d9dbc052
|
Merge pull request 'improved i2c error printout' (#75) from mueller/i2c-error-handling-improvement into eive/develop
Reviewed-on: eive/fsfw#75
|
2022-05-03 16:50:48 +02:00 |
|
|
2220120d54
|
improved i2c error printout
|
2022-05-03 16:43:15 +02:00 |
|
|
15eb22f9ee
|
Merge remote-tracking branch 'origin/eive/develop' into meier/develop
|
2022-05-03 13:03:44 +02:00 |
|
|
7f6c8b8b12
|
Merge remote-tracking branch 'upstream/development' into eive/develop
|
2022-05-02 16:15:27 +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 |
|
|
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 |
|
|
8edf4c3c8d
|
Merge branch 'development' into meier/spacePacketBugFix
|
2022-05-02 15:10:32 +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 |
|
|
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 |
|
|
3225a8e350
|
added option to change initial submode
|
2022-04-28 16:48:14 +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 |
|