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
48c5c3fbd5
Merge branch 'development' into mueller/event-update
2022-03-14 15:07:25 +01:00
6998626ad4
Merge branch 'development' into mueller/define-fsfw-disabled-printout-upstream
2022-03-14 15:02:07 +01:00
Jakob Meier
d4ade5e885
sequence count operator overloading
2022-03-14 15:01:17 +01:00
24ad858b64
Merge branch 'development' into mueller/countdown-improvement-upstream
2022-03-14 14:46:54 +01:00
522cbc7f3d
Merge remote-tracking branch 'upstream/development' into mueller/version-getter-upstream
2022-03-14 14:38:27 +01:00
ce5bcc5897
bugfix
2022-03-14 14:37:41 +01:00
0bdcb40609
minor event changes
2022-03-11 14:25:34 +01:00
fec5f83f4f
minor event changes
2022-03-11 14:25:01 +01:00
17262a1da9
Merge branch 'mueller/version-getter-upstream' into mueller/master
2022-03-10 09:59:18 +01:00
e684680d60
avoid namespace pollution
2022-03-10 09:58:37 +01:00
aa5d1042f0
undef major and minor
2022-03-10 09:57:37 +01:00
b5d6b9745f
undef major and minor
2022-03-10 09:56:23 +01:00
60639f56dc
Merge branch 'mueller/version-getter' into mueller/master
2022-03-10 09:47:32 +01:00
7daa9812ff
added tests
2022-03-10 09:35:10 +01:00
97bc71a3ff
added tests
2022-03-10 09:34:29 +01:00
06577ed78a
Merge branch 'mueller/version-getter' into mueller/master
2022-03-09 19:11:57 +01:00
ca508bfe61
getter not required anymore
2022-03-09 19:10:33 +01:00
b27f3b84aa
getter not required anymore
2022-03-09 19:10:05 +01:00
345a799031
improved version.h
2022-03-09 19:08:17 +01:00
9509847b84
Merge branch 'mueller/version-getter' into mueller/master
2022-03-09 19:05:30 +01:00
45b51f9ac8
improved version.h
2022-03-09 19:05:07 +01:00
d5ff6da40b
Merge pull request 'function to get fsfw version' ( #43 ) from mueller/version-getter into eive/develop
...
Reviewed-on: #43
2022-03-08 12:04:13 +01:00
238baa8597
call setTimeout
2022-03-08 11:54:20 +01:00
47d158156b
call setTimeout
2022-03-08 11:52:33 +01:00
d63c01b96f
set timeout in countdown ctor
2022-03-08 11:50:47 +01:00
3b497dbb8d
Merge branch 'mueller/version-getter' into mueller/master
2022-03-08 10:16:56 +01:00
7932afc315
small form change
2022-03-08 10:13:11 +01:00
d1e3dc4d49
define FSFW_DISABLE_PRINTOUT in any case
2022-03-08 10:12:02 +01:00
73f0b9c0dc
Merge pull request 'define FSFW_DISABLE_PRINTOUT in any case' ( #42 ) from mueller/define-fsfw-disabled-printout into eive/develop
...
Reviewed-on: #42
2022-03-08 10:11:45 +01:00
ca70c8c614
function to get fsfw version
2022-03-08 10:07:07 +01:00
7ca6d1a695
function to get fsfw version
2022-03-08 10:05:18 +01:00
cc3210f366
Merge branch 'eive/develop' into mueller/define-fsfw-disabled-printout
2022-03-08 09:57:43 +01:00
155d66e534
define FSFW_DISABLE_PRINTOUT in any case
2022-03-08 09:57:11 +01:00
dba3c27b99
define FSFW_DISABLE_PRINTOUT in any case
2022-03-08 09:56:24 +01:00
84f95e8d76
this is better
2022-03-08 09:45:58 +01:00
8b1c277c58
better name of invalid mode retval
2022-03-08 09:34:22 +01:00
8b1af232c3
Added Tests for CCSDS Time, fixed LPM Test
...
Changed behaviour of Host and Linux Clock
2022-03-07 18:22:10 +01:00
7571987a1d
Merge branch 'eive/develop' into mueller/master
2022-03-07 15:43:52 +01:00
d6c1041133
Merge remote-tracking branch 'upstream/development' into eive/develop
2022-03-07 15:34:11 +01:00
7db11588b4
Merge branch 'development' into gaisser_compiler_flags
2022-03-07 14:39:01 +01:00
10ffa2f44a
Merge branch 'development' into mueller/dev-printout-runtime-configurable
2022-03-07 14:20:56 +01:00
117747970d
some forgotten size_t
2022-03-05 22:03:25 +01:00
3c53e2c259
renamed some ModeIF definitions
2022-03-05 03:01:43 +01:00
45f0d7fd45
docs
2022-03-04 18:06:57 +01:00
aebab4c73c
Merge remote-tracking branch 'upstream/development' into mueller/master
2022-03-04 15:08:45 +01:00
c3c2e1c0dd
Merge remote-tracking branch 'upstream/development' into eive/develop
2022-03-04 15:08:07 +01:00
4e6c1cb72a
docs
2022-03-04 00:55:41 +01:00
e2eb6a46b6
Merge branch 'eive/develop' into mueller/master
2022-03-03 13:43:15 +01:00
0ccaf27fcb
better printout for parameter code
2022-03-01 19:43:21 +01:00
95078e1103
Merge remote-tracking branch 'upstream/development' into mueller/dev-printout-runtime-configurable
2022-02-28 15:52:54 +01:00
e05e203c83
fix merge conflict
2022-02-28 15:50:27 +01:00
ac036b2a70
Merge remote-tracking branch 'origin/eive/develop' into mueller/gpio-hal-updates
2022-02-28 15:49:11 +01:00
2d9216ba19
Merge branch 'mueller/gpio-hal-updates' into mueller/master
2022-02-28 15:37:03 +01:00
2fed161eff
Merge branch 'eive/develop' into mueller/gpio-hal-updates
2022-02-28 15:34:48 +01:00
68ca6fd122
Merge branch 'development' into gaisser_compiler_flags
2022-02-28 15:29:57 +01:00
19d217e3b9
Merge remote-tracking branch 'upstream/development' into mueller/dev-printout-runtime-configurable
2022-02-28 15:23:54 +01:00
20928732ec
Merge branch 'development' into gaisser_unit_test_internal_error
2022-02-28 15:19:44 +01:00
cf45eca100
Merge remote-tracking branch 'upstream/development' into mueller/dev-printout-runtime-configurable
2022-02-28 15:00:38 +01:00
c0fa365f8f
Merge remote-tracking branch 'upstream/development' into mueller/delete-obsolete-module
2022-02-28 14:58:28 +01:00
bbacdc5cac
Merge pull request 'Linux HAL: Add I2C wiretapping option' ( #559 ) from eive/fsfw:mueller/hal-i2c-wiretapping into development
...
Reviewed-on: fsfw/fsfw#559
2022-02-28 14:55:21 +01:00
Jakob Meier
eacb4ac407
initial submode
2022-02-25 14:41:43 +01:00
123f2ff360
removed unnecessary warning
2022-02-25 11:10:48 +01:00
0e8328fca3
Fixed include based on Feedback
2022-02-24 11:22:51 +01:00
1ef3dae72e
Fixed an missing include
2022-02-23 22:36:29 +01:00
32381a7872
Fixed an issue with wrong buffer size
2022-02-23 21:20:22 +01:00
09815f5cce
Clang format
2022-02-23 18:24:07 +01:00
f6357b4531
WIP compiler Flags and new unit tests for fixes
2022-02-23 18:23:22 +01:00
d6d13eec95
Merge branch 'development' into gaisser_unit_test_internal_error
2022-02-23 12:37:55 +01:00
d6508e23b6
Added more coverage and Documentation
2022-02-23 12:12:49 +01:00
2cb254a556
Removed unused code
2022-02-23 11:53:48 +01:00
4747e54c5d
no default values for srv5 params
2022-02-22 20:08:19 +01:00
e5e85bcff9
still clang
2022-02-22 13:43:25 +01:00
4862edfdb5
Clang format
2022-02-22 13:42:56 +01:00
a50b52df51
Fixed an issue in host OSAL and added more coverage to IER
2022-02-22 13:37:28 +01:00
aebd4817b8
periodic printouts are runtime configurable now
2022-02-22 11:33:41 +01:00
6739890d53
add i2c wiretapping option
2022-02-22 11:19:49 +01:00
90b8ad1e6d
apply clang format
2022-02-22 11:16:33 +01:00
025f79fcb4
apply clang format
2022-02-22 11:16:14 +01:00
6fb64f9ada
removed source from cmakelists.txt
2022-02-22 11:11:54 +01:00
2f1b923009
this module should not be needed anymore
2022-02-22 11:06:00 +01:00
701135e2a6
applied clang format
2022-02-22 10:17:56 +01:00
c4a055986c
Merge remote-tracking branch 'origin/eive/develop' into mueller/master
2022-02-21 10:37:53 +01:00
d74a373f1d
make periodic printout run time configurable
2022-02-19 16:41:30 +01:00
cf69af4e7e
passing mqArgs to all mq ctor calls
2022-02-19 16:14:02 +01:00
b7f3eff742
WIP unit tests
2022-02-18 19:08:06 +01:00
508979d32d
cache mq args
2022-02-18 14:52:25 +01:00
0d66569687
this is a bit cleaner
2022-02-18 14:07:41 +01:00
a5871ed0b1
added void* args to queue factory and mq ctor
2022-02-18 14:00:06 +01:00
a12e98d948
update event mngr printout
2022-02-18 13:39:42 +01:00
bd05afbddd
printout improvements
2022-02-18 13:09:18 +01:00
b3482eba24
error check in event manager
2022-02-17 20:41:47 +01:00
0d6d44f72f
Merge remote-tracking branch 'upstream/development' into mueller/master
2022-02-15 17:08:29 +01:00
9e958e752e
applied clang format
2022-02-14 14:54:20 +01:00
9e6948a8d7
Merge pull request 'virtual function to print datasets' ( #544 ) from meier/printDataSet into development
...
Reviewed-on: fsfw/fsfw#544
2022-02-07 14:42:17 +01:00
Jakob Meier
3c06d2dbbb
run clang format script
2022-02-05 18:11:23 +01:00
581ae4c990
another include removed
2022-02-03 17:37:29 +01:00
32a9e0c704
another include removed
2022-02-03 17:37:11 +01:00
940c53eba6
removed HK switch helper from cmake file
2022-02-03 17:34:15 +01:00
0d4bd856bd
removed HK switch helper from cmake file
2022-02-03 17:33:46 +01:00
b7f6a6961b
delete switch helper, some other fixes
2022-02-03 17:14:11 +01:00
a910a05541
parser is not perfect..
2022-02-03 17:09:58 +01:00
973996e102
more fixes
2022-02-03 17:08:30 +01:00
b3aee76d91
fixes for event definitoons for parser
2022-02-03 17:06:18 +01:00
b3151a0ba0
added i2c wiretapping
2022-02-03 13:37:28 +01:00
fca48257b7
zero initialize array
2022-02-03 12:02:08 +01:00
Jakob Meier
06ffe27fcc
do send read hook
2022-02-03 10:46:14 +01:00
Jakob Meier
e9b0951a95
virtual function to print datasets
2022-02-03 10:37:07 +01:00
6698d283b6
device wants hard reboot event added
2022-02-02 16:04:36 +01:00
41614303d7
renamed variable
2022-02-02 12:11:39 +01:00
07cb980e06
apply clang script
2022-02-02 12:05:03 +01:00
d8c5bd125e
All EIVE changes
2022-02-02 12:02:58 +01:00
ddcac2bbac
reapply clang format
2022-02-02 10:29:30 +01:00
e5cc7069a6
Merge remote-tracking branch 'upstream/development' into mueller/cfdp-pdus
2022-02-02 10:19:31 +01:00
Robin Mueller
751de7accc
Merge remote-tracking branch 'upstream/development' into mueller/cfdp-pdus
2022-02-01 11:00:57 +01:00
74ae3f1371
Merge remote-tracking branch 'upstream/development' into mueller/cmd-executor
2022-02-01 10:49:14 +01:00
371ff931bf
Linux CommandExecutor
...
The CommandExecutor helper class can execute shell commands in blocking and non-blocking mode
This class is able to execute processes by using the Linux popen call. It also has the capability of writing
the read output of a process into a provided ring buffer.
The executor works by first loading the command which should be executed and specifying whether
it should be executed blocking or non-blocking. After that, execution can be started with the execute call.
Using non-blocking mode allows to execute commands which might take a longer time in the background,
and allowing the user thread to check completion status with the check function
Moved to HAL like requested in code review and unit tested with failing commands as well.
Also, Linux HAL components are compiled by default now unless explicitely disabled.
2022-01-26 12:11:52 +01:00
78ddce249c
try an optimization
2022-01-18 18:29:54 +01:00
David
661b7b44e0
improved win32 define
2021-12-12 19:28:51 +01:00
5907f8ee9d
Added CFDP packet stack
...
This PR adds the packet stack for the CCSDS File Delivery Protocol.
It also refactors the existing TMTC infastructure to allow sending
of CFDP packets to the CCSDS handlers.
This includes the whole PDU (Protocol Data Unit) stack:
- File Data PDUs
and all file directive PDUs
- ACK PDU
- NAK PDU
- Metadata PDU
- Finished PDU
- Prompt PDU
- Keep Alive PDU
- EOF PDU
The PR includes a full set of unittests for the packet stack
with a coverage of 90+ %.
The refactoring of the existing TMTC infastructure includes non-ideal
solutions like diamond inheritance.
Avoiding this solution would require refactoring the packet stack.
This would be a good idea anyway because the existing stack is tightly
coupled to the FSFW, making reuse more difficult if only the stack is
planned to be used without the store functionalities etc.
The PDU implementation provided here is only weakly coupled to the FSFW,
only using components like returnvalues or the Serialization modules.
There are dedicated serializers and deserializers, which also helps in
creating small focused modules which are easy to test.
Some of the modules here were provied by Matthias Tompert.
2021-12-03 15:37:49 +01:00
9c5e3565c6
Merge branch 'development' into mueller/serializeif-update
2021-11-24 18:53:28 +01:00
05c4f4fadc
Bugfix for Packet ID getters
...
- Also added related unittests
2021-11-18 19:56:24 +01:00
e688105073
Merge branch 'development' into mueller/unittests-op-divider-bitutil
2021-11-15 14:23:34 +01:00
30217aa42b
updated SerializeAdapter.h
...
- Updates `SerializerAdapter` to also take simple pointer and simply assign the serialized and deSerialized size
- Added related unittests
2021-11-10 18:51:56 +01:00
0176c07886
use IF instead of void pointer
2021-11-10 18:49:29 +01:00
6d5eb5b387
Op Divider and bitutility updates
...
- Added unittests for `PeriodicOperationDivider` and the `bitutil` helpers
- Some API changes: Removed redundant bit part, because these functions are already in a namespace
- Some bugfixes for `PeriodicOperationDivider`
2021-11-10 18:48:02 +01:00
cc7250fcf5
second cmake fix
2021-10-27 17:08:59 +02:00
a506b94d7e
Merge branch 'development' into mueller/arrayprinter-improvements
2021-10-25 14:09:08 +02:00
07a0dd5331
this is the correct file
2021-10-22 11:32:28 +02:00
7122c37511
updated function names
2021-10-18 18:26:03 +02:00
84cd010a25
Merge branch 'mueller/tcp-keep-open-pr' of https://egit.irs.uni-stuttgart.de/eive/fsfw into mueller/tcp-keep-open-pr
2021-10-18 15:07:11 +02:00
a077a1b587
improved constexpr macros
2021-10-18 15:07:00 +02:00
b94baf838d
Merge branch 'development' into mueller/tcp-keep-open-pr
2021-10-18 14:58:33 +02:00
084a3daec6
Merge pull request 'more printouts for rejected TC packets' ( #505 ) from eive/fsfw:mueller/packet-check-printout into development
...
Reviewed-on: fsfw/fsfw#505
2021-10-18 14:44:40 +02:00
b23ed11c7e
Merge branch 'development' into mueller/tcp-keep-open-pr
2021-10-18 14:44:26 +02:00
76d12e3db1
Merge branch 'development' into mueller/integrated-unittests
2021-10-18 14:36:01 +02:00
cee42f9b70
one } was on the wrong side of an #endif
2021-10-18 14:34:11 +02:00
afe8fe6605
assign correct init value
2021-10-18 13:58:18 +02:00
113c992f99
use char* instead
2021-10-17 22:56:00 +02:00
01f5dfe6b4
Merge branch 'development' into mueller/integrated-unittests
2021-10-15 15:05:23 +02:00
2180c47f4f
more printouts for rejected packet
2021-10-11 19:47:41 +02:00
4924da1667
Merge remote-tracking branch 'upstream/development' into mueller/tcp-keep-open-pr
2021-10-11 18:52:52 +02:00
f8e9042943
Merge pull request 'Merge v2.0.1 into development' ( #503 ) from master into development
...
Reviewed-on: fsfw/fsfw#503
2021-10-11 18:19:46 +02:00
08926f9b70
Merge remote-tracking branch 'upstream/master' into mueller/tm-stack-robustness-cherry-picked
2021-10-11 17:57:33 +02:00
d2371b3e71
removed unneeded static constexpr
2021-10-11 16:47:57 +02:00
ffa38a81b7
using pus version enum now
2021-10-11 16:47:37 +02:00
ae689408f3
using correct version number now
2021-10-11 16:47:28 +02:00
155432663b
moved store failure to separate function
2021-10-11 16:37:14 +02:00
ecdbf98ca4
added printouts for PUS A
2021-10-11 16:37:04 +02:00
54a6c1b0aa
bugfix for PUS A
2021-10-11 16:36:49 +02:00
9efe9e78d8
Increased TM stack robustness
...
1. More nullptr check
2. returnvalue for inititalize function which can fail
2021-10-11 16:36:28 +02:00
306a4b647f
more review corrections
2021-10-11 16:06:12 +02:00
f67868516c
Merge branch 'development' into mueller/integrated-unittests
2021-10-11 13:40:09 +02:00
1ddf9c0f11
Merge branch 'development' into mueller/tcp-keep-open-pr
2021-10-09 13:32:25 +02:00
Jakob Meier
9bcd701a50
tcp server also parses TCs when client closes connection
2021-10-09 13:31:51 +02:00
Jakob Meier
6ad7f51297
added bind call error string
2021-10-09 13:31:40 +02:00
12983a7143
Merge pull request 'minor updates for PUS services' ( #498 ) from KSat/fsfw:mueller/pus-tweaks into development
...
Reviewed-on: fsfw/fsfw#498
2021-10-08 12:59:04 +02:00
cd6d616806
using .h.in version fle now
2021-10-07 13:26:31 +02:00
76416f523d
better naming for parameter
2021-10-07 10:44:44 +02:00
5749e159e4
minor updates for PUS services
2021-10-07 10:39:16 +02:00
80b41e937b
Merge branch 'development' into mueller/fsfw-default-value-pus-c-cfg
2021-10-05 18:26:34 +02:00
146e1e3282
bumped version to 2.0.0 for next release
2021-10-04 14:47:32 +02:00
857a1624c6
Merge branch 'development' into mueller/fsfw-default-value-pus-c-cfg
2021-10-04 14:45:13 +02:00
f11957d827
Merge pull request 'Updated Countdown and removed Timer' ( #486 ) from gaisser_countdown_timer into development
...
Reviewed-on: fsfw/fsfw#486
2021-10-04 14:44:55 +02:00
198fdbba62
Merge remote-tracking branch 'upstream/development' into mueller/tcp-keep-open-pr
2021-10-04 14:41:51 +02:00
53400c8bfa
Merge branch 'development' into mueller/dle-possible-bugfix
2021-10-04 14:40:47 +02:00
f2d0a0d9ee
Merge branch 'mueller/dle-possible-bugfix' of https://egit.irs.uni-stuttgart.de/fsfw/fsfw into mueller/dle-possible-bugfix
2021-10-04 14:38:51 +02:00
2439613f21
preserve STX char
2021-10-04 14:38:46 +02:00
1c8f86364d
Merge branch 'development' into mueller/increase-absolute-packet-stored-limit
2021-10-04 14:37:09 +02:00
4e1c52f465
Merge branch 'development' into gaisser_countdown_timer
2021-10-02 15:50:49 +02:00
c7c6d78f4b
Merge branch 'development' into mueller/fsfw-default-value-pus-c-cfg
2021-10-02 15:44:46 +02:00
9f856761e2
Merge branch 'development' into mueller/dle-possible-bugfix
2021-10-02 12:24:38 +02:00
afb472996c
refactoring, code more understandable
2021-09-30 16:51:07 +02:00
b0cbd40e64
possible bugfix for DLE encoder
2021-09-30 11:25:42 +02:00
65f4433fad
Merge remote-tracking branch 'origin/development' into mueller/fsfw-default-value-pus-c-cfg
2021-09-29 12:07:06 +02:00
febe3cc4d4
define fix
2021-09-29 12:05:24 +02:00
f388878b99
added more defines
2021-09-29 12:05:15 +02:00
faa7e1e24f
default values for PUS c config
2021-09-29 12:00:59 +02:00
9002c12cf1
update FSFW.h.in
2021-09-29 11:55:20 +02:00
0a6a32a130
printout separation
2021-09-29 11:45:20 +02:00
cffd77ed32
put functions in namespace
2021-09-28 17:42:29 +02:00
b1a9c90087
this should work for both OSes
2021-09-28 17:39:07 +02:00
a619087fef
Merge remote-tracking branch 'upstream/mueller/tcp-windows-fixes' into mueller/tcp-keep-open-pr
2021-09-28 17:35:07 +02:00
32b5060c62
all windows fixes
2021-09-28 17:28:54 +02:00
936bac5abd
class id renamed
2021-09-28 16:33:50 +02:00
bf02f14772
C++11 adaptions
2021-09-28 16:33:20 +02:00
1622e23f1c
delay configurable
2021-09-28 15:33:31 +02:00
a4d6421510
documentation and bugfixes
2021-09-28 15:30:01 +02:00
f02852d8d2
cmake lists file update
2021-09-28 15:13:46 +02:00
bbea5e33bc
removed obsolete empty ctor
2021-09-28 15:12:55 +02:00
e536918804
wiretapping in runtime config now
2021-09-28 15:09:56 +02:00
09299802f0
TCP refactoring
...
This refactoring keeps the TCP connection opened until the client closes
it. It also increased the robustness of the TCP reception.
Because TCP is stream based and usually applied to newline separated
data, a special way to handle binary space packets is required.
The new SpacePacketParser class takes care of this by taking TC packet
IDs as as optional start markers to parse for space packets in a given
buffer.
The refactored TCP server uses a ring buffer, a reception buffer and the
new parser to extract space packets from a stream in a safer way.
2021-09-28 15:01:01 +02:00
1b38f84edc
Merge remote-tracking branch 'origin/development' into gaisser_countdown_timer
2021-09-27 21:06:20 +02:00
9a25f08fef
Merge remote-tracking branch 'upstream/development' into mueller/check-for-empty-pst
2021-09-27 15:37:49 +02:00
f3caa122ae
Merge branch 'development' into mueller/increase-absolute-packet-stored-limit
2021-09-27 15:32:54 +02:00
6e88f8f400
Merge pull request 'Added missing devicehandlers' ( #482 ) from eive/fsfw:mueller/added-missing-devicehandlers into development
...
Reviewed-on: fsfw/fsfw#482
2021-09-27 15:27:27 +02:00
42df77ff32
check for empty PST
...
and return appropriate returnvalue
2021-09-27 11:16:27 +02:00
85c04dee23
increase limit of packets stored
2021-09-27 11:12:38 +02:00
0246dccbe9
Merge remote-tracking branch 'upstream/development' into mueller/spi-fix
2021-09-27 09:52:49 +02:00
59feaa4b5c
moved class id and subsystem ID
2021-09-26 22:38:47 +02:00
a6bd7c0d6e
added missing defines for debug output
2021-09-23 18:13:51 +02:00
52b3d9473e
Merge remote-tracking branch 'upstream/development' into mueller/spi-fix
2021-09-23 18:10:12 +02:00
fc9b85d5db
update FSFW.h.in
2021-09-23 18:06:54 +02:00
39c909946b
Merge pull request 'Some changes and improvements for DHB' ( #474 ) from eive/fsfw:mueller/dhb-improvements into development
...
Reviewed-on: fsfw/fsfw#474
2021-09-20 15:23:24 +02:00
1732359f72
doc was wrong
2021-09-15 17:23:26 +02:00
21b5eaa891
Some changes and improvements for DHB
...
1. Renamed getCommanderId to getCommanderQueueId.
2. Some indentation
3. Correct preprocessor define for warning printout used now
2021-09-15 17:09:42 +02:00
5193294d25
Merge branch 'development' into mueller/dle-improvements
2021-09-13 15:24:53 +02:00
646b1139a6
Merge branch 'development' into mueller/dle-improvements
2021-09-13 15:18:22 +02:00
d9e2fd92fb
Merge branch 'development' into meier/ActionHelperQueueCheck
2021-09-13 15:17:47 +02:00
1148adb43d
Merge branch 'development' into mueller/conf-file-update
2021-09-13 15:03:08 +02:00
741d96d7ed
Merge branch 'development' into mueller/version-update
2021-09-13 15:01:28 +02:00
9c9b251322
Merge branch 'development' into mueller/tcp-udp-tweaks
2021-09-13 14:56:30 +02:00
ba7acac215
Merge branch 'development' into mueller/dle-improvements
2021-09-13 14:37:32 +02:00
abacfbf2d5
added setting of readLen according to review
2021-09-13 10:38:36 +02:00
dae27a8e10
indentation
2021-09-11 19:22:51 +02:00
d36d849e69
removed part which is now not necessary anymore
2021-09-11 19:21:21 +02:00
7c7a8a5df7
added improvements from code review
2021-09-11 19:18:18 +02:00
134deb3f43
renamed function
2021-09-11 17:43:58 +02:00
11a3c8c21f
added option to disable it as well
2021-09-11 17:42:29 +02:00
c9bfc8464a
added function to enable periodic reply
2021-09-11 17:39:42 +02:00
ea573b0523
a few more tests with faulty source data
2021-09-09 11:12:42 +02:00
3d336c08f2
tests almost complete
2021-09-09 10:47:54 +02:00
d05eb23ea7
debugged and tested non-escaped encoder
2021-09-09 01:28:21 +02:00
35b53e9a17
continuing tests
2021-09-09 01:06:54 +02:00
b5063117f6
added check to avoid seg fault
2021-09-09 00:02:17 +02:00
6ccf4bee49
Merge remote-tracking branch 'origin/development' into meier/ActionHelperQueueCheck
2021-09-06 18:48:13 +02:00
7bf66dc401
Merge remote-tracking branch 'upstream/development' into mueller/dhb-periodoc-reply-fix
2021-09-06 12:10:12 +02:00
5dcf0e44b6
encoder functions split up
2021-08-18 13:33:31 +02:00
3cec9f5f80
Made two functions private, small tweak
2021-08-18 13:18:42 +02:00
8780c5ddcd
comment typos
2021-08-17 16:02:54 +02:00
654b23869f
several imporovements
2021-08-17 16:00:39 +02:00
