eive/fsfw
eive
/
fsfw
forked from fsfw/fsfw
14
1
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity
4,409 Commits 28 Branches 1 Tag 24 MiB
Commit Graph

289 Commits

Author SHA1 Message Date
Robin Müller 19d217e3b9
Merge remote-tracking branch 'upstream/development' into mueller/dev-printout-runtime-configurable 2022-02-28 15:23:54 +01:00
Steffen Gaisser 20928732ec Merge branch 'development' into gaisser_unit_test_internal_error 2022-02-28 15:19:44 +01:00
Robin Müller cf45eca100
Merge remote-tracking branch 'upstream/development' into mueller/dev-printout-runtime-configurable 2022-02-28 15:00:38 +01:00
Robin Müller c0fa365f8f
Merge remote-tracking branch 'upstream/development' into mueller/delete-obsolete-module 2022-02-28 14:58:28 +01:00
Ulrich Mohr 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
Steffen Gaisser 0e8328fca3 Fixed include based on Feedback 2022-02-24 11:22:51 +01:00
Steffen Gaisser 1ef3dae72e Fixed an missing include 2022-02-23 22:36:29 +01:00
Steffen Gaisser 32381a7872 Fixed an issue with wrong buffer size 2022-02-23 21:20:22 +01:00
Steffen Gaisser 09815f5cce Clang format 2022-02-23 18:24:07 +01:00
Steffen Gaisser f6357b4531 WIP compiler Flags and new unit tests for fixes 2022-02-23 18:23:22 +01:00
Steffen Gaisser d6d13eec95 Merge branch 'development' into gaisser_unit_test_internal_error 2022-02-23 12:37:55 +01:00
Steffen Gaisser d6508e23b6 Added more coverage and Documentation 2022-02-23 12:12:49 +01:00
Steffen Gaisser 2cb254a556 Removed unused code 2022-02-23 11:53:48 +01:00
Steffen Gaisser e5e85bcff9 still clang 2022-02-22 13:43:25 +01:00
Steffen Gaisser 4862edfdb5 Clang format 2022-02-22 13:42:56 +01:00
Steffen Gaisser a50b52df51 Fixed an issue in host OSAL and added more coverage to IER 2022-02-22 13:37:28 +01:00
Robin Müller aebd4817b8
periodic printouts are runtime configurable now 2022-02-22 11:33:41 +01:00
Robin Müller 6739890d53
add i2c wiretapping option 2022-02-22 11:19:49 +01:00
Robin Müller 90b8ad1e6d
apply clang format 2022-02-22 11:16:33 +01:00
Robin Müller 025f79fcb4
apply clang format 2022-02-22 11:16:14 +01:00
Robin Müller 6fb64f9ada
removed source from cmakelists.txt 2022-02-22 11:11:54 +01:00
Robin Müller 2f1b923009
this module should not be needed anymore 2022-02-22 11:06:00 +01:00
Steffen Gaisser b7f3eff742 WIP unit tests 2022-02-18 19:08:06 +01:00
Ulrich Mohr 9e958e752e applied clang format 2022-02-14 14:54:20 +01:00
Ulrich Mohr 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 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
Robin Müller ddcac2bbac
reapply clang format 2022-02-02 10:29:30 +01:00
Robin Müller 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
Robin Müller 74ae3f1371 Merge remote-tracking branch 'upstream/development' into mueller/cmd-executor 2022-02-01 10:49:14 +01:00
Robin Müller 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
Robin Müller 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
Robin Müller 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
Robin Müller 9c5e3565c6 Merge branch 'development' into mueller/serializeif-update 2021-11-24 18:53:28 +01:00
Robin Müller 05c4f4fadc
Bugfix for Packet ID getters 
- Also added related unittests
 2021-11-18 19:56:24 +01:00
