5a6c81130d
Merge remote-tracking branch 'upstream/development' into mueller/master
2021-08-09 16:18:38 +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
22e29144b6
Merge remote-tracking branch 'origin/eive/develop' into mueller/master
2021-08-09 11:12:37 +02:00
52bff3985f
Merge pull request 'set sequence flags in space packet base' ( #9 ) from meier/spacePacketFlag into eive/develop
...
Reviewed-on: eive/fsfw#9
2021-08-09 11:11:46 +02:00
Jakob.Meier
133820f463
Merge branch 'eive/develop' into meier/spacePacketFlag
2021-08-08 15:32:24 +02:00
Jakob.Meier
8d3fceea8f
set sequence flags in space packet base
2021-08-08 15:26:18 +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
3704d2b829
bugfix
2021-08-05 18:24:56 +02:00
6073abb12d
added some utility to timer module
2021-08-05 18:13:01 +02:00
47bec654a0
Merge pull request 'Update EIVE FSFW' ( #8 ) from mueller/master into eive/develop
...
Reviewed-on: eive/fsfw#8
2021-08-05 16:35:23 +02:00
b2c102b2c1
Service Interface and Bugfix
...
1. Service Interface looks better now
2. Bugfix in CommandExecutor blocking mode
2021-08-05 16:13:22 +02:00
4202205182
getter function for current state
2021-08-05 16:02:17 +02:00
c8472beb5f
added new command executor
2021-08-05 15:42:47 +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
1a4a85ceb2
Merge branch 'mueller/master' of https://egit.irs.uni-stuttgart.de/eive/fsfw into mueller/master
2021-08-03 18:38:27 +02:00
7922bf76da
corrected README
2021-08-03 18:38:18 +02:00
bb88490cc6
Merge remote-tracking branch 'upstream/mueller/restructuring' into mueller/master
2021-08-03 15:55:38 +02:00
296c587e3d
additional nullptr check
2021-08-03 15:29:22 +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
0ff81294e7
Merge branch 'eive/develop' of https://egit.irs.uni-stuttgart.de/eive/fsfw into eive/develop
2021-08-02 12:49:50 +02:00
b6e243b8b3
var name clarification
2021-08-02 12:49:40 +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
Jakob.Meier
2489276350
removed double include
2021-07-27 10:05:56 +02:00
3895806a2b
Merge branch 'development' into meier/ColeredDebugOutput
2021-07-27 10:03:35 +02:00
3bbcc42d39
Merge pull request 'type missmatch' ( #7 ) from mohr-patch-1 into eive/develop
...
Reviewed-on: eive/fsfw#7
2021-07-26 19:04:06 +02:00
fc4324a2fa
type missmatch
2021-07-26 18:35:53 +02:00
7b500eb0ed
Merge pull request 'EventManager printout fixes and tweaks' ( #447 ) from KSat/fsfw:mueller/event-manager-tweaks-printf-fix into development
...
Reviewed-on: fsfw/fsfw#447
2021-07-26 15:25:54 +02:00
