fsfw/fsfw
fsfw
/
fsfw
10
3
Fork 6
Code Issues 31 Pull Requests 4 Releases 10 Wiki Activity
570 Commits 27 Branches 22 Tags 31 MiB
Commit Graph

570 Commits

Author SHA1 Message Date
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: #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: #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: #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 bbd81c2d6a Merge pull request 'FixedMap Fixes #47 and #36' (#182) from gaisser/fsfw:gaisser_fixes_fixedMap into master 
Reviewed-on: #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 db2a31aef4 Merge pull request 'Implements #192' (#193) from gaisser/fsfw:gaisser_serialize_c11_update into master 
Reviewed-on: #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: #191
 2020-09-10 15:00:34 +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: #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: #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 a3b80288e1 Merge remote-tracking branch 'upstream/master' into mueller/dledoc 2020-09-04 14:54:49 +02:00
Robin Müller 91d5277a94 added new returnvalues 2020-09-04 14:54:08 +02:00
Robin Müller 975fb9832b added interface ID 2020-09-04 14:52:17 +02:00
Robin Müller 4bdac1e017 changed from mueller/master taken over 2020-09-04 14:49:59 +02:00
Robin Müller 381914886d initAfterTaskCreation added for linux 2020-09-04 14:43:53 +02:00
Steffen Gaisser b3d08cd40b Merge pull request 'FIFO is StaticFIFO now, new FIFO using vector' (#127) from KSat/fsfw:mueller_FIFO_static_normal into master 
Reviewed-on: #127
 2020-09-01 13:08:58 +02:00
Robin Müller d5accd16ba Merge branch 'mueller_FIFO_static_normal' of https://egit.irs.uni-stuttgart.de/KSat/fsfw into mueller_FIFO_static_normal 2020-09-01 12:58:38 +02:00
Robin Müller 03b2ca679d include guard correction 2020-09-01 12:58:29 +02:00
Steffen Gaisser 75f6cacd10 Merge branch 'master' into mueller_FIFO_static_normal 2020-09-01 12:56:41 +02:00
Steffen Gaisser b32ea6e316 Merge pull request 'RingBuffer, static CTOR' (#132) from KSat/fsfw:mueller_ringBufferStatic into master 
Reviewed-on: #132
 2020-09-01 12:56:23 +02:00
Steffen Gaisser 5308cb6237 Merge branch 'master' into mueller_ringBufferStatic 2020-09-01 12:54:08 +02:00
Robin Müller 4f3869de8d Merge branch 'mueller_FIFO_static_normal' of https://egit.irs.uni-stuttgart.de/KSat/fsfw into mueller_FIFO_static_normal 2020-09-01 12:54:02 +02:00
Robin Müller b522b3c29c fifo updates 2020-09-01 12:53:53 +02:00
Robin Müller 02cfa8bcd5 Merge branch 'master' into mueller_FIFO_static_normal 2020-09-01 12:45:25 +02:00
Steffen Gaisser 96c421b72c Merge pull request 'parameter improvements' (#181) from KSat/fsfw:mueller/parameter-updates into master 
Reviewed-on: #181
 2020-09-01 12:45:20 +02:00
Steffen Gaisser f85e4eb22f Merge branch 'master' into mueller/parameter-updates 2020-09-01 12:44:14 +02:00
Robin Müller 66bc60f176 Merge branch 'mueller/parameter-updates' of https://egit.irs.uni-stuttgart.de/KSat/fsfw into mueller/parameter-updates 2020-09-01 12:43:02 +02:00
Robin Müller 695a4e7842 offset is size_t now 2020-09-01 12:42:52 +02:00