Commit Graph

3133 Commits

Author SHA1 Message Date
410094ed28 Fixes #161 2020-10-27 15:16:14 +01:00
2eb1a5c1a0 Merge branch 'master' into mueller/enhanced-controller 2020-10-27 15:11:39 +01:00
b6456c7b69 Merge branch 'master' into mueller/DHB-update 2020-10-27 15:04:35 +01:00
8b21324815 Merge branch 'master' into mueller/action-update 2020-10-27 14:30:12 +01:00
f40b432e43 Merge pull request 'added FIFO to SharedRingBuffer' (#208) from KSat/fsfw:mueller/sharedRingBufferFIFO into master
Reviewed-on: fsfw/fsfw#208
2020-10-27 14:29:48 +01:00
67dd153511 Merge branch 'master' into mueller/sharedRingBufferFIFO 2020-10-27 13:36:59 +01:00
342a70d109 Merge branch 'master' into mueller_tcPacketBase 2020-10-27 12:24:12 +01:00
e7210a34f9 output tweaked 2020-10-22 14:34:52 +02:00
742cc6eb76 no command added 2020-10-21 18:19:51 +02:00
c5da6c9464 Merge branch 'master' into mueller/LocalPoolRefactoring 2020-10-21 14:32:24 +02:00
b9f3c1ee84 takne over defaultcfg 2020-10-20 17:53:47 +02:00
6cce062d62 some more fixes 2020-10-20 17:52:43 +02:00
29a796ebdb include names fixed 2020-10-20 17:51:13 +02:00
ede00dfdcc double files removed, versioning files renamed 2020-10-20 17:50:10 +02:00
e4d323683d readme fix 2020-10-20 17:47:52 +02:00
4d4300cee6 Merge branch 'mueller/defaultcfg' of https://egit.irs.uni-stuttgart.de/KSat/fsfw into mueller/defaultcfg 2020-10-20 17:44:35 +02:00
1940a2acf0 some fixes 2020-10-20 17:44:27 +02:00
279682351a Merge branch 'master' into mueller/defaultcfg 2020-10-20 17:41:33 +02:00
057f3b859e added readme and efaultcfg 2020-10-20 17:39:48 +02:00
247c9f2947 added readme 2020-10-20 17:39:11 +02:00
482b77ff05 added defaultcfg config folder 2020-10-20 17:38:41 +02:00
9309562716 defaultcfg folder added 2020-10-20 17:24:53 +02:00
bb53c71f70 fsfs config update 2020-10-20 17:21:20 +02:00
72b9adb684 Merge branch 'master' into mueller/unittest-integration-from-master 2020-10-20 17:15:30 +02:00
7033328962 unittest folder added 2020-10-20 17:12:56 +02:00
865ea3386c unittest now contained directly 2020-10-20 17:11:23 +02:00
c677358343 include adaption 2020-10-20 17:06:09 +02:00
7821cc2870 submodule added 2020-10-20 16:52:34 +02:00
ef0122ab54 Merge branch 'master' into mueller/enhanced-controller 2020-10-20 16:34:36 +02:00
756df4f37f Merge branch 'master' into mueller/action-update 2020-10-20 16:04:29 +02:00
0b1b9c11eb Merge pull request 'TC Distribution convergence' (#229) from KSat/fsfw:mueller/tcDistribution into master
Reviewed-on: fsfw/fsfw#229
2020-10-20 15:11:27 +02:00
ddacc66b1f Merge branch 'mueller/tcDistribution' of https://egit.irs.uni-stuttgart.de/KSat/fsfw into mueller/tcDistribution 2020-10-20 15:04:45 +02:00
fa67f82462 structure improved 2020-10-20 15:04:28 +02:00
407df913d3 Merge branch 'master' into mueller/tcDistribution 2020-10-20 14:56:53 +02:00
f7b84c4732 Merge branch 'master' into mueller/DHB-update 2020-10-20 14:56:45 +02:00
b29376bd71 Merge branch 'master' into mueller/feature/windowsUdpBridge 2020-10-20 14:55:04 +02:00
3580ec0e09 Merge pull request 'MQM IF used by FreeRTOS' (#212) from KSat/fsfw:mueller/MQMQ_IF_UpdateFreeRTOS into master
Reviewed-on: fsfw/fsfw#212
2020-10-20 14:52:58 +02:00
12369d8d4b Merge remote-tracking branch 'upstream/master' into mueller/MQMQ_IF_UpdateFreeRTOS 2020-10-20 14:51:38 +02:00
6b2df54204 Merge pull request 'Message QueueMessage IF used in Linux' (#207) from KSat/fsfw:mueller/MQM_IF_UpdateLinux into master
Reviewed-on: fsfw/fsfw#207
2020-10-20 14:50:47 +02:00
8cea7b05db include improvement 2020-10-20 14:42:58 +02:00
17548605ec Merge branch 'master' into mueller/MQMQ_IF_UpdateFreeRTOS 2020-10-20 14:37:22 +02:00
95924dd55b some more bugfixes 2020-10-19 15:38:22 +02:00
22e4e464c7 doc improved, new returnvalue 2020-10-19 00:43:10 +02:00
75e67ce5f8 small form improvements 2020-10-19 00:37:26 +02:00
ad9ac7537e bool is mapped to uint8 now for pod type conversion 2020-10-19 00:25:03 +02:00
8b8324f21c some stuff renamed 2020-10-18 23:50:02 +02:00
1bddfeb86b Merge branch 'mueller/LocalPoolTests' into mueller/master 2020-10-18 22:41:37 +02:00
88a89d6797 added basic documentation 2020-10-18 17:32:10 +02:00
8e49806057 some adaptions 2020-10-18 17:23:47 +02:00
3b0b474ab6 better naming 2020-10-18 17:01:49 +02:00