|
|
84010db691
|
Merge branch 'development' into mueller/parameter-convergence
|
2020-12-01 14:01:32 +01:00 |
|
|
|
1f78496cd3
|
changelog update
|
2020-12-01 14:01:04 +01:00 |
|
|
|
4b83738241
|
Merge branch 'mueller/enhanced-controller' of https://egit.irs.uni-stuttgart.de/KSat/fsfw into mueller/enhanced-controller
|
2020-12-01 14:00:10 +01:00 |
|
|
|
5757f9d7a2
|
Merge remote-tracking branch 'upstream/development' into mueller/enhanced-controller
|
2020-12-01 13:59:41 +01:00 |
|
|
|
74029a8483
|
Merge branch 'development' into mueller/enhanced-controller
|
2020-12-01 13:58:40 +01:00 |
|
|
|
244e2b5f13
|
Merge branch 'master' into mueller/enhanced-controller
|
2020-12-01 13:55:18 +01:00 |
|
|
|
24ba716ab2
|
Merge branch 'development' into mueller/LocalPoolRefactoring
|
2020-12-01 13:54:56 +01:00 |
|
|
|
2930b2dd5a
|
changelog update
|
2020-12-01 13:52:40 +01:00 |
|
|
|
9ebf259a9e
|
added back config
|
2020-12-01 13:50:33 +01:00 |
|
|
|
b8cc1ccf7e
|
Merge remote-tracking branch 'ksat/mueller/defaultcfg-update' into development
|
2020-12-01 13:49:30 +01:00 |
|
|
|
98dae18430
|
update defaultcfg folder
|
2020-12-01 13:46:29 +01:00 |
|
|
|
64b6edab6f
|
Update 'README.md'
|
2020-12-01 13:32:50 +01:00 |
|
|
|
3bd144e6f4
|
Merge pull request 'Added the new logos, colors are WIP at the moment' (#270) from gaisser/fsfw:gaisser_logo into master
Reviewed-on: #270
|
2020-12-01 13:32:13 +01:00 |
|
|
|
4764f6ba54
|
Merge branch 'master' into gaisser_logo
|
2020-12-01 13:31:48 +01:00 |
|
|
|
378cbab64d
|
removed config includes
|
2020-12-01 13:25:00 +01:00 |
|
|
|
9086ee2ffe
|
added new tests
|
2020-12-01 13:24:29 +01:00 |
|
|
|
2e51b90161
|
Merge remote-tracking branch 'upstream/development' into mueller/LocalPoolRefactoring
|
2020-12-01 13:22:39 +01:00 |
|
|
|
59619825ac
|
Merge pull request 'Merge master into devel' (#271) from master into development
Reviewed-on: #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: #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: #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: #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: #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 |
|
|
|
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: #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: #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: #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 |
|
