ff40a71582
Merge remote-tracking branch 'upstream/development' into mueller/possible-ring-buffer-fix
2022-05-13 11:30:32 +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
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
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
d3e7037759
Merge branch 'development' into mueller/possible-ring-buffer-fix
2022-04-27 08:42:24 +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
Jakob Meier
951c077abc
option to use Countdown object to time out replies
2022-04-26 10:03:04 +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
755dcf66a3
Merge remote-tracking branch 'upstream/development' into mueller/possible-ring-buffer-fix
2022-04-25 15:16:52 +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: #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: #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
7a5ce57bbc
Merge branch 'development' into mueller/possible-ring-buffer-fix
2022-04-11 17:35:42 +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
7af1c86f1c
use default call
2022-04-11 16:10:17 +02:00
bd0b7aa230
Merge branch 'mueller/power-switcher-component-upstream' of https://egit.irs.uni-stuttgart.de/eive/fsfw into mueller/power-switcher-component-upstream
2022-04-11 16:09:32 +02:00
72e0938f9a
use size instead of capacity on sanity check
2022-04-11 16:09:15 +02:00
dd1b0a9380
Merge branch 'development' into mueller/power-switcher-component-upstream
2022-04-11 16:08:27 +02:00
9947a648df
fix compiler warnings
2022-04-11 16:06:13 +02:00
c45328b34d
Merge branch 'eive/develop' into mueller/compiler-warning-fixes-upstream
2022-04-11 16:03:52 +02:00
478b305fbe
fix compiler warnings
2022-04-11 16:02:20 +02:00
942d1e5e4b
Merge remote-tracking branch 'origin/eive/develop' into mueller/ipc-pass-arbitrary-args-to-mq-eive
2022-04-11 14:40:43 +02:00
c0f80680ef
Merge branch 'mueller/propagate-pool-manage-retval' of https://egit.irs.uni-stuttgart.de/eive/fsfw into mueller/propagate-pool-manage-retval
2022-04-11 14:35:28 +02:00
7761b66fe2
delete data from ipc store if reply fails
2022-04-11 14:35:16 +02:00
acc4c8d975
check serialize result as well
2022-04-11 14:33:28 +02:00
fe739aa81a
Merge branch 'development' into mueller/propagate-pool-manage-retval
2022-04-11 14:26:34 +02:00
Robin Mueller
adfefdd93f
printout tweak
2022-04-11 14:19:01 +02:00
95f018a0b0
update IF method
2022-04-11 14:07:02 +02:00
8c2105ae0a
correct init value for object ID
2022-04-11 14:00:37 +02:00
ed2c2af4a0
take upstream impl of local data pool manager
2022-04-11 13:59:38 +02:00
17771c0497
progagate reply returnvalue
2022-04-11 13:57:18 +02:00
82df132e7d
tests running again
2022-04-11 13:54:43 +02:00
a02619e5a2
strongly simplified and streamlined IPC MQ Impl
...
- Generic code was duplicated across all OSALs.
Is contained in generic base class now
- Remove duplicate documentation
2022-04-11 11:19:38 +02:00
290db6ccad
Merge remote-tracking branch 'upstream/development' into mueller/update-from-upstream
2022-04-11 08:51:55 +02:00
94ed582297
Merge branch 'eive/develop' of https://egit.irs.uni-stuttgart.de/eive/fsfw into eive/develop
2022-04-07 19:47:49 +02:00
47ced1efac
pool entry takes const T* now
2022-04-07 19:47:37 +02:00
f94bc02b6c
Merge branch 'eive/develop' into mueller/clock-update
2022-04-07 17:36:04 +02:00
5bda877d97
improve clock error handler
2022-04-07 17:23:06 +02:00
51e7f1c2f2
Merge pull request 'FSFW Update' ( #54 ) from mueller/clock-update into eive/develop
...
Reviewed-on: #54
2022-04-07 11:33:06 +02:00
3325cc18fc
Merge branch 'eive/develop' into mueller/pool-entry-update
2022-04-07 11:03:56 +02:00
43917d98c0
Merge branch 'mueller/master' of https://egit.irs.uni-stuttgart.de/eive/fsfw into mueller/master
2022-04-07 11:01:49 +02:00
e3ffcae3e0
emit warning in linux clock
2022-04-07 11:01:39 +02:00
0677de39aa
make reporting setter public
2022-04-07 00:15:42 +02:00
aded4fae1e
printout improvement
2022-04-04 20:34:31 +02:00
e4c6a69f77
this should also zero-init the pool entries
2022-04-04 15:44:03 +02:00
761a0c9bac
new pool ctor which only takes len
2022-04-04 15:39:02 +02:00
2d0e4ba951
applied afmt
2022-04-01 18:38:54 +02:00
0d549b687d
Merge branch 'mueller/refactor-power-switch-if-etc' of https://egit.irs.uni-stuttgart.de/eive/fsfw into mueller/refactor-power-switch-if-etc
2022-04-01 18:38:34 +02:00
738f572043
added unit tests, minor API change
2022-04-01 18:38:25 +02:00
cab508fd64
Merge branch 'development' into mueller/refactor-power-switch-if-etc
2022-04-01 17:28:14 +02:00
c7daf697a8
add new power switcher component
2022-04-01 17:27:53 +02:00
518666f822
add power switcher component
2022-04-01 17:01:56 +02:00
c20be13733
change switch type in header as well
2022-04-01 16:40:13 +02:00
1bc7a91869
apply auto-formatter
2022-04-01 14:08:29 +02:00
8e26e287c3
Merge remote-tracking branch 'origin/eive/develop' into mueller/master
2022-04-01 14:07:26 +02:00
b3d2d440d7
Merge remote-tracking branch 'origin/eive/develop' into mueller/master
2022-03-31 16:13:47 +02:00
Jakob Meier
fbf9626fde
Merge branch 'eive/develop' into meier/dhbAlternativeReply
2022-03-31 15:04:55 +02:00
fcb6437388
Merge branch 'development' into mueller/ipc-pass-arbitrary-args-to-mq
2022-03-31 14:42:15 +02:00
Jakob Meier
6c1db8473b
get alternative reply from device command info
2022-03-31 14:36:45 +02:00
29cf8c9009
fix in getReplyLength
2022-03-31 11:42:39 +02:00
127fbeb980
Merge branch 'mueller/refactor-power-switch-if-etc' into mueller/refactor-power-switch-if-etc-eive
2022-03-30 17:41:55 +02:00
b42987059a
make dummy power switcher a system object
2022-03-30 17:41:38 +02:00
c2581ff4f5
Merge remote-tracking branch 'origin/eive/develop' into mueller/master
2022-03-30 13:12:11 +02:00
7b6f68c509
Merge remote-tracking branch 'origin/eive/develop' into mueller/refactor-power-switch-if-etc-eive
2022-03-30 12:14:57 +02:00
Jakob Meier
532607bf8f
extended command info
2022-03-30 09:21:03 +02:00
Jakob Meier
a230dc4313
command action default arguments
2022-03-30 09:20:46 +02:00
82fc7f33a8
update afmt scripts to format *.tpp files
2022-03-29 15:11:41 +02:00
bfa77cf810
Add TC scheduler service
...
- Written by David Woodward as part of the SOURCE project
- Adaptions to make it more generic and compatible to FSFW
2022-03-29 15:07:29 +02:00
a3930dafc5
Moved unused constructors
2022-03-28 21:37:25 +02:00
4f9797af3b
Updated CCSDS CuC Functions
2022-03-28 21:24:33 +02:00
a887f852c8
Merge branch 'development' into mueller/clock-addition
2022-03-28 15:45:58 +02:00
cde184f428
Merge branch 'development' into mohr/task
2022-03-28 15:18:23 +02:00
f598f7030f
Merge remote-tracking branch 'upstream/development' into mueller/possible-ring-buffer-fix
2022-03-28 15:03:01 +02:00
631a531212
Merge branch 'development' into mueller/clock-addition
2022-03-28 14:51:23 +02:00
916ed3f56a
added function to add component to a periodic task by pointer
2022-03-28 13:50:42 +02:00
3ea9f999b7
apply auto-formatter
2022-03-28 12:59:51 +02:00
79f3c7324a
tweaks for dummy power switcher
2022-03-28 12:59:32 +02:00
23af170229
small tweaks
2022-03-28 12:59:03 +02:00
b32d1da421
this should compile
2022-03-28 12:57:11 +02:00
6f0362b956
refactor power module
2022-03-28 12:48:15 +02:00
60972228ef
reworked power switch interface
2022-03-28 12:47:09 +02:00
6ea1eabb2d
small order change in DHB
2022-03-28 12:21:25 +02:00
665d8cd479
Applied clang format
2022-03-25 18:48:53 +01:00
10398855a9
Added more unittest coverage
...
Added Mutex for gmtime functions
Moved Statics used in ClockCommon to ClockCommon
2022-03-25 18:47:31 +01:00
79615e47e4
Merge branch 'eive/develop' into meier/seqCount
2022-03-25 15:48:42 +01:00
d0fec93dc3
argument order inversion
2022-03-25 13:42:49 +01:00
59ab54b2fb
call corrections
2022-03-25 13:41:37 +01:00
7095999bd2
remove CCSDSTime function
2022-03-25 13:34:35 +01:00
7ffb4107d2
added missing docs
2022-03-25 13:34:08 +01:00
879223f38f
added nullptr check
2022-03-24 20:57:42 +01:00
a891769a02
ring buffer cfg error warning
2022-03-24 11:32:27 +01:00
df97c582d7
possibly important fix for ring buffer write
2022-03-23 16:48:17 +01:00
4b5e3e70f7
add option to directly check switch state
2022-03-22 20:35:04 +01:00
9ce59d3c75
added an additional conversion function
...
- timeval to TimeOfDay_t
2022-03-22 17:54:09 +01:00
a0dfdfab2c
Allow passing a MqArgs struct to the MQ creation
...
The struct contains context information (which can be extended)
and an arbitrary user argument in form of a void pointer.
This makes the API a lot more flexible
2022-03-22 17:49:22 +01:00
3e17011087
small tweaks for local datapool code
2022-03-22 17:42:56 +01:00
bbe21e7e89
doc additions
2022-03-22 16:14:23 +01:00
2823420c46
more docs
2022-03-22 16:10:20 +01:00
6dd6f28db0
added active function
2022-03-22 15:55:18 +01:00
d791fc87b7
some improvements for PowerSwitcher
2022-03-22 15:49:04 +01:00
16f2fa9327
Merge remote-tracking branch 'upstream/development' into mueller/master
2022-03-21 10:12:06 +01:00
927041209b
added override specifiers
2022-03-21 09:12:56 +01:00
Jakob Meier
bac8b40880
Merge branch 'eive/develop' into meier/seqCount
2022-03-17 20:02:29 +01:00
Jakob Meier
caf78835b2
added -- operator
2022-03-17 20:00:17 +01:00
b6ed45a85c
small form fix
2022-03-17 19:59:16 +01:00
ddc1cdb1f5
additional docs
2022-03-17 19:22:24 +01:00
543daaa95a
various tweaks and improvements
2022-03-17 19:19:02 +01:00
38c87fdeb2
Merge remote-tracking branch 'upstream/development' into eive/develop
2022-03-17 09:47:20 +01:00
5ca5fe4040
Merge remote-tracking branch 'upstream/development' into eive/develop
2022-03-14 17:50:27 +01:00
Jakob Meier
1b7e0371c3
fixed merge conflict
2022-03-14 15:25:17 +01:00
d2dd16aef3
Merge branch 'development' into mueller/define-fsfw-disabled-printout-upstream
2022-03-14 15:12:37 +01:00
bc95e7c886
Merge branch 'mueller/event-update' of https://egit.irs.uni-stuttgart.de/eive/fsfw into mueller/event-update
2022-03-14 15:08:54 +01:00
fca43b3d34
run auto-formatter
2022-03-14 15:08:45 +01:00
