Commit Graph

1528 Commits

Author SHA1 Message Date
59619825ac Merge pull request 'Merge master into devel' (#271) from master into development
Reviewed-on: fsfw/fsfw#271
2020-12-01 13:21:04 +01:00
a2c28198ed Merge branch 'development' into master 2020-12-01 13:20:33 +01:00
4241c00448 Added the new logos, colors are WIP at the moment 2020-11-30 18:30:58 +01:00
4406c6eb86 Merge pull request 'meier/gaisser_readme_update' (#267) from gaisser/fsfw:meier/gaisser_readme_update into master
Reviewed-on: fsfw/fsfw#267
2020-11-30 16:28:09 +01:00
ce629dfd83 Merge branch 'master' into meier/gaisser_readme_update 2020-11-30 16:27:53 +01:00
293d34147e Merge pull request 'Readme Update' (#260) from gaisser/fsfw:gaisser_readme_update into master
Reviewed-on: fsfw/fsfw#260
2020-11-30 16:27:24 +01:00
e34ff44913 Merge branch 'master' into mueller/enhanced-controller 2020-11-30 12:39:25 +01:00
49479faa1a better solution 2020-11-30 12:37:22 +01:00
c182171b09 updated make file 2020-11-30 12:32:38 +01:00
9cec8e4c0d Merge branch 'development' into fsfwexample/small-tweaks 2020-11-30 12:29:31 +01:00
9bfba41875 Merge pull request 'Update devel' (#264) from master into development
Reviewed-on: fsfw/fsfw#264
2020-11-30 12:27:10 +01:00
5a20ec583b Merge branch 'master' into gaisser_readme_update 2020-11-27 20:21:23 +01:00
d3a7f86ea2 Merge pull request 'Fixes for RTEMS #173' (#262) from gaisser_rtems_fixes into master
Reviewed-on: fsfw/fsfw#262
2020-11-27 20:21:08 +01:00
227ec25e89 some minor corrections in readme 2020-11-27 11:44:11 +01:00
7fadb0d8c6 Merge branch 'master' into mueller/enhanced-controller 2020-11-26 16:28:25 +01:00
25e3d25b28 Merge branch 'master' into mueller/pus-improvements 2020-11-26 16:11:45 +01:00
eb08ef1c1f Merge remote-tracking branch 'upstream/development' into development 2020-11-24 13:46:56 +01:00
767f105762 added changelog 2020-11-24 13:45:34 +01:00
8c294729d0 extern c definition added 2020-11-22 12:34:16 +01:00
1cc0847bb5 small bugfix 2020-11-21 00:15:31 +01:00
ca34250e8d Merge branch 'development' of https://egit.irs.uni-stuttgart.de/eive/fsfw into development 2020-11-20 17:25:43 +01:00
6489246c4b Updated include guards 2020-11-17 19:35:37 +01:00
273ddf9061 Rtems compiles again fixes #176 2020-11-17 19:25:57 +01:00
5b5f2f3e1d Added hardware recommendations 2020-11-17 09:42:38 +01:00
51443d7a68 Version number 2020-11-13 15:09:00 +01:00
8aef4b9b99 Updated formatting 2020-11-13 14:36:32 +01:00
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
7ffce219d5 hosted build fix 2020-11-07 14:32:28 +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