Commit Graph

3164 Commits

Author SHA1 Message Date
e80d799865 Merge branch 'master' into mueller/pus-improvements 2020-12-01 15:06:36 +01:00
c72ba92247 health service update 2020-12-01 15:05:54 +01:00
257e3e2db9 change log update 2020-12-01 15:03:49 +01:00
1cb8532687 Merge branch 'development' into mueller/healthservice 2020-12-01 15:00:51 +01:00
3e74c18d88 health servicd 2020-12-01 14:59:35 +01:00
fb217c266b Merge branch 'development' into mueller/DHB-update 2020-12-01 14:53:36 +01:00
406ad40da1 Merge branch 'development' into mueller/newLocalDataPools 2020-12-01 14:48:30 +01:00
708a47840b Merge pull request 'Defaultcfg folder update' (#274) from KSat/fsfw:mueller/defaultcfg-update into development
Reviewed-on: fsfw/fsfw#274
2020-12-01 14:46:36 +01:00
72fc313817 Merge branch 'master' into mueller/newLocalDataPools 2020-12-01 14:46:29 +01:00
45df446ab8 change log update 2020-12-01 14:44:03 +01:00
802e24e293 change log update 2020-12-01 14:43:36 +01:00
2f8bc046ad Merge branch 'development' of https://egit.irs.uni-stuttgart.de/fsfw/fsfw into development 2020-12-01 14:36:09 +01:00
ea8f73120d Merge pull request 'Merge current release of FSFW development' (#278) from master into development
Reviewed-on: fsfw/fsfw#278
2020-12-01 14:20:15 +01:00
da9658e2a1 Merge branch 'development' into master 2020-12-01 14:19:30 +01:00
30f4348bff Merge branch 'master' into mueller/DHB-update 2020-12-01 14:11:35 +01:00
a763893716 Merge branch 'master' into mueller/newLocalDataPools 2020-12-01 14:06:07 +01:00
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
e323c69f20 better name for preproc define 2020-12-01 13:36:30 +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: fsfw/fsfw#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
f357de21c9 updated testcfg 2020-12-01 13:23:51 +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: 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
ef2e07b389 added explicit type conversion operator 2020-11-30 17:03:14 +01:00
d1beb96c60 some more replacements 2020-11-30 16:30:20 +01:00
f108ae883c local pool replacement 2020-11-30 16:28:16 +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
f581b37fcf thermal module replacements 2020-11-30 16:25:09 +01:00
4bb9dd816e compiling again 2020-11-30 16:06:59 +01:00
f70ee7696a it compiles again 2020-11-30 15:30:56 +01:00
e7a96d5ad8 it doesnt work? comment it ! 2020-11-30 14:13:52 +01:00
25f08b8c1f started replacing local pool vars 2020-11-30 13:59:54 +01:00
b7945dfe60 added gp_id_t 2020-11-30 13:45:08 +01:00