Commit Graph

818 Commits

Author SHA1 Message Date
036a022e66 Merge branch 'master' into mueller/HealthHelperIdFix 2020-09-10 16:40:20 +02:00
489d8f1903 Merge branch 'master' into mueller/serialize-convergence 2020-09-10 16:40:02 +02:00
bbd81c2d6a Merge pull request 'FixedMap Fixes #47 and #36' (#182) from gaisser/fsfw:gaisser_fixes_fixedMap into master
Reviewed-on: fsfw/fsfw#182

Performed CSB tests, everything working as before
2020-09-10 16:38:42 +02:00
e7444912d5 corrected include guard 2020-09-10 15:29:19 +02:00
b8d638cb69 Merge branch 'master' into gaisser_fixes_fixedMap 2020-09-10 15:27:15 +02:00
0da6456bad Merge remote-tracking branch 'upstream/master' into mueller/serialize-convergence 2020-09-10 15:23:22 +02:00
db2a31aef4 Merge pull request 'Implements #192' (#193) from gaisser/fsfw:gaisser_serialize_c11_update into master
Reviewed-on: fsfw/fsfw#193
2020-09-10 15:13:54 +02:00
de46cf5b08 Merge branch 'master' into gaisser_serialize_c11_update 2020-09-10 15:06:05 +02:00
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
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
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
ba01b4578c Merge branch 'master' into mueller/TaskUpdates 2020-09-06 15:41:40 +02:00
234fbcbf41 small bugfix in error checking 2020-09-06 09:34:06 +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
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
1a62158f33 took over serial array list adapter changes 2020-09-04 16:07:11 +02:00
328c1b7195 takne over serialize element changes 2020-09-04 16:03:36 +02:00
ed21ec6c78 changes taken over for serial linked list adapter 2020-09-04 16:00:45 +02:00
84308c74d9 taken over some changes 2020-09-04 15:56:08 +02:00
d4d96a128e adapted doc 2020-09-04 15:47:08 +02:00
e83de82481 gathering remaining differences.. 2020-09-04 15:40:42 +02:00
62eb327df6 health helper update 2020-09-04 15:19:33 +02:00
dbac6e139b shared ring buffer update 2020-09-04 15:11:53 +02:00
06400fa7bb share dring buffer update 2020-09-04 15:10:44 +02:00
3e67701933 taken over ring buffer base changes 2020-09-04 15:09:24 +02:00
e105be229a include guards fand include improvements 2020-09-04 15:06:48 +02:00
d885dddee8 renormalize files 2020-09-04 15:04:53 +02:00
a53b9dc3db renormalization 2020-09-04 14:59:59 +02:00
a6b2b4dd93 renormalization 2020-09-04 14:58:36 +02:00
a3b80288e1 Merge remote-tracking branch 'upstream/master' into mueller/dledoc 2020-09-04 14:54:49 +02:00
91d5277a94 added new returnvalues 2020-09-04 14:54:08 +02:00
975fb9832b added interface ID 2020-09-04 14:52:17 +02:00
4bdac1e017 changed from mueller/master taken over 2020-09-04 14:49:59 +02:00
381914886d initAfterTaskCreation added for linux 2020-09-04 14:43:53 +02:00
0eb4c3817e added initialize after taks creation for linux 2020-09-04 14:31:39 +02:00