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
28f2db2c11
some fixes
2021-08-17 15:40:51 +02:00
5fcac4d85b
added proper non-escaped variant
2021-08-17 15:39:24 +02:00
ece7dce6f7
ctor and dtor public now
2021-08-17 15:13:58 +02:00
4b72e246c3
improved DLE encoder
2021-08-17 15:05:29 +02:00
db3284c2b8
subversion update
2021-08-16 14:52:11 +02:00
6e9a0ddcf4
cmakedefine for OSAL type
2021-08-16 11:23:44 +02:00
cfb8bc5dfd
fsfw version update
2021-08-16 11:20:15 +02:00
eecb69d230
getter function for UDP port
2021-08-09 18:22:51 +02:00
14a30f30db
More improvements for TCP/UDP port definition
2021-08-09 18:13:02 +02:00
ccaa0aa24f
Cleaning up TCP and UDP code
...
Same port number used as before, but some inconsistencies fixed
2021-08-09 16:59:41 +02:00
2706b8fa24
Printer updates
...
1. Only prefix is colored now
2. Minor formatting change
2021-08-06 11:06:33 +02:00
4d9c07a1ec
wrong path for sgp4 include
2021-08-02 21:22:56 +02:00
0e5cfcf28f
minor improvement for printout
2021-08-02 16:19:37 +02:00
dee063e259
Merge branch 'mueller/master' of https://egit.irs.uni-stuttgart.de/fsfw/fsfw into mueller/master
2021-08-02 15:47:49 +02:00
aabc729e77
include changes
2021-08-02 15:47:12 +02:00
0b207b2b1a
updated user folder
2021-07-30 14:18:47 +02:00
e1f92b3da4
various fixes and improvements
2021-07-30 13:47:29 +02:00
b75c815361
Merge remote-tracking branch 'origin/development' into mueller/master
2021-07-27 13:12:00 +02:00
ab6c616cdb
added binary semaphore header stub
2021-07-19 18:40:35 +02:00
ee4449b74d
override is not a good idea
2021-07-19 18:36:55 +02:00
ce93b9220e
command message cleaner include fix
2021-07-19 18:29:57 +02:00
d4f5c31881
optional module handling complete
2021-07-19 18:26:54 +02:00
d47906e833
trying to fuse header / inc
2021-07-19 16:25:51 +02:00
7849b8e391
mutex update
2021-07-19 15:07:56 +02:00
08364e2dca
Merge branch 'mueller/restructuring' into mueller/master
2021-07-19 15:06:00 +02:00
4c41cb1f71
update to upstream
2021-07-19 15:03:02 +02:00
16ed5e3270
update to bugfix
2021-07-19 15:01:43 +02:00
291a8d4ea3
added semaphore factory
2021-07-16 12:33:19 +02:00
a65a184083
not an ideal solution but works for now
2021-07-16 12:22:14 +02:00
62e0465b3d
Merge branch 'mueller/master' of https://egit.irs.uni-stuttgart.de/eive/fsfw into mueller/master
2021-07-15 01:24:30 +02:00
f19f3681ca
Merge remote-tracking branch 'upstream/mueller/master' into mueller/master
2021-07-15 01:24:25 +02:00
704193eeaf
include replacements host/windows/rtems
2021-07-14 10:50:44 +02:00
3c4289335e
integrated queue map manager bugfixes
2021-07-14 10:39:02 +02:00
82299c7e3e
new test folder
2021-07-14 10:22:58 +02:00
4803fb2cbd
important bugfix for queue map manager
2021-07-14 01:27:15 +02:00
d5dfffda2d
corrections for freertos osal
2021-07-14 00:54:39 +02:00
66a79cb86c
done
2021-07-13 21:02:53 +02:00
a6de52e212
more include replacements
2021-07-13 20:58:45 +02:00
936d0e9f0c
a lot of internal include replacements
2021-07-13 20:22:54 +02:00
ca297a7dcd
added hal folder
2021-07-13 19:19:25 +02:00
f14d5edf42
added more cmakelists files
2021-07-13 18:52:19 +02:00
f15352bb2f
moved memory helper to core
2021-07-13 18:46:09 +02:00
bdb8b0a757
restructure repository
2021-07-13 18:40:52 +02:00