Steffen Gaisser e688105073 Merge branch 'development' into mueller/unittests-op-divider-bitutil 2021-11-15 14:23:34 +01:00
Robin Müller 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
Robin Müller 0176c07886
use IF instead of void pointer 2021-11-10 18:49:29 +01:00
Robin Müller 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
Robin Müller cc7250fcf5
second cmake fix 2021-10-27 17:08:59 +02:00
Ulrich Mohr a506b94d7e Merge branch 'development' into mueller/arrayprinter-improvements 2021-10-25 14:09:08 +02:00
Robin Müller 07a0dd5331
this is the correct file 2021-10-22 11:32:28 +02:00
Robin Müller 7122c37511
updated function names 2021-10-18 18:26:03 +02:00
Robin Müller 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
Robin Müller a077a1b587
improved constexpr macros 2021-10-18 15:07:00 +02:00
Robin Müller b94baf838d Merge branch 'development' into mueller/tcp-keep-open-pr 2021-10-18 14:58:33 +02:00
Ulrich Mohr 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
Robin Müller b23ed11c7e Merge branch 'development' into mueller/tcp-keep-open-pr 2021-10-18 14:44:26 +02:00
Robin Müller 76d12e3db1 Merge branch 'development' into mueller/integrated-unittests 2021-10-18 14:36:01 +02:00
Ulrich Mohr cee42f9b70 one } was on the wrong side of an #endif 2021-10-18 14:34:11 +02:00
Robin Müller afe8fe6605
assign correct init value 2021-10-18 13:58:18 +02:00
Robin Müller 113c992f99
use char* instead 2021-10-17 22:56:00 +02:00
Robin Müller 01f5dfe6b4 Merge branch 'development' into mueller/integrated-unittests 2021-10-15 15:05:23 +02:00
Robin Müller 2180c47f4f
more printouts for rejected packet 2021-10-11 19:47:41 +02:00
Robin Müller 4924da1667
Merge remote-tracking branch 'upstream/development' into mueller/tcp-keep-open-pr 2021-10-11 18:52:52 +02:00
Ulrich Mohr 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
Robin Müller 08926f9b70
Merge remote-tracking branch 'upstream/master' into mueller/tm-stack-robustness-cherry-picked 2021-10-11 17:57:33 +02:00
Robin Müller d2371b3e71 removed unneeded static constexpr 2021-10-11 16:47:57 +02:00
Robin Müller ffa38a81b7 using pus version enum now 2021-10-11 16:47:37 +02:00
Robin Müller ae689408f3 using correct version number now 2021-10-11 16:47:28 +02:00
Robin Müller 155432663b moved store failure to separate function 2021-10-11 16:37:14 +02:00
Robin Müller ecdbf98ca4 added printouts for PUS A 2021-10-11 16:37:04 +02:00
Robin Müller 54a6c1b0aa bugfix for PUS A 2021-10-11 16:36:49 +02:00
Robin Müller 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
Robin Müller 306a4b647f
more review corrections 2021-10-11 16:06:12 +02:00
Robin Müller f67868516c Merge branch 'development' into mueller/integrated-unittests 2021-10-11 13:40:09 +02:00
Robin Müller 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
Ulrich Mohr 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
Robin Müller cd6d616806
using .h.in version fle now 2021-10-07 13:26:31 +02:00
Robin Müller 76416f523d
better naming for parameter 2021-10-07 10:44:44 +02:00
Robin Müller 5749e159e4
minor updates for PUS services 2021-10-07 10:39:16 +02:00
Robin Müller 80b41e937b Merge branch 'development' into mueller/fsfw-default-value-pus-c-cfg 2021-10-05 18:26:34 +02:00
Ulrich Mohr 146e1e3282 bumped version to 2.0.0 for next release 2021-10-04 14:47:32 +02:00
Robin Müller 857a1624c6 Merge branch 'development' into mueller/fsfw-default-value-pus-c-cfg 2021-10-04 14:45:13 +02:00
Ulrich Mohr 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
Robin Müller 198fdbba62 Merge remote-tracking branch 'upstream/development' into mueller/tcp-keep-open-pr 2021-10-04 14:41:51 +02:00
Steffen Gaisser 53400c8bfa Merge branch 'development' into mueller/dle-possible-bugfix 2021-10-04 14:40:47 +02:00
Robin Müller 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
Robin Müller 2439613f21 preserve STX char 2021-10-04 14:38:46 +02:00
Steffen Gaisser 1c8f86364d Merge branch 'development' into mueller/increase-absolute-packet-stored-limit 2021-10-04 14:37:09 +02:00
Robin Müller 4e1c52f465 Merge branch 'development' into gaisser_countdown_timer 2021-10-02 15:50:49 +02:00
Robin Müller c7c6d78f4b Merge branch 'development' into mueller/fsfw-default-value-pus-c-cfg 2021-10-02 15:44:46 +02:00
Robin Müller 9f856761e2 Merge branch 'development' into mueller/dle-possible-bugfix 2021-10-02 12:24:38 +02:00
Robin Müller afb472996c refactoring, code more understandable 2021-09-30 16:51:07 +02:00
Robin Müller b0cbd40e64
possible bugfix for DLE encoder 2021-09-30 11:25:42 +02:00
Robin Müller 65f4433fad
Merge remote-tracking branch 'origin/development' into mueller/fsfw-default-value-pus-c-cfg 2021-09-29 12:07:06 +02:00
Robin Müller febe3cc4d4
define fix 2021-09-29 12:05:24 +02:00
Robin Müller f388878b99
added more defines 2021-09-29 12:05:15 +02:00
Robin Müller faa7e1e24f
default values for PUS c config 2021-09-29 12:00:59 +02:00
Robin Müller 9002c12cf1
update FSFW.h.in 2021-09-29 11:55:20 +02:00
Robin Müller 0a6a32a130
printout separation 2021-09-29 11:45:20 +02:00
Robin Müller cffd77ed32
put functions in namespace 2021-09-28 17:42:29 +02:00
Robin Müller b1a9c90087 this should work for both OSes 2021-09-28 17:39:07 +02:00
Robin Müller a619087fef
Merge remote-tracking branch 'upstream/mueller/tcp-windows-fixes' into mueller/tcp-keep-open-pr 2021-09-28 17:35:07 +02:00
Robin Müller 32b5060c62 all windows fixes 2021-09-28 17:28:54 +02:00
Robin Müller 936bac5abd
class id renamed 2021-09-28 16:33:50 +02:00
Robin Müller bf02f14772 C++11 adaptions 2021-09-28 16:33:20 +02:00
Robin Müller 1622e23f1c delay configurable 2021-09-28 15:33:31 +02:00
Robin Müller a4d6421510
documentation and bugfixes 2021-09-28 15:30:01 +02:00
Robin Müller f02852d8d2
cmake lists file update 2021-09-28 15:13:46 +02:00
Robin Müller bbea5e33bc removed obsolete empty ctor 2021-09-28 15:12:55 +02:00
Robin Müller e536918804
wiretapping in runtime config now 2021-09-28 15:09:56 +02:00
Robin Müller 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
Steffen Gaisser 1b38f84edc Merge remote-tracking branch 'origin/development' into gaisser_countdown_timer 2021-09-27 21:06:20 +02:00
Robin Müller 9a25f08fef
Merge remote-tracking branch 'upstream/development' into mueller/check-for-empty-pst 2021-09-27 15:37:49 +02:00
Robin Müller f3caa122ae Merge branch 'development' into mueller/increase-absolute-packet-stored-limit 2021-09-27 15:32:54 +02:00
Ulrich Mohr 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
Robin Müller 42df77ff32
check for empty PST 
and return appropriate returnvalue
 2021-09-27 11:16:27 +02:00
