Commit Graph

3890 Commits

Author SHA1 Message Date
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
b0e1480383
pushed cfdp update 2021-07-21 21:56:31 +02:00
62d109c856 Merge branch 'mueller/master' of https://egit.irs.uni-stuttgart.de/KSat/fsfw into mueller/master 2021-07-21 21:19:15 +02:00
4a495d987a
Merge branch 'tompert/devel' into mueller/master 2021-07-21 21:19:13 +02:00
86ae5d03cd
API updated 2021-07-21 11:34:18 +02:00
1c9f038e5c
Merge remote-tracking branch 'eive/mueller/master' into mueller/master 2021-07-21 11:24:46 +02:00
e137ddc897
improved HasFileSystemIF api 2021-07-21 11:23:57 +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
d339bf2c9e
deleted src/osal/host folder 2021-07-21 09:43:17 +02:00
f84d255903
using info instead of debug 2021-07-20 18:46:17 +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
77257320fe
Merge remote-tracking branch 'upstream/mueller/master' into mueller/master 2021-07-19 18:49:05 +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
tomatze
974d25dbb1 added CFDPHandler (not working yet) 2021-07-18 20:36:47 +02:00
tomatze
c6998b0f17 Merge remote-tracking branch 'origin/mueller/master' into tompert/devel 2021-07-16 16:47:33 +02:00
a6e5b267a3
moved mutex.cpp 2021-07-16 16:11:58 +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
eb89615722
update fsfw, fixes for CFDP 2021-07-15 20:06:20 +02:00
94f8a36eb4
Merge remote-tracking branch 'upstream/mueller/master' into mueller/master 2021-07-15 19:51:17 +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