eive/fsfw
eive
/
fsfw
forked from fsfw/fsfw
14
1
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity
592 Commits 28 Branches 1 Tag 24 MiB
Commit Graph

592 Commits

Author SHA1 Message Date
Robin Müller 386f347574 renormalized files 2020-09-18 13:15:14 +02:00
Steffen Gaisser 42bfedd36c Merge pull request 'health helper update' (#184) from KSat/fsfw:mueller/HealthHelperIdFix into master 
Reviewed-on: fsfw/fsfw#184
 2020-09-15 15:45:56 +02:00
Steffen Gaisser 9061d6d67e Merge branch 'master' into mueller/HealthHelperIdFix 2020-09-15 15:45:42 +02:00
Steffen Gaisser c375e838b8 Merge pull request 'Some minor serialize file changes' (#185) from KSat/fsfw:mueller/serialize-convergence into master 
Reviewed-on: fsfw/fsfw#185
 2020-09-15 15:44:40 +02:00
Steffen Gaisser d77d370c8a Merge branch 'master' into mueller/serialize-convergence 2020-09-15 15:42:12 +02:00
Steffen Gaisser 21094c4926 Merge pull request 'added host osal' (#165) from KSat/fsfw:mueller/hostosal into master 
Reviewed-on: fsfw/fsfw#165
 2020-09-15 15:33:51 +02:00
Robin Müller 51cf13428b Merge branch 'mueller/hostosal' of https://egit.irs.uni-stuttgart.de/KSat/fsfw into mueller/hostosal 2020-09-15 15:28:37 +02:00
Robin Müller b4ca42f1fb ccsds time update 2020-09-15 15:28:05 +02:00
Steffen Gaisser bff08a69fa Merge branch 'master' into mueller/hostosal 2020-09-15 15:08:58 +02:00
Steffen Gaisser 4f5b233505 Merge pull request 'init after task creation moved to task functionality' (#178) from KSat/fsfw:mueller/TaskUpdates into master 
Reviewed-on: fsfw/fsfw#178
 2020-09-15 15:08:18 +02:00
Steffen Gaisser 9334a705f8 Merge branch 'master' into mueller/TaskUpdates 2020-09-15 15:05:45 +02:00
Steffen Gaisser 2c6a239d5e Merge pull request 'added new periodic op divider' (#195) from KSat/fsfw:mueller/feature/periodicOpDivider into master 
Reviewed-on: fsfw/fsfw#195
 2020-09-15 15:04:30 +02:00
Steffen Gaisser fbd75f947a Merge branch 'master' into mueller/feature/periodicOpDivider 2020-09-15 15:02:34 +02:00
Steffen Gaisser 4c17ef7be5 Merge pull request 'DLE encoder doc added' (#177) from KSat/fsfw:mueller/dledoc into master 
Reviewed-on: fsfw/fsfw#177
 2020-09-15 15:01:07 +02:00
Robin Müller 4f48ed9756 added new periodic op divider 2020-09-10 19:53:52 +02:00
Robin Müller d83573cefc additional IDs removed 2020-09-10 16:47:01 +02:00
Robin Müller 8048195f63 Merge remote-tracking branch 'upstream/master' into mueller/dledoc 2020-09-10 16:46:31 +02:00
Robin Müller 853bd75fec Merge branch 'mueller/HealthHelperIdFix' of https://egit.irs.uni-stuttgart.de/KSat/fsfw into mueller/HealthHelperIdFix 2020-09-10 16:42:25 +02:00
Robin Müller d807ea3afe using MessageQueueIF::NO_QUEUE now 2020-09-10 16:42:11 +02:00
Robin Müller 036a022e66 Merge branch 'master' into mueller/HealthHelperIdFix 2020-09-10 16:40:20 +02:00
Robin Müller 489d8f1903 Merge branch 'master' into mueller/serialize-convergence 2020-09-10 16:40:02 +02:00
Robin Müller 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
Robin Müller e7444912d5 corrected include guard 2020-09-10 15:29:19 +02:00
Robin Müller b8d638cb69 Merge branch 'master' into gaisser_fixes_fixedMap 2020-09-10 15:27:15 +02:00
Robin Müller 0da6456bad Merge remote-tracking branch 'upstream/master' into mueller/serialize-convergence 2020-09-10 15:23:22 +02:00
Robin Müller 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
Robin Müller de46cf5b08 Merge branch 'master' into gaisser_serialize_c11_update 2020-09-10 15:06:05 +02:00
Robin Müller 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
Steffen Gaisser 2d76c744c5 Merge branch 'master' into mueller/HealthHelperIdFix 2020-09-08 14:34:33 +02:00
Steffen Gaisser dab10d761a Merge branch 'master' into mueller/serialize-convergence 2020-09-08 14:27:12 +02:00
Steffen Gaisser 976fd54f5e Merge branch 'master' into gaisser_fixes_fixedMap 2020-09-08 14:17:53 +02:00
Steffen Gaisser d87cf0a612 Merge branch 'master' into gaisser_bugs_fixedMap_FIFO 2020-09-08 14:14:38 +02:00
taheran 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
taheran 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
Steffen Gaisser 0258ce62f0 Added documentation 2020-09-07 18:35:25 +02:00
Steffen Gaisser b65789824c Removed old hacks and replaced by standard c++ 
Added overflow check in SerializeAdapter
 2020-09-07 18:06:08 +02:00
Steffen Gaisser 278053a342 Another fix in DynamicFIFO 2020-09-07 15:49:28 +02:00
Steffen Gaisser 2a28114b49 Fixes for #190 and #189 2020-09-07 15:43:48 +02:00
Robin Müller 67b11c0535 Merge branch 'master' into mueller/feature/TmTcUnixBridge 2020-09-06 15:51:34 +02:00
Robin Müller 6c42189371 some minor improvements 2020-09-06 15:49:32 +02:00
Robin Müller 2439ac455b tmtc bridge update, uses dynamic FIFO now 2020-09-06 15:48:30 +02:00
Robin Müller ba01b4578c Merge branch 'master' into mueller/TaskUpdates 2020-09-06 15:41:40 +02:00
Robin Müller 234fbcbf41 small bugfix in error checking 2020-09-06 09:34:06 +02:00
Robin Müller f7223abaa3 added define necessary for minGW 2020-09-05 21:20:10 +02:00
Robin Müller 902cd4d210 host osal update 2020-09-05 21:19:53 +02:00
Robin Müller a1155686c5 updated host osal 2020-09-05 20:18:52 +02:00
Robin Müller c6dbce7446 Merge remote-tracking branch 'upstream/master' into mueller/hostosal 2020-09-05 20:18:18 +02:00
Robin Müller 1a62158f33 took over serial array list adapter changes 2020-09-04 16:07:11 +02:00
Robin Müller 328c1b7195 takne over serialize element changes 2020-09-04 16:03:36 +02:00
Robin Müller ed21ec6c78 changes taken over for serial linked list adapter 2020-09-04 16:00:45 +02:00