Commit Graph

867 Commits

Author SHA1 Message Date
9af5855ece event stuff added 2020-10-29 15:23:14 +01:00
64c341b5f6 now really five 2020-10-29 15:17:33 +01:00
27e0b9cf38 default FIFO depth is 5 now 2020-10-29 15:17:13 +01:00
4dd79b3495 not static anymore 2020-10-29 15:16:16 +01:00
64ec4835f3 Merge branch 'master' into mueller/defaultcfg 2020-10-29 15:15:52 +01:00
096643971b Merge pull request 'TMTC Packet Base improvements' (#80) from KSat/fsfw:mueller_tcPacketBase into master
Reviewed-on: fsfw/fsfw#80
2020-10-29 13:17:35 +01:00
53e98df37d tm packet stored 2020-10-28 19:44:37 +01:00
cb71a18277 ack fields improved 2020-10-28 19:21:33 +01:00
546db47db4 more refactoring 2020-10-28 02:20:12 +01:00
ce322ed121 Merge remote-tracking branch 'upstream/master' into mueller_tcPacketBase 2020-10-27 23:31:23 +01:00
744d3a2346 Merge branch 'master' into mueller/defaultcfg 2020-10-27 15:18:53 +01:00
c89a24a248 Merge pull request 'Fixes #161' (#244) from gaisser/fsfw:gaisser_fix_dhb_stream_reset into master
Reviewed-on: fsfw/fsfw#244
2020-10-27 15:17:18 +01:00
6651622a16 Merge branch 'master' into gaisser_fix_dhb_stream_reset 2020-10-27 15:16:58 +01:00
410094ed28 Fixes #161 2020-10-27 15:16:14 +01:00
f40b432e43 Merge pull request 'added FIFO to SharedRingBuffer' (#208) from KSat/fsfw:mueller/sharedRingBufferFIFO into master
Reviewed-on: fsfw/fsfw#208
2020-10-27 14:29:48 +01:00
67dd153511 Merge branch 'master' into mueller/sharedRingBufferFIFO 2020-10-27 13:36:59 +01:00
342a70d109 Merge branch 'master' into mueller_tcPacketBase 2020-10-27 12:24:12 +01:00
6cce062d62 some more fixes 2020-10-20 17:52:43 +02:00
29a796ebdb include names fixed 2020-10-20 17:51:13 +02:00
ede00dfdcc double files removed, versioning files renamed 2020-10-20 17:50:10 +02:00
e4d323683d readme fix 2020-10-20 17:47:52 +02:00
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
1940a2acf0 some fixes 2020-10-20 17:44:27 +02:00
279682351a Merge branch 'master' into mueller/defaultcfg 2020-10-20 17:41:33 +02:00
247c9f2947 added readme 2020-10-20 17:39:11 +02:00
482b77ff05 added defaultcfg config folder 2020-10-20 17:38:41 +02:00
0b1b9c11eb Merge pull request 'TC Distribution convergence' (#229) from KSat/fsfw:mueller/tcDistribution into master
Reviewed-on: fsfw/fsfw#229
2020-10-20 15:11:27 +02:00
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
fa67f82462 structure improved 2020-10-20 15:04:28 +02:00
407df913d3 Merge branch 'master' into mueller/tcDistribution 2020-10-20 14:56:53 +02:00
3580ec0e09 Merge pull request 'MQM IF used by FreeRTOS' (#212) from KSat/fsfw:mueller/MQMQ_IF_UpdateFreeRTOS into master
Reviewed-on: fsfw/fsfw#212
2020-10-20 14:52:58 +02:00
12369d8d4b Merge remote-tracking branch 'upstream/master' into mueller/MQMQ_IF_UpdateFreeRTOS 2020-10-20 14:51:38 +02:00
6b2df54204 Merge pull request 'Message QueueMessage IF used in Linux' (#207) from KSat/fsfw:mueller/MQM_IF_UpdateLinux into master
Reviewed-on: fsfw/fsfw#207
2020-10-20 14:50:47 +02:00
8cea7b05db include improvement 2020-10-20 14:42:58 +02:00
17548605ec Merge branch 'master' into mueller/MQMQ_IF_UpdateFreeRTOS 2020-10-20 14:37:22 +02:00
ea8ef8b874 important bugfix 2020-10-03 14:19:42 +02:00
54af54927b Merge branch 'master' into mueller/tcDistribution 2020-10-01 19:05:09 +02:00
9bf0026b8a Merge branch 'master' into mueller/MQM_IF_UpdateLinux 2020-10-01 19:04:53 +02:00
335e146735 Merge pull request 'Made tpp file less cluttered and added inline qualifier' (#234) from gaisser/fsfw:master into master
Reviewed-on: fsfw/fsfw#234
2020-10-01 17:45:11 +02:00
6776ca86eb Made tpp file less cluttered and added inline qualifier 2020-10-01 17:44:23 +02:00
f172c07876 Merge pull request 'Fixed issue with tpp File' (#233) from gaisser/fsfw:gaisser_fix_multimap3 into master
Reviewed-on: fsfw/fsfw#233
2020-10-01 17:37:52 +02:00
0a9a8cf867 Merge branch 'master' into gaisser_fix_multimap3 2020-10-01 17:37:34 +02:00
f1bc9972f3 Fixed bugs 2020-10-01 17:36:46 +02:00
7c7b3de14f Merge pull request 'Fixes and comments in FixedOrderedMultimap' (#231) from gaisser/fsfw:gaisser_fix_multimap2 into master
Reviewed-on: fsfw/fsfw#231
2020-10-01 17:32:44 +02:00
587f87d270 Feedback from Robin 2020-10-01 17:27:24 +02:00
cd2cb410e4 Merge branch 'master' of https://egit.irs.uni-stuttgart.de/fsfw/fsfw.git
into gaisser_fix_multimap2

Conflicts:
	container/FixedOrderedMultimap.h
2020-10-01 14:59:26 +02:00
b292c5c927 Merge pull request 'FixedOrderedMultimap Implementation moved to TPP file' (#232) from KSat/fsfw:mueller/FixedOrdMultimapTpp into master
Reviewed-on: fsfw/fsfw#232
2020-10-01 14:02:41 +02:00
4f91db2ff8 Merge branch 'master' into mueller/FixedOrdMultimapTpp 2020-10-01 13:59:42 +02:00
c86d654fdf tpp file added 2020-10-01 13:58:20 +02:00
1f3a10b375 Fixes and comments in FixedOrderedMultimap 2020-10-01 13:30:28 +02:00