Commit Graph

3681 Commits

Author SHA1 Message Date
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
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
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
Jakob.Meier
a918c672a5 fixed merge conflicts 2021-07-24 07:15:24 +02:00
1515d59432
EventManager fixes and tweaks
1. Using sif::info consistently now
2. Fix for printf support: Event translation is printed now as well
2021-07-21 09:45:36 +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
10e81fdfb8
update changelog 2021-07-19 18:35:16 +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
4b03db38eb Merge remote-tracking branch 'origin/development' into mueller/restructuring 2021-07-19 15:04:28 +02:00
ac146339a2 Merge pull request 'QueueMapManager bugfix' (#444) from mueller/queuemapmanager-bugfix into development
Reviewed-on: fsfw/fsfw#444
2021-07-19 15:04:10 +02:00
cbdf92a775
update to origin 2021-07-19 15:04:08 +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
baf3d4da47
better form 2021-07-19 14:57:10 +02:00
e93230d0ef
update init value 2021-07-19 14:47:33 +02:00
0b45e5c89a
fix 2021-07-19 14:40:32 +02:00
6d2bfaeb3b Merge branch 'mueller/restructuring' of https://egit.irs.uni-stuttgart.de/fsfw/fsfw into mueller/restructuring 2021-07-19 14:35:21 +02:00
68498f6b74 Merge remote-tracking branch 'origin/development' into mueller/restructuring 2021-07-19 14:35:15 +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
21ac5afd35 Merge branch 'mueller/master' into mueller/restructuring 2021-07-15 19:28:25 +02:00
aafccd191e
correction in dma.cpp 2021-07-15 19:27:13 +02:00
1db5c950b8
stm32h7 include corrections 2021-07-15 19:23:12 +02:00
d11e54dc0a
some more fixes 2021-07-15 19:06:40 +02:00
3c364604ac
target name replaced 2021-07-15 18:59:47 +02:00
8db0ca861a Merge branch 'mueller/master' into mueller/restructuring 2021-07-15 18:55:52 +02:00
e2da68795b
hal integration done 2021-07-15 18:53:59 +02:00
243cf42dc4
added hal subfolder 2021-07-15 18:43:16 +02:00