Commit Graph

1251 Commits

Author SHA1 Message Date
752601e85f WIP readme 2020-11-13 14:31:30 +01:00
0075ae53b3 Merge pull request 'meier/udp_bridge_embedded_linux' (#259) from eive/fsfw:meier/udp_bridge_embedded_linux into master
Reviewed-on: fsfw/fsfw#259
2020-11-10 15:10:47 +01:00
520409822e now all debug output removed 2020-11-10 15:06:51 +01:00
030f1beb93 Merge branch 'master' into meier/udp_bridge_embedded_linux 2020-11-10 14:53:15 +01:00
2a4b4f2114 Merge pull request 'config folder renamed and improved' (#255) from KSat/fsfw:mueller/fsfwconfig-better into master
Reviewed-on: fsfw/fsfw#255
2020-11-10 14:46:55 +01:00
bb7709fea1 Merge branch 'master' into mueller/fsfwconfig-better 2020-11-10 14:46:04 +01:00
bc58213482 Merge pull request 'Action folder: some minor form stuff' (#256) from KSat/fsfw:mueller/action-yet-another-update into master
Reviewed-on: fsfw/fsfw#256
2020-11-10 14:45:55 +01:00
4fc29adab4 Merge branch 'development' into mueller/parameter-convergence 2020-11-10 11:20:13 +01:00
5865e56c54 indentation fixed 2020-11-10 11:15:42 +01:00
7c75c6e8cc parameter helper update 2020-11-10 11:14:07 +01:00
0304f61bde has parametersIF doc improved 2020-11-10 11:00:13 +01:00
6c22fab208 pus service improvements 2020-11-09 21:33:09 +01:00
136f04a5c6 trnaslation files removed 2020-11-09 21:23:51 +01:00
37fc22a117 config folder renamed and improved 2020-11-09 21:21:56 +01:00
bc81b5893c removed debug output 2020-11-09 17:34:53 +01:00
3eefcd3a2d fsfw.mk adjusted to upstream master 2020-11-07 20:45:00 +01:00
210d2de11e fetched fsfw.mk from upstream master 2020-11-07 20:40:01 +01:00
83568e11d1 removed unwanted changes 2020-11-07 20:37:48 +01:00
113397c6c6 udp bridge for embedded linux 2020-11-07 20:30:42 +01:00
3920fd89bd Merge branch 'master' into mueller/enhanced-controller 2020-11-03 12:06:56 +01:00
3cd0f8f5f0 Merge remote-tracking branch 'upstream/development' into development 2020-11-02 17:29:26 +01:00
edecb7882b Merge branch 'eive/include-fsfw' into development 2020-11-02 17:21:43 +01:00
cc51d9ace9 small fix so that it compiles 2020-11-02 17:21:25 +01:00
3067259a9b include added 2020-11-02 17:19:24 +01:00
7d83767c2b include added 2020-11-02 16:45:19 +01:00
59c200254d Merge branch 'master' into development 2020-11-02 16:03:10 +01:00
71382032a1 Merge remote-tracking branch 'upstream/master' into mueller/parameter-convergence 2020-11-02 15:55:07 +01:00
2f993cf39a some minor form stuff 2020-11-02 15:51:52 +01:00
319765ad1d Merge remote-tracking branch 'upstream/master' into mueller/newLocalDataPools 2020-11-02 15:41:48 +01:00
9180c76ca7 Merge remote-tracking branch 'upstream/master' into mueller/LocalPoolRefactoring 2020-11-02 15:38:08 +01:00
0ff092e8b9 Merge remote-tracking branch 'upstream/master' into mueller/LocalPoolRefactoring 2020-11-02 15:35:30 +01:00
6bedc9b805 Merge pull request 'added new windows udp bridge' (#188) from KSat/fsfw:mueller/feature/windowsUdpBridge into master
Reviewed-on: fsfw/fsfw#188
2020-11-02 15:29:08 +01:00
652dc00cc9 Merge branch 'master' into mueller/feature/windowsUdpBridge 2020-11-02 15:28:07 +01:00
719aab2a26 Merge pull request 'health update' (#246) from KSat/fsfw:mueller/health-convergence into master
Reviewed-on: fsfw/fsfw#246
2020-11-02 15:26:51 +01:00
470196a044 Merge branch 'master' into mueller/health-convergence 2020-11-02 15:22:58 +01:00
9c9facf4a1 Merge pull request 'host osal fixes' (#247) from eive/fsfw:development into master
Reviewed-on: fsfw/fsfw#247
2020-11-02 15:22:37 +01:00
cf46aebf32 Merge branch 'master' into development 2020-11-02 15:16:10 +01:00
449a08c92c Merge pull request 'testcfg fix' (#248) from fsfwtest/testcfg-fix into master
Reviewed-on: fsfw/fsfw#248
2020-11-02 15:15:59 +01:00
a7e06c11fd Merge branch 'master' into fsfwtest/testcfg-fix 2020-11-02 15:12:44 +01:00
0c15a90399 Merge pull request 'Default Configuration' (#243) from KSat/fsfw:mueller/defaultcfg into master
Reviewed-on: fsfw/fsfw#243
2020-11-02 15:09:55 +01:00
bcbc61ccba Merge branch 'master' into fsfwtest/testcfg-fix 2020-11-02 15:06:10 +01:00
9221d0ca7c Merge branch 'master' into development 2020-11-02 15:04:25 +01:00
a7bc69b0ac health table update 2020-11-02 15:00:01 +01:00
77fd2cb871 mission timestmap size is uint8 now 2020-11-02 14:53:44 +01:00
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