KSat
/
fsfw
forked from fsfw/fsfw
15
4
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update FSFW #25

Merged
muellerr merged 89 commits from mueller/master into master 2021-10-05 20:21:44 +02:00
Conversation 0 Commits 89 Files Changed 28 +734 -183

89 Commits

Author SHA1 Message Date
Robin Müller 422adfffa1 Merge remote-tracking branch 'eive/mueller/fix-for-pus-c-version-number' into mueller/master 2021-10-05 20:04:49 +02:00
Robin Müller 77aaf81cf6
Merge remote-tracking branch 'upstream/development' into mueller/master 2021-10-05 18:56:42 +02:00
Robin Müller f896bf9641
Merge remote-tracking branch 'upstream/mueller/master' into mueller/master 2021-10-05 18:49:49 +02:00
Robin Müller d4199b0986 Merge branch 'development' into mueller/fix-for-pus-c-version-number 2021-10-05 18:27:46 +02:00
Robin Müller 85a90a6ec5 Merge pull request 'FSFW.h.in more default values' (#491) from mueller/fsfw-default-value-pus-c-cfg into development 
Reviewed-on: fsfw/fsfw#491
 2021-10-05 18:27:13 +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
Robin Müller 9b58cebcad
removed unneeded static constexpr 2021-10-05 13:17:12 +02:00
Robin Müller 1736a9158e
using pus version enum now 2021-10-05 13:13:36 +02:00
Robin Müller 314a88fab2 using correct version number now 2021-10-05 12:53:21 +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
Ulrich Mohr a977302a53 Merge pull request 'out of bounds access in DLE encoder' (#492) from mueller/dle-possible-bugfix into development 
Reviewed-on: fsfw/fsfw#492
 2021-10-04 14:43:54 +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
Steffen Gaisser 9e12f59707 Merge pull request 'TMTC Bridge: Increase limit of packets stored' (#484) from eive/fsfw:mueller/increase-absolute-packet-stored-limit into development 
Reviewed-on: fsfw/fsfw#484
 2021-10-04 14:38:46 +02:00
Robin Müller 2439613f21 preserve STX char 2021-10-04 14:38:46 +02:00
Robin Müller d81ed334d8
preserve STX char 2021-10-04 14:38:10 +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 2f119f102d Merge pull request 'return meaningful error code for empty PST' (#485) from eive/fsfw:mueller/check-for-empty-pst into development 
Reviewed-on: fsfw/fsfw#485
 2021-10-02 12:24:03 +02:00
Robin Müller afb472996c refactoring, code more understandable 2021-09-30 16:51:07 +02:00
Robin Müller f67567d0b5
refactoring, code more understandable 2021-09-30 16:49:30 +02:00
Robin Müller f76f462022
test added 2021-09-30 11:27:14 +02:00
Robin Müller 0f90d50065 Merge remote-tracking branch 'origin/development' into mueller/dle-possible-bugfix 2021-09-30 11:27:07 +02:00
Robin Müller b0cbd40e64
possible bugfix for DLE encoder 2021-09-30 11:25:42 +02:00
Robin Müller 76c3214a4f
important bugfix 2021-09-30 00:59:49 +02:00
Robin Müller 1c1433e797 Merge branch 'development' into mueller/increase-absolute-packet-stored-limit 2021-09-29 16:17:22 +02:00
Robin Müller 7671c93095 Merge branch 'development' into mueller/check-for-empty-pst 2021-09-29 16:16:57 +02:00
Robin Müller 897d8b37ad Merge branch 'development' into mueller/fsfw-default-value-pus-c-cfg 2021-09-29 16:16:11 +02:00
Steffen Gaisser ba4249d658 Merge branch 'development' into gaisser_countdown_timer 2021-09-29 14:27:48 +02:00
Robin Müller de7542c9c1 Merge pull request 'Minor fixes for device handler' (#489) from mueller/dev-handler-fixes into development 
Reviewed-on: fsfw/fsfw#489
 2021-09-29 14:27:48 +02:00
Robin Müller 5a30dd969f Merge branch 'development' into mueller/dev-handler-fixes 2021-09-29 14:27:37 +02:00
Robin Müller 05ed25d397 Merge branch 'development' into mueller/fsfw-default-value-pus-c-cfg 2021-09-29 14:27:20 +02:00
Robin Müller 0a2c912f29 Merge pull request 'small fix for DLE unittest' (#490) from mueller/dle-encoder-test-fix into development 
Reviewed-on: fsfw/fsfw#490
 2021-09-29 14:27:10 +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 2b15f9e644 Merge branch 'development' into mueller/dle-encoder-test-fix 2021-09-29 11:51:05 +02:00
Robin Müller 42b5f8a79d
small fix for DLE unittest 2021-09-29 11:49:45 +02:00
Robin Müller 3d80271f0d
missing cast 2021-09-29 11:47:01 +02:00
Robin Müller e3a7127573 Merge remote-tracking branch 'eive/mueller/tcp-keep-open-pr' into mueller/master 2021-09-29 11:46:03 +02:00
Robin Müller 0a6a32a130
printout separation 2021-09-29 11:45:20 +02:00
Robin Müller a9eaf35b43
check whether targetname exists 2021-09-29 10:08:56 +02:00
Robin Müller f5d0c06bd4 Merge remote-tracking branch 'eive/mueller/tcp-keep-open-pr' into mueller/master 2021-09-28 17:49:17 +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 d9744365d2 all windows fixes 2021-09-28 17:26:02 +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 5284eadca6
changes for C++11 2021-09-28 16:30:51 +02:00
Robin Müller ee531f8067 Merge remote-tracking branch 'eive/mueller/tcp-keep-open-pr' into mueller/master 2021-09-28 16:23:45 +02:00
Robin Müller 80cad3ed3f Merge remote-tracking branch 'eive/mueller/increase-absolute-packet-stored-limit' into mueller/master 2021-09-28 16:17:38 +02:00
Robin Müller 358ee0fbf2 removed C++14 featue 2021-09-28 15:47:12 +02:00
Robin Müller 4f08b2d342 removed include 2021-09-28 15:47:01 +02:00
Robin Müller 5d9e5e222a
removed C++14 featue 2021-09-28 15:45:45 +02:00
Robin Müller 2c785ff187 Merge remote-tracking branch 'origin/development' into mueller/master 2021-09-28 15:45:03 +02:00
Robin Müller 93ad9be5d6
removed include 2021-09-28 15:42:50 +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 4b62c8aa81 Added tests 2021-09-27 21:53:27 +02:00
Steffen Gaisser 1b38f84edc Merge remote-tracking branch 'origin/development' into gaisser_countdown_timer 2021-09-27 21:06:20 +02:00
Steffen Gaisser 5064d44999 Removed Timer.cpp from CMakeLists 2021-09-27 20:45:44 +02:00
Steffen Gaisser 322c14d4bb Merge remote-tracking branch 'origin/development' into gaisser_countdown_timer 2021-09-27 20:01:01 +02:00
Steffen Gaisser 8ec35f158c Removed Timer and updated Countdown 2021-09-27 19:57:42 +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
Ulrich Mohr 01762ad222 Merge pull request 'SPI Updates for Linux' (#480) from eive/fsfw:mueller/spi-fix into development 
Reviewed-on: fsfw/fsfw#480
 2021-09-27 15:21:15 +02:00
Ulrich Mohr 71d66c406f Merge pull request 'GPIO code update' (#479) from eive/fsfw:mueller/gpio-update into development 
Reviewed-on: fsfw/fsfw#479
 2021-09-27 15:18:58 +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 4c96db847d Merge branch 'development' into mueller/gpio-update 2021-09-27 09:54:10 +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 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
Robin Müller bfae25ff2d
Updates for SPI 
1. Better names for functions
2. Reply size is set to 0
 2021-09-23 18:06:04 +02:00
Robin Müller ea3812fbbd Merge branch 'development' into mueller/gpio-update 2021-09-23 18:00:31 +02:00
Robin Müller f40f783cb4
GPIO code update 
Adds capability to define GPIO by label and by chip
for Linux systems
 2021-09-23 17:58:44 +02:00