Commit Graph

937 Commits

Author SHA1 Message Date
Robin Müller 2f993cf39a some minor form stuff 2020-11-02 15:51:52 +01:00
Steffen Gaisser 6bedc9b805 Merge pull request 'added new windows udp bridge' (#188) from KSat/fsfw:mueller/feature/windowsUdpBridge into master
Reviewed-on: #188
2020-11-02 15:29:08 +01:00
Robin Müller 652dc00cc9 Merge branch 'master' into mueller/feature/windowsUdpBridge 2020-11-02 15:28:07 +01:00
Steffen Gaisser 719aab2a26 Merge pull request 'health update' (#246) from KSat/fsfw:mueller/health-convergence into master
Reviewed-on: #246
2020-11-02 15:26:51 +01:00
Steffen Gaisser 470196a044 Merge branch 'master' into mueller/health-convergence 2020-11-02 15:22:58 +01:00
Steffen Gaisser 9c9facf4a1 Merge pull request 'host osal fixes' (#247) from eive/fsfw:development into master
Reviewed-on: #247
2020-11-02 15:22:37 +01:00
Steffen Gaisser cf46aebf32 Merge branch 'master' into development 2020-11-02 15:16:10 +01:00
Steffen Gaisser 449a08c92c Merge pull request 'testcfg fix' (#248) from fsfwtest/testcfg-fix into master
Reviewed-on: #248
2020-11-02 15:15:59 +01:00
Robin Müller a7e06c11fd Merge branch 'master' into fsfwtest/testcfg-fix 2020-11-02 15:12:44 +01:00
Steffen Gaisser 0c15a90399 Merge pull request 'Default Configuration' (#243) from KSat/fsfw:mueller/defaultcfg into master
Reviewed-on: #243
2020-11-02 15:09:55 +01:00
Robin Müller bcbc61ccba Merge branch 'master' into fsfwtest/testcfg-fix 2020-11-02 15:06:10 +01:00
Robin Müller 9221d0ca7c Merge branch 'master' into development 2020-11-02 15:04:25 +01:00
Robin Müller a7bc69b0ac health table update 2020-11-02 15:00:01 +01:00
Robin Müller 77fd2cb871 mission timestmap size is uint8 now 2020-11-02 14:53:44 +01:00
Steffen Gaisser 093d3562b6 Merge branch 'master' into mueller/health-convergence 2020-11-02 14:53:20 +01:00
Steffen Gaisser 2761ee8109 Merge branch 'master' into mueller/defaultcfg 2020-11-02 14:48:23 +01:00
Steffen Gaisser 52d3dbfd20 Merge pull request 'HasReturnvaluesIF small improvements' (#245) from KSat/fsfw:mueller/returnvalue-convergence into master
Reviewed-on: #245
2020-11-02 14:48:10 +01:00
Robin Müller 963c333365 cast added 2020-11-02 14:45:10 +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: #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 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: #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