Commit Graph

3837 Commits

Author SHA1 Message Date
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
54c028f913
naming adaptions 2021-07-26 13:50:45 +02:00
1f6a5e635f
naming fixes 2021-07-26 11:46:58 +02:00
c5b4b01362 Merge branch 'mueller/master' into eive/develop 2021-07-24 15:04:01 +02:00
c5420c7b53
bumped subversion 2021-07-24 14:39:43 +02:00
3e422f51bd
corrected version number 2021-07-24 13:43:13 +02:00
Jakob.Meier
a918c672a5 fixed merge conflicts 2021-07-24 07:15:24 +02:00
d1be0f9843 Merge pull request 'Update framework' (#6) from mueller/master into eive/develop
Reviewed-on: eive/fsfw#6
2021-07-23 18:26:39 +02:00
Jakob.Meier
b83259592a uart flush function 2021-07-23 18:06:36 +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
a7a4e0f219
api consistent now 2021-07-19 19:03:20 +02:00
bdc5f593e2 Merge remote-tracking branch 'upstream/mueller/master' into mueller/master 2021-07-19 18:50:20 +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
10f7185e81
added includes 2021-07-19 13:08:40 +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