|
d11f898f70
|
update dummy power switcher docs
|
2022-05-12 15:02:06 +02:00 |
|
|
dafcaa6007
|
Merge remote-tracking branch 'origin/develop' into mueller/spi-cache-spi-dev-in-com-if
|
2022-05-11 15:44:45 +02:00 |
|
|
025e7647d3
|
Merge branch 'develop' into meier/sequenceCount
|
2022-05-11 15:43:35 +02:00 |
|
|
0a97077a0e
|
hotfix
|
2022-05-11 15:42:52 +02:00 |
|
Jakob Meier
|
bc994595da
|
sequence count init value
|
2022-05-11 14:31:49 +02:00 |
|
|
e1604b292c
|
Merge branch 'development' into mueller/possible-ring-buffer-fix
|
2022-05-11 11:34:32 +02:00 |
|
|
e06c457743
|
Cache SPI device name in ComIF
- Architecturally, this makes a lot more sense because
each ComIF should be responsible for one SPI bus
|
2022-05-11 11:11:39 +02:00 |
|
|
5941c21adf
|
Merge remote-tracking branch 'origin/develop' into mueller/spi-speed-mode-getter
|
2022-05-11 10:58:13 +02:00 |
|
|
dd986fefd3
|
experimenting with PRE_BUILD command
|
2022-05-10 11:51:25 +02:00 |
|
|
b38329aa0e
|
Merge branch 'development' into mueller/extend-version-class
|
2022-05-10 11:19:48 +02:00 |
|
|
c5b4499d98
|
Merge remote-tracking branch 'upstream/development' into mueller/refactor-power-switch-if-etc
|
2022-05-10 09:58:21 +02:00 |
|
|
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 |
|
|
be6a492022
|
Merge branch 'development' into mueller/extend-version-class
|
2022-05-09 22:34:09 +02:00 |
|
|
3448292e8a
|
Merge branch 'development' into mueller/tcp-server-bugfix
|
2022-05-09 16:56:07 +02:00 |
|
|
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 |
|
|
ece32f88f4
|
Merge remote-tracking branch 'origin/development' into mueller/tcp-server-bugfix
|
2022-05-09 16:14:17 +02:00 |
|
|
eb494707af
|
Merge remote-tracking branch 'upstream/development' into mueller/power-switcher-component-upstream
|
2022-05-09 15:51:28 +02:00 |
|
|
281f91ec5d
|
Merge remote-tracking branch 'origin/development' into mueller/health-srv-bugfix
|
2022-05-09 15:41:10 +02:00 |
|
Jakob Meier
|
7afe30ea88
|
fixed merge conflict
|
2022-05-09 12:56:22 +02:00 |
|
|
80a5ed3c5b
|
added back fsfw namespace
|
2022-05-09 11:06:45 +02:00 |
|
|
5d5a355110
|
Merge remote-tracking branch 'upstream/development' into mueller/extend-version-class
|
2022-05-09 11:04:15 +02:00 |
|
|
c78b7c432b
|
Merge branch 'development' into mueller/refactor-power-switch-if-etc
|
2022-05-09 11:02:45 +02:00 |
|
|
16e55a98ce
|
important bugfix for TCP server
|
2022-05-09 10:57:23 +02:00 |
|
|
e5e163bdbf
|
mark unused function
|
2022-05-09 10:47:56 +02:00 |
|
|
4e4820af05
|
bugfix for prepareHealthSetReply function
|
2022-05-09 10:47:23 +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 |
|
|
de2d4da161
|
Merge branch 'eive/develop' into meier/develop
|
2022-05-05 12:28:34 +02:00 |
|
|
f59b05c86c
|
use warning instead of error
|
2022-05-05 02:00:41 +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 |
|
|
3332f68ce7
|
Tested only std::numeric_limits in MSVC
|
2022-05-02 17:22:13 +02:00 |
|
|
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 |
|
|
3e9d6bdbb9
|
Merge branch 'development' into gaisser_cuc_tests
|
2022-05-02 15:24:32 +02:00 |
|
|
cddf16f941
|
Merge branch 'development' into mueller/mac-os
|
2022-05-02 15:15:53 +02:00 |
|
|
7801c6effe
|
Merge remote-tracking branch 'upstream/development' into mueller/new-ss-adder-functions
|
2022-05-02 15:09:09 +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 |
|
|
4c65109ac0
|
Merge branch 'development' into meier/spacePacketBugFix
|
2022-05-02 14:36:24 +02:00 |
|
|
16714ceb40
|
Merge branch 'development' into gaisser_cuc_tests
|
2022-05-02 13:58:17 +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 |
|
|
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 |
|
|
1c4ea6dd0d
|
Merge branch 'eive/develop' into mueller/new-ss-adder-functions-eive
|
2022-04-28 14:34:20 +02:00 |
|