Commit Graph

3411 Commits

Author SHA1 Message Date
093d3562b6 Merge branch 'master' into mueller/health-convergence 2020-11-02 14:53:20 +01:00
2761ee8109 Merge branch 'master' into mueller/defaultcfg 2020-11-02 14:48:23 +01:00
52d3dbfd20 Merge pull request 'HasReturnvaluesIF small improvements' (#245) from KSat/fsfw:mueller/returnvalue-convergence into master
Reviewed-on: fsfw/fsfw#245
2020-11-02 14:48:10 +01:00
d42a1e2abc Merge remote-tracking branch 'upstream/master' into mueller/newLocalDataPools 2020-11-02 14:46:16 +01:00
963c333365 cast added 2020-11-02 14:45:10 +01:00
1f632b9331 Merge remote-tracking branch 'upstream/master' into mueller/newLocalDataPools 2020-11-02 14:41:47 +01:00
b441f5242f Merge remote-tracking branch 'upstream/master' into development 2020-11-02 14:23:51 +01:00
508f31a359 adaptions so it compiles 2020-11-02 14:19:56 +01:00
5d0f96c3a1 reamde update 2020-10-30 14:42:42 +01:00
82a2f3ec61 testcfg fix 2020-10-30 14:21:31 +01:00
a5cf510ae9 host osal fixes 2020-10-30 13:31:07 +01:00
a0d4c77d94 Merge remote-tracking branch 'upstream/master' into mueller/returnvalue-convergence 2020-10-30 11:06:09 +01:00
0b855c5b55 Merge branch 'master' into mueller/defaultcfg 2020-10-29 20:09:31 +01:00
38830dfc17 Merge branch 'master' into mueller/health-convergence 2020-10-29 20:06:03 +01:00
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
51c5b05f03 Merge branch 'master' into mueller/unittest-integration-from-master 2020-10-29 19:59:23 +01:00
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
6ea9334923 parameter updates 2020-10-29 17:57:27 +01:00
3098f34eb0 health update 2020-10-29 17:52:28 +01:00
e0a11f3a6e include guard update 2020-10-29 17:46:44 +01:00
e35aebcd0a HasREturnvalue update 2020-10-29 17:45:06 +01:00
6edc2ef1d6 class IDs moved 2020-10-29 17:42:05 +01:00
af4c6f1d45 config mk update 2020-10-29 17:33:40 +01:00
641da2aa21 config make update 2020-10-29 17:33:22 +01:00
9b5e940965 config make fix 2020-10-29 17:32:07 +01:00
f5b0589f79 event manager update 2020-10-29 17:28:33 +01:00
567cbd39ef include fixes 2020-10-29 17:22:41 +01:00
777457482b fixes for internal unittest 2020-10-29 17:21:51 +01:00
78896323b6 fsfw config update 2020-10-29 17:09:43 +01:00
3fc2068011 fsfwconfig update 2020-10-29 17:09:16 +01:00
0919d2c532 updates taken over 2020-10-29 16:52:06 +01:00
ba036805de Merge branch 'master' into mueller/action-update 2020-10-29 16:49:07 +01:00
3d2778fdf7 doc update 2020-10-29 16:45:47 +01:00
42e611899b added timestamp size 2020-10-29 16:43:03 +01:00
fb12045f23 changes from master taken over 2020-10-29 15:25:03 +01:00
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
4b2af9eaa6 static keyword removed 2020-10-29 15:15:08 +01:00
172fbd7e48 some changes taken over 2020-10-29 15:13:03 +01:00
7970043cb5 deleted some sutff 2020-10-29 15:12:36 +01:00
176ca56e35 core changes taken over 2020-10-29 15:12:05 +01:00
4229e256d1 include guard fix 2020-10-29 13:55:49 +01:00
352296d200 action helper update 2020-10-29 13:52:52 +01:00
4557a2eb36 better comments 2020-10-29 13:34:53 +01:00
edb2d3848d some improverments for simple helper 2020-10-29 13:27:41 +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
56da648026 config folder update 2020-10-29 13:16:14 +01:00