Commit Graph
100 Commits
Author SHA1 Message Date
muellerr b31bee4fda added srv9 2020-09-16 19:11:50 +02:00
muellerr 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
muellerr b4ca42f1fb ccsds time update 2020-09-15 15:28:05 +02:00
muellerr 4f48ed9756 added new periodic op divider 2020-09-10 19:53:52 +02:00
muellerr d83573cefc additional IDs removed 2020-09-10 16:47:01 +02:00
muellerr 8048195f63 Merge remote-tracking branch 'upstream/master' into mueller/dledoc 2020-09-10 16:46:31 +02:00
muellerr 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
muellerr d807ea3afe using MessageQueueIF::NO_QUEUE now 2020-09-10 16:42:11 +02:00
muellerr 036a022e66 Merge branch 'master' into mueller/HealthHelperIdFix 2020-09-10 16:40:20 +02:00
muellerr 489d8f1903 Merge branch 'master' into mueller/serialize-convergence 2020-09-10 16:40:02 +02:00
muellerr 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
muellerr e7444912d5 corrected include guard 2020-09-10 15:29:19 +02:00
muellerr b8d638cb69 Merge branch 'master' into gaisser_fixes_fixedMap 2020-09-10 15:27:15 +02:00
muellerr 0da6456bad Merge remote-tracking branch 'upstream/master' into mueller/serialize-convergence 2020-09-10 15:23:22 +02:00
muellerr 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
muellerr de46cf5b08 Merge branch 'master' into gaisser_serialize_c11_update 2020-09-10 15:06:05 +02:00
muellerr 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
muellerr 67b11c0535 Merge branch 'master' into mueller/feature/TmTcUnixBridge 2020-09-06 15:51:34 +02:00
muellerr 6c42189371 some minor improvements 2020-09-06 15:49:32 +02:00
muellerr 2439ac455b tmtc bridge update, uses dynamic FIFO now 2020-09-06 15:48:30 +02:00
muellerr ba01b4578c Merge branch 'master' into mueller/TaskUpdates 2020-09-06 15:41:40 +02:00
muellerr 234fbcbf41 small bugfix in error checking 2020-09-06 09:34:06 +02:00
muellerr f7223abaa3 added define necessary for minGW 2020-09-05 21:20:10 +02:00
muellerr 902cd4d210 host osal update 2020-09-05 21:19:53 +02:00
muellerr a1155686c5 updated host osal 2020-09-05 20:18:52 +02:00
muellerr c6dbce7446 Merge remote-tracking branch 'upstream/master' into mueller/hostosal 2020-09-05 20:18:18 +02:00
muellerr 1a62158f33 took over serial array list adapter changes 2020-09-04 16:07:11 +02:00
muellerr 328c1b7195 takne over serialize element changes 2020-09-04 16:03:36 +02:00
muellerr ed21ec6c78 changes taken over for serial linked list adapter 2020-09-04 16:00:45 +02:00
muellerr 84308c74d9 taken over some changes 2020-09-04 15:56:08 +02:00
muellerr d4d96a128e adapted doc 2020-09-04 15:47:08 +02:00
muellerr e83de82481 gathering remaining differences.. 2020-09-04 15:40:42 +02:00
muellerr 62eb327df6 health helper update 2020-09-04 15:19:33 +02:00
muellerr a3b80288e1 Merge remote-tracking branch 'upstream/master' into mueller/dledoc 2020-09-04 14:54:49 +02:00
muellerr 91d5277a94 added new returnvalues 2020-09-04 14:54:08 +02:00
muellerr 975fb9832b added interface ID 2020-09-04 14:52:17 +02:00
muellerr 4bdac1e017 changed from mueller/master taken over 2020-09-04 14:49:59 +02:00
muellerr 381914886d initAfterTaskCreation added for linux 2020-09-04 14:43:53 +02:00
muellerr 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
muellerr 03b2ca679d include guard correction 2020-09-01 12:58:29 +02:00
muellerr 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
muellerr b522b3c29c fifo updates 2020-09-01 12:53:53 +02:00
muellerr 02cfa8bcd5 Merge branch 'master' into mueller_FIFO_static_normal 2020-09-01 12:45:25 +02:00
muellerr 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
muellerr 695a4e7842 offset is size_t now 2020-09-01 12:42:52 +02:00
muellerr b07b19327c renormalize CHB 2020-09-01 11:52:18 +02:00
muellerr 4abdc436fb Revert "renormalize CHB"
This reverts commit a4d9c761a7.
2020-09-01 11:51:43 +02:00
muellerr d644a40e14 Merge branch 'mueller/feature/DHBupdate' of https://egit.irs.uni-stuttgart.de/KSat/fsfw into mueller/feature/DHBupdate 2020-09-01 11:49:53 +02:00
muellerr a4d9c761a7 renormalize CHB 2020-09-01 11:49:43 +02:00
muellerr f645fe6607 Merge pull request 'Comments in serializeIF' (#174) from gaisser/fsfw:gaisser_comments_serialize into master
Reviewed-on: fsfw/fsfw#174
2020-09-01 11:37:21 +02:00
muellerr 7a5c70e753 typo fixes 2020-08-28 18:46:47 +02:00
muellerr b54d63edcb event manager improvements 2020-08-28 18:10:02 +02:00
muellerr aec557a8c0 updated unix udp bridge 2020-08-28 17:14:20 +02:00
muellerr 6c0defed5e Merge remote-tracking branch 'upstream/master' into mueller/feature/TmTcUnixBridge 2020-08-28 17:08:54 +02:00
muellerr 3ec7162832 Merge branch 'master' into mueller_FIFO_static_normal 2020-08-28 17:08:06 +02:00
muellerr b4978e7df3 Merge pull request 'Fixed a shadowing issue with moving a declaration to inner scope' (#163) from gaisser/fsfw:gaisser_small_bugfix_subsystem into master
Reviewed-on: fsfw/fsfw#163
2020-08-28 17:01:16 +02:00
muellerr eb503ae030 include guard fix 2020-08-27 20:19:27 +02:00
muellerr 795b1e5245 Merge remote-tracking branch 'upstream/master' into mueller_FIFO_static_normal 2020-08-27 20:18:06 +02:00
muellerr 54112acf62 chb update 2020-08-27 20:11:36 +02:00
muellerr c4c607776c important fix, 0 init removed 2020-08-27 20:07:03 +02:00
muellerr 8f2d5a5528 DH fdir improvements 2020-08-27 19:58:35 +02:00
muellerr 2a74c8d150 Merge remote-tracking branch 'upstream/master' into mueller/devices/FDIR 2020-08-27 19:55:22 +02:00
muellerr dfe3658a85 removed hk stuff 2020-08-27 19:52:25 +02:00
muellerr 386b153ede Merge remote-tracking branch 'upstream/master' into mueller/feature/DHBupdate 2020-08-27 19:50:02 +02:00
muellerr df4fb17a45 Merge remote-tracking branch 'upstream/master' into mueller/feature/TmTcUnixBridge 2020-08-27 17:31:16 +02:00
muellerr 0fedad6da0 semaphore factory update 2020-08-27 17:14:49 +02:00
muellerr 3be253efd6 include fix 2020-08-27 17:07:42 +02:00
muellerr 73db79a3fe updated linux implementation 2020-08-27 17:06:10 +02:00
muellerr 7723ee13b3 Merge remote-tracking branch 'upstream/master' into mueller_binSemaphoreInit 2020-08-27 16:28:50 +02:00
muellerr 073f168b95 task management function taken over from master 2020-08-27 16:27:54 +02:00
muellerr aacda3afc2 interface adapted 2020-08-27 16:26:00 +02:00
muellerr 4530b19548 header update 2020-08-27 16:13:36 +02:00
muellerr 89d3fe5095 integrated change manually 2020-08-27 16:11:40 +02:00
muellerr 02be87aa03 init after task creation moved to task functionality 2020-08-27 15:57:47 +02:00
muellerr df850116ff dle encoder doc added 2020-08-26 17:43:47 +02:00
muellerr a8f2cf910b taken over dle encoder from upstream master 2020-08-26 17:43:20 +02:00
muellerr 2748a8b93b added doc to dle encoder 2020-08-26 17:42:13 +02:00
muellerr 561becf6aa Merge remote-tracking branch 'upstream/master' into mueller/hostosal 2020-08-25 18:31:17 +02:00
muellerr f13e7b4255 include replacements 2020-08-25 18:30:11 +02:00
muellerr 9465c8f2b2 Merge pull request 'include fix FreeRTOS' (#175) from KSat/fsfw:mueller/hotfix/MutexFreeRTOS into master 2020-08-25 18:16:50 +02:00
muellerr d9ee6d0d90 include fix 2020-08-25 18:15:02 +02:00
muellerr 9fbf0d1d94 Merge remote-tracking branch 'upstream/master' into mueller_MessageNamespaceRenamed 2020-08-25 14:02:48 +02:00
muellerr 9c29253337 removed forward decl 2020-08-25 13:42:36 +02:00
muellerr de98dd0871 optimization 2020-08-25 13:37:42 +02:00
muellerr fb0a3d22db linker forward decl added 2020-08-25 13:34:52 +02:00
muellerr ba4eac65cc count t replacements 2020-08-25 13:33:31 +02:00
muellerr 7d2c48fb33 serializhe improved 2020-08-25 13:32:17 +02:00
muellerr c8595c3442 deSerialize fixed/improved 2020-08-25 13:29:36 +02:00
muellerr 857d61ea13 member pointer now checked 2020-08-25 13:16:17 +02:00
muellerr 825bf62d79 fixed deSerialize 2020-08-25 13:14:13 +02:00
muellerr 6ebe523e50 Merge remote-tracking branch 'upstream/master' into mueller/FreeRTOSstackSizeCorrection 2020-08-25 12:51:57 +02:00
muellerr c0332a80a7 task management update 2020-08-25 12:40:06 +02:00
muellerr 043710ee56 Merge remote-tracking branch 'upstream/master' into mueller/FreeRTOS/TaskManagement 2020-08-25 12:38:23 +02:00
muellerr 7e0cf49723 author tag 2020-08-25 12:24:37 +02:00
muellerr d0419467a7 include guard fix 2020-08-25 12:23:46 +02:00
muellerr 1235e38556 rtems adaption 2020-08-25 12:20:56 +02:00
muellerr 8c150fd40d Merge remote-tracking branch 'upstream/master' into mueller/Linux-SetTaskIF-Fix 2020-08-25 12:19:52 +02:00
muellerr 74dea921e0 made fixes 2020-08-25 12:10:28 +02:00
muellerr ab4c65c87a added header file changes 2020-08-25 12:08:12 +02:00
muellerr 49a36d6fdc removed definitions 2020-08-25 12:06:39 +02:00