|
878e32cbe8
|
Merge branch 'development' into mueller/add-tc-scheduler-pus-11
|
2022-05-16 14:29:02 +02:00 |
|
|
4821706561
|
Merge branch 'development' into mueller/extend-version-class
|
2022-05-16 14:16:53 +02:00 |
|
|
dba08fed7a
|
refactor task IF
|
2022-05-14 09:40:31 +02:00 |
|
|
7df1922633
|
refactor task IF
|
2022-05-14 09:38:59 +02:00 |
|
|
4841d5d92d
|
doc update
|
2022-05-13 17:24:55 +02:00 |
|
|
970f039e85
|
Merge remote-tracking branch 'origin/development' into mueller/extend-version-class
|
2022-05-13 13:21:01 +02:00 |
|
|
271057ca6b
|
Merge remote-tracking branch 'upstream/development' into mueller/extend-version-class
|
2022-05-13 11:28:54 +02:00 |
|
|
861335212e
|
Merge remote-tracking branch 'upstream/development' into mueller/add-tc-scheduler-pus-11
|
2022-05-13 00:30:18 +02:00 |
|
|
038e47a46e
|
better returncode handling
|
2022-05-13 00:30:01 +02:00 |
|
|
02473a0cd7
|
Merge remote-tracking branch 'origin/develop' into mueller/health-if-extension-eive
|
2022-05-12 20:11:45 +02:00 |
|
|
ab45aa1296
|
HasHealthIF additions
|
2022-05-12 20:06:10 +02:00 |
|
|
171c48495c
|
Merge remote-tracking branch 'upstream/development' into mueller/power-switcher-component-upstream
|
2022-05-12 19:07:12 +02:00 |
|
|
b8cfb36426
|
added additional explicit returnvalues
|
2022-05-12 17:05:58 +02:00 |
|
|
c4c340fde1
|
lot of refactoring
|
2022-05-12 16:56:06 +02:00 |
|
|
9a4c7589cc
|
Merge remote-tracking branch 'upstream/development' into mueller/add-tc-scheduler-pus-11
|
2022-05-12 15:52:47 +02:00 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
70eb8325a0
|
Merge remote-tracking branch 'upstream/development' into mueller/compiler-warning-fixes-upstream-2
|
2022-04-27 08:47:45 +02:00 |
|
|
8e4ad10627
|
Merge remote-tracking branch 'upstream/development' into mueller/extend-version-class
|
2022-04-27 08:46:18 +02:00 |
|
|
496bc665d6
|
Merge remote-tracking branch 'upstream/development' into mueller/add-tc-scheduler-pus-11
|
2022-04-27 08:45:47 +02:00 |
|
|
2c8531ea48
|
Merge remote-tracking branch 'upstream/development' into mueller/refactor-power-switch-if-etc
|
2022-04-27 08:45:04 +02:00 |
|
|
5b7ca8c13c
|
update CHANGELOG.md, apply afmt
|
2022-04-27 08:39:21 +02:00 |
|
|
1739edd9b0
|
warning fix for modern compilers
|
2022-04-26 10:32:37 +02:00 |
|
|
466a3639a5
|
Merge remote-tracking branch 'upstream/development' into mueller/update-fsfw
|
2022-04-26 10:02:43 +02:00 |
|
Jakob Meier
|
900ef5b912
|
option to use coutdwon object to time out replies
|
2022-04-26 09:07:03 +02:00 |
|
|
88051c9302
|
Merge remote-tracking branch 'upstream/development' into mueller/refactor-power-switch-if-etc
|
2022-04-25 15:37:03 +02:00 |
|
|
80be937d9d
|
Merge remote-tracking branch 'upstream/development' into mueller/compiler-warning-fixes-upstream-2
|
2022-04-25 15:24:17 +02:00 |
|
|
d62ee6a611
|
Merge remote-tracking branch 'upstream/development' into mueller/extend-version-class
|
2022-04-25 15:23:46 +02:00 |
|
Robin Mueller
|
91ef4ff30b
|
Merge remote-tracking branch 'upstream/development' into mueller/add-tc-scheduler-pus-11
|
2022-04-25 15:23:15 +02:00 |
|
|
4032228005
|
Merge remote-tracking branch 'upstream/development' into mueller/extend-version-class
|
2022-04-25 15:15:54 +02:00 |
|
|
50ce13d596
|
Merge branch 'development' into mueller/power-switcher-component-upstream
|
2022-04-25 15:14:38 +02:00 |
|
Robin Mueller
|
68302e7c5e
|
Merge remote-tracking branch 'upstream/development' into mueller/add-tc-scheduler-pus-11
|
2022-04-25 15:14:13 +02:00 |
|
|
ff98c42514
|
Merge branch 'development' into mueller/clock-addition
|
2022-04-25 14:54:22 +02:00 |
|
|
24ef96d1b8
|
Merge branch 'eive/develop' into mueller/extend-version-class-fork
|
2022-04-22 16:04:55 +02:00 |
|
|
18f9958332
|
add git CST and sha info to version ctor
|
2022-04-22 15:39:44 +02:00 |
|
|
7e1aed6ad9
|
apply afmt
|
2022-04-22 14:04:30 +02:00 |
|
|
07155e2546
|
extend version handling with git describe
|
2022-04-22 14:04:18 +02:00 |
|
|
8c6c8ad3c0
|
exntend version class to allow add info
|
2022-04-22 11:58:44 +02:00 |
|
|
af4f002a25
|
Merge branch 'eive/develop' into meier/develop
|
2022-04-21 14:30:11 +02:00 |
|
Jakob Meier
|
9f7b9be800
|
space packet default length 0
|
2022-04-21 14:24:20 +02:00 |
|
|
2c0f3b52e9
|
Merge pull request 'Space Packet Default Length' (#65) from meier/develop into eive/develop
Reviewed-on: eive/fsfw#65
|
2022-04-21 14:11:09 +02:00 |
|
|
b128ef9da9
|
Merge remote-tracking branch 'upstream/development' into merge-upstream
|
2022-04-21 10:37:01 +02:00 |
|
Jakob Meier
|
613dbe9592
|
default argument
|
2022-04-21 09:33:06 +02:00 |
|
|
5ff88129b8
|
added DLE parser
|
2022-04-13 14:45:36 +02:00 |
|
|
ce17be63f4
|
Merge pull request 'Pool Entry Update V2' (#60) from mueller/pool-entry-update-v2 into eive/develop
Reviewed-on: eive/fsfw#60
|
2022-04-12 19:28:01 +02:00 |
|
Robin Mueller
|
35f257800e
|
Merge remote-tracking branch 'upstream/development' into mueller/add-tc-scheduler-pus-11
|
2022-04-12 17:10:55 +02:00 |
|
|
97e98eae24
|
Merge branch 'development' into mueller/ipc-pass-arbitrary-args-to-mq
|
2022-04-12 17:06:30 +02:00 |
|
|
afce942bf8
|
Merge branch 'development' into mueller/compiler-warning-fixes-upstream-2
|
2022-04-11 17:33:04 +02:00 |
|
|
a1d7a56dfa
|
small fix
|
2022-04-11 17:14:43 +02:00 |
|
|
cb78fefbb3
|
afmt
|
2022-04-11 17:14:04 +02:00 |
|
|
82f46992f6
|
Merge branch 'development' into mueller/ipc-pass-arbitrary-args-to-mq
|
2022-04-11 16:11:57 +02:00 |
|
|
4ed9cc933f
|
Merge branch 'development' into mueller/refactor-power-switch-if-etc
|
2022-04-11 16:11:27 +02:00 |
|