Commit Graph

3454 Commits

Author SHA1 Message Date
a364f36f38 Merge pull request 'Fixes for #190 and #189' (#191) from gaisser/fsfw:gaisser_bugs_fixedMap_FIFO into master
Reviewed-on: fsfw/fsfw#191
2020-09-10 15:00:34 +02:00
2d76c744c5 Merge branch 'master' into mueller/HealthHelperIdFix 2020-09-08 14:34:33 +02:00
d1f8040599 Merge branch 'master' into mueller/ipc-updates 2020-09-08 14:33:50 +02:00
e24e080f31 Merge branch 'master' into mueller/sharedRingBufferPullRequest 2020-09-08 14:31:40 +02:00
dab10d761a Merge branch 'master' into mueller/serialize-convergence 2020-09-08 14:27:12 +02:00
976fd54f5e Merge branch 'master' into gaisser_fixes_fixedMap 2020-09-08 14:17:53 +02:00
d87cf0a612 Merge branch 'master' into gaisser_bugs_fixedMap_FIFO 2020-09-08 14:14:38 +02:00
b3af2b5fbc Merge branch 'master' into mueller/feature/windowsUdpBridge 2020-09-08 14:14:03 +02:00
fb36c55419 Merge pull request 'new tmtc unix udp bridge' (#141) from KSat/fsfw:mueller/feature/TmTcUnixBridge into master
Reviewed-on: fsfw/fsfw#141
2020-09-08 14:14:00 +02:00
5dd08877a5 Merge pull request 'tmtc bridge update, uses dynamic FIFO now' (#187) from KSat/fsfw:mueller/TmTcBridgeUpdate into master
Reviewed-on: fsfw/fsfw#187
2020-09-08 14:12:43 +02:00
0258ce62f0 Added documentation 2020-09-07 18:35:25 +02:00
b65789824c Removed old hacks and replaced by standard c++
Added overflow check in SerializeAdapter
2020-09-07 18:06:08 +02:00
278053a342 Another fix in DynamicFIFO 2020-09-07 15:49:28 +02:00
2a28114b49 Fixes for #190 and #189 2020-09-07 15:43:48 +02:00
e085deb235 fifo fix 2020-09-07 15:23:27 +02:00
d99b100ace debug output removed 2020-09-06 18:46:56 +02:00
67b11c0535 Merge branch 'master' into mueller/feature/TmTcUnixBridge 2020-09-06 15:51:34 +02:00
6c42189371 some minor improvements 2020-09-06 15:49:32 +02:00
2439ac455b tmtc bridge update, uses dynamic FIFO now 2020-09-06 15:48:30 +02:00
a9975f5aef added new windows udp bridge 2020-09-06 15:46:49 +02:00
ba01b4578c Merge branch 'master' into mueller/TaskUpdates 2020-09-06 15:41:40 +02:00
f61056eeb7 adapted DHB to renaming 2020-09-06 15:30:56 +02:00
790d3f1465 taken over all changes 2020-09-06 15:25:56 +02:00
e9b86e51df init commit 2020-09-06 15:23:38 +02:00
26cbcdbff0 removed comment 2020-09-06 15:21:02 +02:00
673af26472 rework/restructuring 2020-09-06 14:57:05 +02:00
50ae50d286 removed pool raw access helper 2020-09-06 14:01:41 +02:00
ac2f6c5ed4 minor improvements 2020-09-06 12:59:59 +02:00
efa41b29aa added informative comment 2020-09-06 12:16:43 +02:00
8db9a4a191 some minor tweaks 2020-09-06 12:00:57 +02:00
7774434d7a windows sockets working 2020-09-06 11:58:12 +02:00
3e0819f954 some bugfixes 2020-09-06 11:48:32 +02:00
b7c4f5ce05 continued win sockets 2020-09-06 10:36:39 +02:00
0c85b05aca continued win bridge 2020-09-06 09:54:22 +02:00
234fbcbf41 small bugfix in error checking 2020-09-06 09:34:06 +02:00
08ffbfefae added windows udp bridge 2020-09-06 09:33:02 +02:00
f698275a0b removed seconds typedef, confusing 2020-09-05 21:59:17 +02:00
c7606b7b1e updating and cleaning pool files 2020-09-05 21:51:17 +02:00
cb970b1883 task IF is set now 2020-09-05 21:24:59 +02:00
f7223abaa3 added define necessary for minGW 2020-09-05 21:20:10 +02:00
902cd4d210 host osal update 2020-09-05 21:19:53 +02:00
7a24f89915 removed comment 2020-09-05 21:19:15 +02:00
c43ae66205 some tweaks 2020-09-05 21:18:30 +02:00
883103af2b queue map manager update 2020-09-05 21:13:07 +02:00
80e60566d8 compiling and working again 2020-09-05 21:11:27 +02:00
39b675cf99 repairing host osal 2020-09-05 20:39:10 +02:00
a1155686c5 updated host osal 2020-09-05 20:18:52 +02:00
c6dbce7446 Merge remote-tracking branch 'upstream/master' into mueller/hostosal 2020-09-05 20:18:18 +02:00
05814dc805 added way to start DH immediately, bugfix in event manager 2020-09-05 15:58:53 +02:00
faeeca8707 seiralize folder converged 2020-09-04 16:07:54 +02:00