Robin Müller 85c04dee23
increase limit of packets stored 2021-09-27 11:12:38 +02:00
Robin Müller 0246dccbe9 Merge remote-tracking branch 'upstream/development' into mueller/spi-fix 2021-09-27 09:52:49 +02:00
Robin Müller 59feaa4b5c
moved class id and subsystem ID 2021-09-26 22:38:47 +02:00
Robin Müller a6bd7c0d6e
added missing defines for debug output 2021-09-23 18:13:51 +02:00
Robin Müller 52b3d9473e Merge remote-tracking branch 'upstream/development' into mueller/spi-fix 2021-09-23 18:10:12 +02:00
Robin Müller fc9b85d5db
update FSFW.h.in 2021-09-23 18:06:54 +02:00
Ulrich Mohr 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
Robin Müller 1732359f72 doc was wrong 2021-09-15 17:23:26 +02:00
Robin Müller 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
Robin Müller 5193294d25 Merge branch 'development' into mueller/dle-improvements 2021-09-13 15:24:53 +02:00
Robin Müller 646b1139a6 Merge branch 'development' into mueller/dle-improvements 2021-09-13 15:18:22 +02:00
Steffen Gaisser d9e2fd92fb Merge branch 'development' into meier/ActionHelperQueueCheck 2021-09-13 15:17:47 +02:00
Robin Müller 1148adb43d Merge branch 'development' into mueller/conf-file-update 2021-09-13 15:03:08 +02:00
Robin Müller 741d96d7ed Merge branch 'development' into mueller/version-update 2021-09-13 15:01:28 +02:00
Robin Müller 9c9b251322 Merge branch 'development' into mueller/tcp-udp-tweaks 2021-09-13 14:56:30 +02:00
Robin Müller ba7acac215 Merge branch 'development' into mueller/dle-improvements 2021-09-13 14:37:32 +02:00
Ulrich Mohr abacfbf2d5 added setting of readLen according to review 2021-09-13 10:38:36 +02:00
Robin Müller dae27a8e10
indentation 2021-09-11 19:22:51 +02:00
Robin Müller d36d849e69
removed part which is now not necessary anymore 2021-09-11 19:21:21 +02:00
Robin Müller 7c7a8a5df7
added improvements from code review 2021-09-11 19:18:18 +02:00
Robin Müller 134deb3f43
renamed function 2021-09-11 17:43:58 +02:00
Robin Müller 11a3c8c21f
added option to disable it as well 2021-09-11 17:42:29 +02:00
Robin Müller c9bfc8464a
added function to enable periodic reply 2021-09-11 17:39:42 +02:00
Robin Müller ea573b0523
a few more tests with faulty source data 2021-09-09 11:12:42 +02:00
Robin Müller 3d336c08f2
tests almost complete 2021-09-09 10:47:54 +02:00
Robin Müller d05eb23ea7
debugged and tested non-escaped encoder 2021-09-09 01:28:21 +02:00
Robin Müller 35b53e9a17
continuing tests 2021-09-09 01:06:54 +02:00
Robin Müller b5063117f6
added check to avoid seg fault 2021-09-09 00:02:17 +02:00
Robin Müller 6ccf4bee49 Merge remote-tracking branch 'origin/development' into meier/ActionHelperQueueCheck 2021-09-06 18:48:13 +02:00
Robin Müller 7bf66dc401 Merge remote-tracking branch 'upstream/development' into mueller/dhb-periodoc-reply-fix 2021-09-06 12:10:12 +02:00
Robin Müller 5dcf0e44b6
encoder functions split up 2021-08-18 13:33:31 +02:00
Robin Müller 3cec9f5f80
Made two functions private, small tweak 2021-08-18 13:18:42 +02:00
Robin Müller 8780c5ddcd
comment typos 2021-08-17 16:02:54 +02:00
Robin Müller 654b23869f
several imporovements 2021-08-17 16:00:39 +02:00
Robin Müller 28f2db2c11
some fixes 2021-08-17 15:40:51 +02:00
Robin Müller 5fcac4d85b
added proper non-escaped variant 2021-08-17 15:39:24 +02:00
Robin Müller ece7dce6f7
ctor and dtor public now 2021-08-17 15:13:58 +02:00
Robin Müller 4b72e246c3
improved DLE encoder 2021-08-17 15:05:29 +02:00