Commit Graph
100 Commits
Author SHA1 Message Date
muellerr af4c6f1d45 config mk update 2020-10-29 17:33:40 +01:00
muellerr 9b5e940965 config make fix 2020-10-29 17:32:07 +01:00
muellerr f5b0589f79 event manager update 2020-10-29 17:28:33 +01:00
muellerr 78896323b6 fsfw config update 2020-10-29 17:09:43 +01:00
muellerr 9af5855ece event stuff added 2020-10-29 15:23:14 +01:00
muellerr 64c341b5f6 now really five 2020-10-29 15:17:33 +01:00
muellerr 27e0b9cf38 default FIFO depth is 5 now 2020-10-29 15:17:13 +01:00
muellerr 4dd79b3495 not static anymore 2020-10-29 15:16:16 +01:00
muellerr 64ec4835f3 Merge branch 'master' into mueller/defaultcfg 2020-10-29 15:15:52 +01:00
muellerr 53e98df37d tm packet stored 2020-10-28 19:44:37 +01:00
muellerr cb71a18277 ack fields improved 2020-10-28 19:21:33 +01:00
muellerr 546db47db4 more refactoring 2020-10-28 02:20:12 +01:00
muellerr ce322ed121 Merge remote-tracking branch 'upstream/master' into mueller_tcPacketBase 2020-10-27 23:31:23 +01:00
muellerr 6cce062d62 some more fixes 2020-10-20 17:52:43 +02:00
muellerr 29a796ebdb include names fixed 2020-10-20 17:51:13 +02:00
muellerr ede00dfdcc double files removed, versioning files renamed 2020-10-20 17:50:10 +02:00
muellerr e4d323683d readme fix 2020-10-20 17:47:52 +02:00
muellerr 4d4300cee6 Merge branch 'mueller/defaultcfg' of https://egit.irs.uni-stuttgart.de/KSat/fsfw into mueller/defaultcfg 2020-10-20 17:44:35 +02:00
muellerr 1940a2acf0 some fixes 2020-10-20 17:44:27 +02:00
muellerr 279682351a Merge branch 'master' into mueller/defaultcfg 2020-10-20 17:41:33 +02:00
muellerr 247c9f2947 added readme 2020-10-20 17:39:11 +02:00
muellerr 482b77ff05 added defaultcfg config folder 2020-10-20 17:38:41 +02:00
muellerr ddacc66b1f Merge branch 'mueller/tcDistribution' of https://egit.irs.uni-stuttgart.de/KSat/fsfw into mueller/tcDistribution 2020-10-20 15:04:45 +02:00
muellerr fa67f82462 structure improved 2020-10-20 15:04:28 +02:00
muellerr 12369d8d4b Merge remote-tracking branch 'upstream/master' into mueller/MQMQ_IF_UpdateFreeRTOS 2020-10-20 14:51:38 +02:00
muellerr 8cea7b05db include improvement 2020-10-20 14:42:58 +02:00
muellerr ea8ef8b874 important bugfix 2020-10-03 14:19:42 +02:00
muellerr 4f91db2ff8 Merge branch 'master' into mueller/FixedOrdMultimapTpp 2020-10-01 13:59:42 +02:00
muellerr c86d654fdf tpp file added 2020-10-01 13:58:20 +02:00
muellerr b8261854cb Merge branch 'master' into mueller/tcDistribution 2020-10-01 13:25:16 +02:00
muellerr 89c4370d91 tc distribution improvements 2020-10-01 13:23:06 +02:00
muellerr 5342dc4bc8 Merge branch 'master' into mueller/MQMQ_IF_UpdateFreeRTOS 2020-10-01 11:46:55 +02:00
muellerr a5a850eb41 Merge branch 'master' into mueller/MQM_IF_UpdateLinux 2020-10-01 11:45:44 +02:00
muellerr c77bded505 Merge remote-tracking branch 'upstream/master' into mueller/MQMQ_IF_UpdateFreeRTOS 2020-10-01 11:15:42 +02:00
muellerr acc03d3e8b Merge branch 'master' into mueller/ArrayList 2020-10-01 11:11:02 +02:00
muellerr d647c63da3 Merge pull request 'Added a compile time check in FixedArrayList and fixed copying' (#222) from gaisser/fsfw:gaisser_fixedArrayList_assert into master
Reviewed-on: fsfw/fsfw#222
2020-10-01 11:10:53 +02:00
muellerr ea13008aa2 Merge branch 'master' into gaisser_fixedArrayList_assert 2020-10-01 11:08:10 +02:00
muellerr 7c3f99ed2d Revert "DH IF and DH message form improved"
This reverts commit adf528fce9.
2020-10-01 11:06:46 +02:00
muellerr 2344efb3ac Merge remote-tracking branch 'upstream/master' 2020-10-01 11:06:21 +02:00
muellerr 236a833d0b Merge pull request 'Added null pointer checks for FIFO Base' (#224) from gaisser/fsfw:gaisser_fifobase_nullptr_check into master
Reviewed-on: fsfw/fsfw#224
2020-10-01 11:04:55 +02:00
muellerr 6c4ec713f3 Merge branch 'master' into gaisser_fifobase_nullptr_check 2020-10-01 11:04:22 +02:00
muellerr b2a7859549 Merge pull request 'Added Documentation to PlacementFactory' (#223) from gaisser/fsfw:gaisser_documentation_placementFactory into master
Reviewed-on: fsfw/fsfw#223
2020-10-01 11:04:08 +02:00
muellerr 8178be9dc5 Merge branch 'master' into gaisser_documentation_placementFactory 2020-10-01 11:02:46 +02:00
muellerr adf528fce9 DH IF and DH message form improved 2020-10-01 11:01:52 +02:00
muellerr 77a9a190aa Merge branch 'master' into mueller/ArrayList 2020-09-30 19:09:24 +02:00
muellerr a0098e8b17 non member comp operator for iterators 2020-09-30 18:57:30 +02:00
muellerr 86a1ae4a8a Merge remote-tracking branch 'upstream/master' into mueller/MQM_IF_UpdateLinux 2020-09-29 18:05:36 +02:00
muellerr 195bf6b89f Merge remote-tracking branch 'upstream/master' into mueller/MQM_IF_UpdateLinux 2020-09-29 18:05:10 +02:00
muellerr f5ded3fa4b Merge branch 'master' into mueller/ArrayList 2020-09-29 18:03:44 +02:00
muellerr e104cd18e6 Merge pull request 'Hotfix Linux include' (#219) from mueller/hotfix-linuxinclude into master
Reviewed-on: fsfw/fsfw#219
2020-09-29 17:57:58 +02:00
muellerr 71f2f34aab Merge remote-tracking branch 'upstream/master' into mueller/hotfix-linuxinclude 2020-09-29 17:57:20 +02:00
muellerr 6c0bb23ed6 non member bool operator 2020-09-29 17:51:16 +02:00
muellerr f73f798a4d lines removed 2020-09-29 17:28:37 +02:00
muellerr 4fce0377a9 missing include for linux 2020-09-29 17:28:02 +02:00
muellerr 4eef7bfc01 changes taken over 2020-09-29 16:12:43 +02:00
muellerr 17d5de15c9 slight changes ,size t replacement 2020-09-29 16:10:35 +02:00
muellerr cdadf48f38 Merge pull request 'Returns failed now in Service 200 when mode answer is negative' (#217) from gaisser/fsfw:gaisser_service200_returns into master
Reviewed-on: fsfw/fsfw#217
2020-09-29 16:02:02 +02:00
muellerr 06f5b816e4 Merge branch 'master' into mueller/MQMQ_IF_UpdateFreeRTOS 2020-09-29 15:29:01 +02:00
muellerr 3d830a9e20 Merge branch 'master' into mueller/MQM_IF_UpdateLinux 2020-09-29 15:28:37 +02:00
muellerr 13b30f8de6 Merge pull request 'Removed comments and added include in tmtcservices/PusVerificationReporter' (#216) from gaisser/fsfw:gaisser_removed_unused into master
Reviewed-on: fsfw/fsfw#216
2020-09-29 15:28:16 +02:00
muellerr 046eec6c18 Merge branch 'mueller/MQM_IF_UpdateLinux' into mueller/MQMQ_IF_UpdateFreeRTOS 2020-09-29 15:24:12 +02:00
muellerr 47c21cfc6c include fix 2020-09-29 15:22:38 +02:00
muellerr 00f89bb193 Merge branch 'mueller/MQM_IF_UpdateLinux' of https://egit.irs.uni-stuttgart.de/KSat/fsfw into mueller/MQM_IF_UpdateLinux 2020-09-29 15:21:42 +02:00
muellerr 6879045ef3 include fix 2020-09-29 15:21:33 +02:00
muellerr c9005783b2 Merge branch 'master' into mueller/MQM_IF_UpdateLinux 2020-09-29 15:20:48 +02:00
muellerr 4010d8d960 Merge remote-tracking branch 'upstream/master' into mueller/MQM_IF_UpdateLinux 2020-09-29 15:20:32 +02:00
muellerr a71528551a include added 2020-09-29 15:10:08 +02:00
muellerr 6a5268f5b0 typo fix 2020-09-29 15:05:18 +02:00
muellerr 392d0299a9 Merge remote-tracking branch 'upstream/master' into mueller/modes-memory 2020-09-29 15:04:42 +02:00
muellerr 37c605c4fb Merge pull request 'Fixes #194 Small Map Issues' (#209) from gaisser/fsfw:gaisser_small_map_issues into master
Reviewed-on: fsfw/fsfw#209
2020-09-29 14:59:55 +02:00
muellerr 6c86cf88f3 Merge branch 'master' into mueller_StoreAccessor 2020-09-29 14:56:20 +02:00
muellerr 352ce13fb3 removed line break 2020-09-29 14:55:17 +02:00
muellerr 1ed1b7ea06 include guard fix 2020-09-29 14:51:08 +02:00
muellerr a58e47623f update 2020-09-29 14:50:16 +02:00
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 c01d904552 Merge branch 'mueller/FixedTimeslotUpdate' of https://egit.irs.uni-stuttgart.de/KSat/fsfw into mueller/FixedTimeslotUpdate 2020-09-29 14:30:05 +02:00
muellerr 7dbb73b7d8 removed dbeug printout 2020-09-29 14:29:57 +02:00
muellerr 183b6a4193 small bugfix 2020-09-29 13:34:27 +02:00
muellerr 75bdf96799 Merge branch 'master' into mueller/MQM_IF_UpdateLinux 2020-09-27 19:22:07 +02:00
muellerr 6d2266f7d0 equalization complete 2020-09-26 14:58:53 +02:00
muellerr 9d4c2b90f3 removed proxy/ not used&working? 2020-09-26 14:54:23 +02:00
muellerr 7b57f372bf starting convergence 2020-09-26 14:51:00 +02:00
muellerr bf5688c8d8 last fixes 2020-09-26 14:36:56 +02:00
muellerr a0bc6b3c1f MQM IF update 2020-09-26 14:34:49 +02:00
muellerr eec022f801 Merge remote-tracking branch 'origin/mueller/ipc-updates' into mueller/MQMQ_IF_UpdateFreeRTOS 2020-09-26 14:33:35 +02:00
muellerr 20279169ed Merge branch 'mueller/ipc-updates' into mueller/MQMQ_IF_UpdateFreeRTOS 2020-09-26 14:27:09 +02:00
muellerr 2edc7fd096 Merge remote-tracking branch 'upstream/master' into mueller/MQMQ_IF_UpdateFreeRTOS 2020-09-26 14:25:50 +02:00
muellerr 13b68f10a0 added usage of new interface 2020-09-26 14:24:09 +02:00
muellerr 496251bd68 Merge branch 'master' into mueller/ipc-updates 2020-09-26 14:21:05 +02:00
muellerr 22d9b77165 added documentation 2020-09-26 14:19:51 +02:00
muellerr 40558835c7 Merge branch 'master' into mueller/FixedTimeslotUpdate 2020-09-26 14:14:50 +02:00
muellerr 978d7514a4 added doc, changed type 2020-09-22 16:32:59 +02:00
muellerr 2f73841580 include fix 2020-09-22 16:24:40 +02:00
muellerr 0bc3807c18 added FIFO 2020-09-22 16:22:37 +02:00
muellerr de840dcf8d last fixes for linux 2020-09-22 16:10:43 +02:00
muellerr e0d9a080c5 Merge remote-tracking branch 'upstream/master' into mueller/MQM_IF_UpdateLinux 2020-09-22 16:06:33 +02:00