Commit Graph

971 Commits

Author SHA1 Message Date
Robin Müller b441f5242f Merge remote-tracking branch 'upstream/master' into development 2020-11-02 14:23:51 +01:00
Robin Müller 508f31a359 adaptions so it compiles 2020-11-02 14:19:56 +01:00
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
Robin Müller a5cf510ae9 host osal fixes 2020-10-30 13:31:07 +01:00
Robin Müller a0d4c77d94 Merge remote-tracking branch 'upstream/master' into mueller/returnvalue-convergence 2020-10-30 11:06:09 +01:00
Steffen Gaisser 0b855c5b55 Merge branch 'master' into mueller/defaultcfg 2020-10-29 20:09:31 +01:00
Steffen Gaisser 38830dfc17 Merge branch 'master' into mueller/health-convergence 2020-10-29 20:06:03 +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: fsfw/fsfw#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: fsfw/fsfw#235
2020-10-29 19:59:05 +01:00
Robin Müller 3098f34eb0 health update 2020-10-29 17:52:28 +01:00
Robin Müller e35aebcd0a HasREturnvalue update 2020-10-29 17:45:06 +01:00
Robin Müller af4c6f1d45 config mk update 2020-10-29 17:33:40 +01:00
Robin Müller 9b5e940965 config make fix 2020-10-29 17:32:07 +01:00
Robin Müller f5b0589f79 event manager update 2020-10-29 17:28:33 +01:00
Robin Müller 567cbd39ef include fixes 2020-10-29 17:22:41 +01:00
Robin Müller 78896323b6 fsfw config update 2020-10-29 17:09:43 +01:00
Robin Müller ba036805de Merge branch 'master' into mueller/action-update 2020-10-29 16:49:07 +01:00
Robin Müller 9af5855ece event stuff added 2020-10-29 15:23:14 +01:00
Robin Müller 64c341b5f6 now really five 2020-10-29 15:17:33 +01:00
Robin Müller 27e0b9cf38 default FIFO depth is 5 now 2020-10-29 15:17:13 +01:00
Robin Müller 4dd79b3495 not static anymore 2020-10-29 15:16:16 +01:00
Robin Müller 64ec4835f3 Merge branch 'master' into mueller/defaultcfg 2020-10-29 15:15:52 +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: fsfw/fsfw#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 744d3a2346 Merge branch 'master' into mueller/defaultcfg 2020-10-27 15:18:53 +01:00
Steffen Gaisser 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
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: fsfw/fsfw#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