Commit Graph
100 Commits
Author SHA1 Message Date
muellerr 622c7a5a0d debug output removed 2020-09-29 14:45:23 +02:00
muellerr bed4e7affa nullptr replacement 2020-09-29 14:43:23 +02:00
muellerr 1ff85c88b2 store accessor small changes 2020-09-29 14:42:48 +02:00
muellerr cef84b13d9 renormalization 2020-09-29 14:35:05 +02:00
muellerr 6f965c74ac Merge remote-tracking branch 'upstream/master' into mueller_StoreAccessor 2020-09-29 14:34:49 +02:00
muellerr 183b6a4193 small bugfix 2020-09-29 13:34:27 +02:00
muellerr 496251bd68 Merge branch 'master' into mueller/ipc-updates 2020-09-26 14:21:05 +02:00
muellerr 59e4b95b62 Merge pull request 'srv17 id added, include fix for linux' (#206) from KSat/fsfw:mueller/include_fix_srv17_id into master
Reviewed-on: fsfw/fsfw#206
2020-09-22 16:03:23 +02:00
muellerr ab0f4d8c87 service 9 ID added 2020-09-22 16:01:34 +02:00
muellerr 98333b92ef srv17 id added, include fix for linux 2020-09-22 15:57:26 +02:00
muellerr 74b9aef36b freeRTOS update 2020-09-22 15:33:28 +02:00
muellerr 7dc3a7ecbd fix so it compiles 2020-09-22 15:31:15 +02:00
muellerr 4248e4000c Merge branch 'mueller/ipc-updates' of https://egit.irs.uni-stuttgart.de/KSat/fsfw into mueller/ipc-updates 2020-09-22 15:29:38 +02:00
muellerr b2777faf66 queueue factory update 2020-09-22 15:29:28 +02:00
muellerr 522433e1b5 Merge branch 'mueller/file_renormalization' of https://egit.irs.uni-stuttgart.de/KSat/fsfw into mueller/file_renormalization 2020-09-22 15:21:17 +02:00
muellerr 156f44c268 Merge remote-tracking branch 'upstream/master' into mueller/file_renormalization 2020-09-22 15:21:12 +02:00
muellerr 4587fbb76d srv9 func removed 2020-09-22 14:52:24 +02:00
muellerr 5e974877fe Merge branch 'master' into mueller/pusSrv17 2020-09-22 14:34:05 +02:00
muellerr 7851a71a8e commanding service base hotfix 2020-09-22 14:00:18 +02:00
muellerr 721793a058 added author tag back 2020-09-18 13:38:53 +02:00
muellerr 8ea0a38658 shoulddo fix 2020-09-18 13:37:38 +02:00
muellerr 6062192bf0 dded back retval expalanation 2020-09-18 13:37:06 +02:00
muellerr 85f21b0516 object manager convergence 2020-09-18 13:32:53 +02:00
muellerr 386f347574 renormalized files 2020-09-18 13:15:14 +02:00
muellerr 56ff2aef26 include replacement 2020-09-18 13:03:48 +02:00
muellerr ad8c6f3528 commented out code added back 2020-09-18 12:58:38 +02:00
muellerr 0f0ddfc375 stopwatch update 2020-09-18 12:27:40 +02:00
muellerr 96f2b68a22 Merge remote-tracking branch 'upstream/master' into mueller/SimpleRingBufferUpdate2 2020-09-16 19:56:13 +02:00
muellerr 53723b0795 include fix 2020-09-16 19:38:43 +02:00
muellerr b0a816490e fixed includes 2020-09-16 19:37:17 +02:00
muellerr 963015513f added time stamper to framework 2020-09-16 19:36:15 +02:00
muellerr 85d6e81881 added srv9 to class IDs 2020-09-16 19:17:00 +02:00
muellerr b31bee4fda added srv9 2020-09-16 19:11:50 +02:00
muellerr ae426c50ba space replaced by tab 2020-09-16 19:09:51 +02:00
muellerr a5c6be9dd9 added srv17 2020-09-16 19:05:25 +02:00
muellerr 21346e40a5 some improvements 2020-09-15 16:58:38 +02:00
muellerr 3fcbb988ae new file for typedef to avoid circular include 2020-09-15 16:47:01 +02:00
muellerr e96ab12312 comment and calculation fix 2020-09-15 15:55:35 +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 dbac6e139b shared ring buffer update 2020-09-04 15:11:53 +02:00
muellerr 06400fa7bb share dring buffer update 2020-09-04 15:10:44 +02:00
muellerr 3e67701933 taken over ring buffer base changes 2020-09-04 15:09:24 +02:00
muellerr e105be229a include guards fand include improvements 2020-09-04 15:06:48 +02:00
muellerr d885dddee8 renormalize files 2020-09-04 15:04:53 +02:00
muellerr a53b9dc3db renormalization 2020-09-04 14:59:59 +02:00
muellerr a6b2b4dd93 renormalization 2020-09-04 14:58:36 +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