Commit Graph

3714 Commits

Author SHA1 Message Date
741d96d7ed Merge branch 'development' into mueller/version-update 2021-09-13 15:01:28 +02:00
596a056622 Merge pull request 'Cleaning up TCP and UDP code' (#459) from eive/fsfw:mueller/tcp-udp-tweaks into development
Reviewed-on: fsfw/fsfw#459
2021-09-13 14:57:07 +02:00
9c9b251322 Merge branch 'development' into mueller/tcp-udp-tweaks 2021-09-13 14:56:30 +02:00
af133a2928 Merge pull request 'Possible bugfix in DHB' (#469) from eive/fsfw:mueller/dhb-periodoc-reply-fix into development
Reviewed-on: fsfw/fsfw#469
2021-09-13 10:58:33 +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
a88e97bc09 Merge branch 'development' into mueller/dhb-periodoc-reply-fix 2021-09-11 17:15:28 +02:00
38afa494ce Merge pull request 'UART bugfixes and improvements' (#471) from eive/fsfw:mueller/uart-improvements into development
Reviewed-on: fsfw/fsfw#471
2021-09-08 17:19:29 +02:00
c42eb59d2e
UART bugfixes and improvements 2021-09-08 16:10:18 +02:00
0a56441510 Merge branch 'development' into mueller/dhb-periodoc-reply-fix 2021-09-06 18:51:58 +02:00
879d1f71c5 Merge branch 'development' into mueller/version-update 2021-09-06 18:50:26 +02:00
e226f19ca8 Merge pull request 'Make FSFW tests accessable from outside' (#461) from KSat/fsfw:mueller/tests-accessible-from-outside-squashed into development
Reviewed-on: fsfw/fsfw#461
2021-09-06 18:50:12 +02:00
7bf66dc401 Merge remote-tracking branch 'upstream/development' into mueller/dhb-periodoc-reply-fix 2021-09-06 12:10:12 +02:00
a6d744c9c8 Possible bugfix in DHB
The delayCycles variables needs to be initialized differently
for periodic replies.
It is initialized to the maxDelayCycles value now
2021-09-06 12:08:54 +02:00
92d3f0743b
moved change to another PR 2021-08-16 15:26:28 +02:00
db3284c2b8
subversion update 2021-08-16 14:52:11 +02:00
cfb8bc5dfd
fsfw version update 2021-08-16 11:20:15 +02:00
a18706ec53
Make FSFW tests accessible from outside
1. Further reduces the amount of code the user needs to copy and paste
2. Makes FSFW tests more accessible. This can be used to simplify moving mission unit tests
   to the FSFW
3. A lot of include improvements
2021-08-16 10:49:07 +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
d92a796705 Merge pull request 'FSFW Restructuring' (#445) from mueller/restructuring into development
Reviewed-on: fsfw/fsfw#445
2021-08-09 16:00:26 +02:00
1fa59c5cae Merge pull request 'Linux HAL updates' (#456) from mueller/hal-linux-spi-uart-update into mueller/restructuring
Reviewed-on: fsfw/fsfw#456
2021-08-09 15:39:18 +02:00
83b5ade6b7 Merge branch 'mueller/hal-linux-spi-uart-update' of https://egit.irs.uni-stuttgart.de/fsfw/fsfw into mueller/hal-linux-spi-uart-update 2021-08-09 15:38:07 +02:00
62873c3118
UartComIF check iter validity 2021-08-09 15:37:12 +02:00
1301988892 Merge branch 'mueller/restructuring' into mueller/hal-linux-spi-uart-update 2021-08-09 15:31:56 +02:00
1c3770ce96 Merge pull request 'Printer updates' (#453) from mueller/updated-serviceinterface into mueller/restructuring
Reviewed-on: fsfw/fsfw#453
2021-08-09 15:24:44 +02:00
90a1571707
Linux HAL updates
1. The type correction was merged as part of
   eive/fsfw#7 in the
   EIVE project. Quotation of PR

definition of getSpiParameters is `void getSpiParameters(spi::SpiModes& spiMode, uint32_t& spiSpeed, UncommonParameters* parameters = nullptr) const;`.

Here, size_t spiSpeed is passed, which implicitely gets converted to a temporary, which can not be bound to uint32_t& and, at least in gcc 9.3.0, leads to a compiler error.

2. Allow flushing the UART buffers
2021-08-06 11:23:31 +02:00
2706b8fa24
Printer updates
1. Only prefix is colored now
2. Minor formatting change
2021-08-06 11:06:33 +02:00
8b39248a33 Merge branch 'mueller/master' of https://egit.irs.uni-stuttgart.de/fsfw/fsfw into mueller/master 2021-08-03 18:46:59 +02:00
ec00a84b29
update README for moved logo 2021-08-03 18:46:50 +02:00
4d9c07a1ec wrong path for sgp4 include 2021-08-02 21:22:56 +02:00
c3fbe04fc6
all include corrections 2021-08-02 20:58:56 +02:00
466f1e000f Merge branch 'mueller/master' into mueller/restructuring 2021-08-02 20:55:28 +02:00
f1f167c2d1
using _ instead of - now 2021-08-02 20:55:03 +02:00
6f816b2592 Merge branch 'mueller/master' into mueller/restructuring 2021-08-02 20:48:57 +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
c0591c3d24
renamed some folders 2021-08-02 15:31:13 +02:00
5bbe16081f
added missing CMakeLists.txt 2021-07-30 14:38:20 +02:00
490ab440e5
smaller tweaks in CMakelists files 2021-07-30 14:21:37 +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
a94725c423 Merge remote-tracking branch 'origin/development' into mueller/restructuring 2021-07-27 13:07:58 +02:00
2d667cfb95 Merge pull request 'Colored prefix option only if colored output is enabled' (#449) from meier/ColeredDebugOutput into development
Reviewed-on: fsfw/fsfw#449
2021-07-27 13:07:16 +02:00
Jakob.Meier
3d80d5d036 added proposed changes 2021-07-27 12:59:21 +02:00
Jakob.Meier
ebc9d99022 Merge branch 'meier/ColeredDebugOutput' of https://egit.irs.uni-stuttgart.de/fsfw/fsfw into meier/ColeredDebugOutput 2021-07-27 10:10:25 +02:00