Commit Graph

880 Commits

Author SHA1 Message Date
Robin Müller 5d0f96c3a1 reamde update 2020-10-30 14:42:42 +01:00
Robin Müller 82a2f3ec61 testcfg fix 2020-10-30 14:21:31 +01:00
Steffen Gaisser 11a351a202 Merge pull request 'Unittest integrated in FSFW now' (#242) from KSat/fsfw:mueller/unittest-integration-from-master into master
Reviewed-on: #242
2020-10-29 20:05:30 +01:00
Steffen Gaisser 51c5b05f03 Merge branch 'master' into mueller/unittest-integration-from-master 2020-10-29 19:59:23 +01:00
Steffen Gaisser de5e62a9c8 Merge pull request 'Action folder: minor form improvements, include guards' (#235) from KSat/fsfw:mueller/action-update into master
Reviewed-on: #235
2020-10-29 19:59:05 +01:00
Robin Müller 567cbd39ef include fixes 2020-10-29 17:22:41 +01:00
Robin Müller ba036805de Merge branch 'master' into mueller/action-update 2020-10-29 16:49:07 +01:00
Robin Müller 4229e256d1 include guard fix 2020-10-29 13:55:49 +01:00
Robin Müller 352296d200 action helper update 2020-10-29 13:52:52 +01:00
Robin Müller 4557a2eb36 better comments 2020-10-29 13:34:53 +01:00
Robin Müller edb2d3848d some improverments for simple helper 2020-10-29 13:27:41 +01:00
Steffen Gaisser 096643971b Merge pull request 'TMTC Packet Base improvements' (#80) from KSat/fsfw:mueller_tcPacketBase into master
Reviewed-on: #80
2020-10-29 13:17:35 +01:00
Robin Müller 56da648026 config folder update 2020-10-29 13:16:14 +01:00
Robin Müller 38135a3d53 reamde update 2020-10-29 13:13:48 +01:00
Robin Müller 3c1415a4bd todos removed2 2020-10-29 13:08:09 +01:00
Robin Müller 08496c378e Merge branch 'mueller/action-update' of https://egit.irs.uni-stuttgart.de/KSat/fsfw into mueller/action-update 2020-10-29 13:07:17 +01:00
Robin Müller af18f6c94c todos removed 2020-10-29 13:07:08 +01:00
Robin Müller 5a8431e82b Merge branch 'master' into mueller/action-update 2020-10-29 13:04:48 +01:00
Robin Müller 97f6dace26 some fixes for master 2020-10-29 12:42:29 +01:00
Robin Müller c8fd698b3a some changes 2020-10-29 12:23:27 +01:00
Robin Müller 50151310dc Merge branch 'master' into mueller/unittest-integration-from-master 2020-10-29 12:20:38 +01:00
Robin Müller 53e98df37d tm packet stored 2020-10-28 19:44:37 +01:00
Robin Müller cb71a18277 ack fields improved 2020-10-28 19:21:33 +01:00
Robin Müller 546db47db4 more refactoring 2020-10-28 02:20:12 +01:00
Robin Müller ce322ed121 Merge remote-tracking branch 'upstream/master' into mueller_tcPacketBase 2020-10-27 23:31:23 +01:00
Steffen Gaisser c89a24a248 Merge pull request 'Fixes #161' (#244) from gaisser/fsfw:gaisser_fix_dhb_stream_reset into master
Reviewed-on: #244
2020-10-27 15:17:18 +01:00
Steffen Gaisser 6651622a16 Merge branch 'master' into gaisser_fix_dhb_stream_reset 2020-10-27 15:16:58 +01:00
Steffen Gaisser 410094ed28 Fixes #161 2020-10-27 15:16:14 +01:00
Steffen Gaisser 8b21324815 Merge branch 'master' into mueller/action-update 2020-10-27 14:30:12 +01:00
Steffen Gaisser f40b432e43 Merge pull request 'added FIFO to SharedRingBuffer' (#208) from KSat/fsfw:mueller/sharedRingBufferFIFO into master
Reviewed-on: #208
2020-10-27 14:29:48 +01:00
Steffen Gaisser 67dd153511 Merge branch 'master' into mueller/sharedRingBufferFIFO 2020-10-27 13:36:59 +01:00
Steffen Gaisser 342a70d109 Merge branch 'master' into mueller_tcPacketBase 2020-10-27 12:24:12 +01:00
Robin Müller 72b9adb684 Merge branch 'master' into mueller/unittest-integration-from-master 2020-10-20 17:15:30 +02:00
Robin Müller 865ea3386c unittest now contained directly 2020-10-20 17:11:23 +02:00
Robin Müller c677358343 include adaption 2020-10-20 17:06:09 +02:00
Robin Müller 7821cc2870 submodule added 2020-10-20 16:52:34 +02:00
Steffen Gaisser 756df4f37f Merge branch 'master' into mueller/action-update 2020-10-20 16:04:29 +02:00
Steffen Gaisser 0b1b9c11eb Merge pull request 'TC Distribution convergence' (#229) from KSat/fsfw:mueller/tcDistribution into master
Reviewed-on: #229
2020-10-20 15:11:27 +02:00
Robin Müller 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
Robin Müller fa67f82462 structure improved 2020-10-20 15:04:28 +02:00
Steffen Gaisser 407df913d3 Merge branch 'master' into mueller/tcDistribution 2020-10-20 14:56:53 +02:00
Steffen Gaisser 3580ec0e09 Merge pull request 'MQM IF used by FreeRTOS' (#212) from KSat/fsfw:mueller/MQMQ_IF_UpdateFreeRTOS into master
Reviewed-on: #212
2020-10-20 14:52:58 +02:00
Robin Müller 12369d8d4b Merge remote-tracking branch 'upstream/master' into mueller/MQMQ_IF_UpdateFreeRTOS 2020-10-20 14:51:38 +02:00
Steffen Gaisser 6b2df54204 Merge pull request 'Message QueueMessage IF used in Linux' (#207) from KSat/fsfw:mueller/MQM_IF_UpdateLinux into master
Reviewed-on: #207
2020-10-20 14:50:47 +02:00
Robin Müller 8cea7b05db include improvement 2020-10-20 14:42:58 +02:00
Steffen Gaisser 17548605ec Merge branch 'master' into mueller/MQMQ_IF_UpdateFreeRTOS 2020-10-20 14:37:22 +02:00
Robin Müller 829be0f082 doc correction, action helper new helper function 2020-10-12 16:58:04 +02:00
Robin Müller 17ea3127a7 minor form improvements, include guards 2020-10-10 17:04:43 +02:00
Robin Müller ea8ef8b874 important bugfix 2020-10-03 14:19:42 +02:00
Steffen Gaisser 54af54927b Merge branch 'master' into mueller/tcDistribution 2020-10-01 19:05:09 +02:00