esbo_ds/fsfw
3
0
Fork 0
forked from fsfw/fsfw
Code Issues Pull Requests Releases Wiki Activity
1,479 Commits 9 Branches 0 Tags 5.8 MiB
85764ba94c
Commit Graph

1479 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robin.Mueller
3149006603 Merge remote-tracking branch 'upstream/development' into mueller/LocalPoolRefactoring 2020-12-01 15:34:13 +01:00
Robin.Mueller
9c64ebcaec Merge remote-tracking branch 'upstream/development' into mueller/LocalPoolRefactoring 2020-12-01 15:33:23 +01:00
Robin Müller
a5134769ed Merge branch 'development' into mueller/newLocalDataPools 2020-12-01 15:27:41 +01:00
gaisser
409f2d1779 Merge pull request 'PUS Improvements' (#283) from KSat/fsfw:mueller/pus-improvements into development 
Reviewed-on: fsfw/fsfw#283
 2020-12-01 15:27:05 +01:00
Robin.Mueller
ea83261881 Merge branch 'mueller/pus-improvements' of https://egit.irs.uni-stuttgart.de/KSat/fsfw into mueller/pus-improvements 2020-12-01 15:26:14 +01:00
Robin.Mueller
0a016f391a changelog update 2020-12-01 15:26:06 +01:00
Robin Müller
0b94ed9612 Merge branch 'development' into mueller/pus-improvements 2020-12-01 15:23:50 +01:00
Robin.Mueller
6024c40334 Merge remote-tracking branch 'upstream/development' into mueller/DHB-update 2020-12-01 15:23:36 +01:00
Robin.Mueller
c9bfc0bbfd change log update 2020-12-01 15:22:18 +01:00
gaisser
052e6e86db Merge pull request 'Small tweaks' (#263) from fsfwexample/small-tweaks into development 
Reviewed-on: fsfw/fsfw#263
 2020-12-01 15:21:22 +01:00
Robin.Mueller
c9adcc742b Merge remote-tracking branch 'upstream/development' into mueller/enhanced-controller 2020-12-01 15:17:33 +01:00
Robin Müller
e097f1b5d6 Merge branch 'development' into fsfwexample/small-tweaks 2020-12-01 15:12:35 +01:00
Robin.Mueller
70b4ca8753 Merge branch 'development' into fsfwexample/small-tweaks 2020-12-01 15:12:18 +01:00
Robin.Mueller
221bf7e228 Merge remote-tracking branch 'upstream/development' into mueller/pus-improvements 2020-12-01 15:10:55 +01:00
Robin.Mueller
0b32d3dac8 change log update 2020-12-01 15:10:23 +01:00
gaisser
0217dda67b Merge pull request 'Added health service' (#282) from KSat/fsfw:mueller/healthservice into development 
Reviewed-on: fsfw/fsfw#282
 2020-12-01 15:09:56 +01:00
Robin.Mueller
506f5ff48b Merge branch 'mueller/pus-improvements' of https://egit.irs.uni-stuttgart.de/KSat/fsfw into mueller/pus-improvements 2020-12-01 15:07:19 +01:00
Robin.Mueller
a5b1fb0803 Merge remote-tracking branch 'upstream/development' into mueller/pus-improvements 2020-12-01 15:07:13 +01:00
Robin Müller
e80d799865 Merge branch 'master' into mueller/pus-improvements 2020-12-01 15:06:36 +01:00
Robin.Mueller
c72ba92247 health service update 2020-12-01 15:05:54 +01:00
Robin.Mueller
257e3e2db9 change log update 2020-12-01 15:03:49 +01:00
Robin Müller
1cb8532687 Merge branch 'development' into mueller/healthservice 2020-12-01 15:00:51 +01:00
Robin.Mueller
3e74c18d88 health servicd 2020-12-01 14:59:35 +01:00
Robin Müller
fb217c266b Merge branch 'development' into mueller/DHB-update 2020-12-01 14:53:36 +01:00
Robin Müller
406ad40da1 Merge branch 'development' into mueller/newLocalDataPools 2020-12-01 14:48:30 +01:00
gaisser
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
Robin Müller
72fc313817 Merge branch 'master' into mueller/newLocalDataPools 2020-12-01 14:46:29 +01:00
Robin.Mueller
45df446ab8 change log update 2020-12-01 14:44:03 +01:00
Robin.Mueller
802e24e293 change log update 2020-12-01 14:43:36 +01:00
Robin.Mueller
2f8bc046ad Merge branch 'development' of https://egit.irs.uni-stuttgart.de/fsfw/fsfw into development 2020-12-01 14:36:09 +01:00
gaisser
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
gaisser
da9658e2a1 Merge branch 'development' into master 2020-12-01 14:19:30 +01:00
Robin Müller
30f4348bff Merge branch 'master' into mueller/DHB-update 2020-12-01 14:11:35 +01:00
Robin Müller
a763893716 Merge branch 'master' into mueller/newLocalDataPools 2020-12-01 14:06:07 +01:00
Robin Müller
84010db691 Merge branch 'development' into mueller/parameter-convergence 2020-12-01 14:01:32 +01:00
Robin.Mueller
1f78496cd3 changelog update 2020-12-01 14:01:04 +01:00
Robin.Mueller
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
Robin.Mueller
5757f9d7a2 Merge remote-tracking branch 'upstream/development' into mueller/enhanced-controller 2020-12-01 13:59:41 +01:00
Robin Müller
74029a8483 Merge branch 'development' into mueller/enhanced-controller 2020-12-01 13:58:40 +01:00
Robin Müller
244e2b5f13 Merge branch 'master' into mueller/enhanced-controller 2020-12-01 13:55:18 +01:00
Robin Müller
24ba716ab2 Merge branch 'development' into mueller/LocalPoolRefactoring 2020-12-01 13:54:56 +01:00
Robin.Mueller
2930b2dd5a changelog update 2020-12-01 13:52:40 +01:00
Robin.Mueller
9ebf259a9e added back config 2020-12-01 13:50:33 +01:00
Robin.Mueller
b8cc1ccf7e Merge remote-tracking branch 'ksat/mueller/defaultcfg-update' into development 2020-12-01 13:49:30 +01:00
Robin.Mueller
98dae18430 update defaultcfg folder 2020-12-01 13:46:29 +01:00
gaisser
64b6edab6f Update 'README.md' 2020-12-01 13:32:50 +01:00
gaisser
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
gaisser
4764f6ba54 Merge branch 'master' into gaisser_logo 2020-12-01 13:31:48 +01:00
Robin.Mueller
378cbab64d removed config includes 2020-12-01 13:25:00 +01:00
Robin.Mueller
9086ee2ffe added new tests 2020-12-01 13:24:29 +01:00