fsfw/fsfw
fsfw
/
fsfw
10
3
Fork 6
Code Issues 31 Pull Requests 4 Releases 10 Wiki Activity
1,243 Commits 27 Branches 22 Tags 31 MiB
Commit Graph

1243 Commits

Author SHA1 Message Date
Robin Müller 715386e366 clened up a bit 2020-12-13 22:12:57 +01:00
Steffen Gaisser 3c316218f7 Merge pull request 'Enhanced Controller Base' (#276) from KSat/fsfw:mueller/enhanced-controller into development 
Reviewed-on: #276
 2020-12-10 17:25:25 +01:00
Steffen Gaisser d61c25f2d2 Merge branch 'development' into mueller/enhanced-controller 2020-12-10 17:25:10 +01:00
Steffen Gaisser 60ee66ec36 Merge pull request 'CMake Init' (#298) from mueller/cmake-init into development 
Reviewed-on: #298
 2020-12-10 17:23:21 +01:00
Steffen Gaisser 03cc343527 Merge branch 'development' into mueller/cmake-init 2020-12-10 17:23:09 +01:00
Robin Müller 0489c7a42d Merge remote-tracking branch 'upstream/development' into mueller/enhanced-controller 2020-12-10 17:23:07 +01:00
Steffen Gaisser 000129172a Merge pull request 'device handler uses local pools now' (#299) from KSat/fsfw:mueller/DeviceHandler-LocalPools into development 
Reviewed-on: #299
 2020-12-10 17:22:55 +01:00
Steffen Gaisser 45b02083c9 Merge branch 'development' into mueller/DeviceHandler-LocalPools 2020-12-10 17:22:44 +01:00
Steffen Gaisser 5577eb893f Merge pull request 'Local Pool Refactoring' (#275) from KSat/fsfw:mueller/LocalPoolRefactoring into development 
Reviewed-on: #275
 2020-12-10 17:21:26 +01:00
Robin Müller 0cf9f334cc Merge branch 'mueller/DeviceHandler-LocalPools' of https://egit.irs.uni-stuttgart.de/KSat/fsfw into mueller/DeviceHandler-LocalPools 2020-12-10 17:18:58 +01:00
Robin Müller 7986584d17 updated comment 2020-12-10 17:18:46 +01:00
Robin Müller 5cf4f4e839 Merge remote-tracking branch 'upstream/development' into mueller/enhanced-controller 2020-12-10 17:14:15 +01:00
Robin Müller 9c59079e94 Merge remote-tracking branch 'upstream/development' into mueller/LocalPoolRefactoring 2020-12-10 17:12:01 +01:00
Robin Müller 8ae13a189d Merge remote-tracking branch 'upstream/development' into mueller/enhanced-controller 2020-12-10 17:11:01 +01:00
Steffen Gaisser b8f4cfe953 Merge branch 'development' into mueller/DeviceHandler-LocalPools 2020-12-10 17:10:45 +01:00
Steffen Gaisser 2c7936cecd Merge pull request 'Parameter Improvements' (#250) from KSat/fsfw:mueller/parameter-convergence into development 
Reviewed-on: #250
 2020-12-10 17:09:55 +01:00
Robin Müller 804155e951 Merge remote-tracking branch 'upstream/development' into mueller/LocalPoolRefactoring 2020-12-10 17:09:41 +01:00
Robin Müller a2823835dd explicit cast added 2020-12-10 17:05:41 +01:00
Robin Müller 4964ba0246 Merge remote-tracking branch 'upstream/development' into mueller/parameter-convergence 2020-12-10 17:02:07 +01:00
Robin Müller 2569080425 Merge remote-tracking branch 'upstream/development' into mueller/parameter-convergence 2020-12-10 17:01:07 +01:00
Steffen Gaisser 3fd18f9c58 Merge branch 'development' into mueller/DeviceHandler-LocalPools 2020-12-10 17:00:51 +01:00
Steffen Gaisser c99ef61c77 Merge pull request 'added new interface for file systems' (#287) from KSat/fsfw:feature/has-file-system-if-init into development 
Reviewed-on: #287
 2020-12-10 17:00:37 +01:00
Steffen Gaisser 616a073bb0 Merge branch 'development' into feature/has-file-system-if-init 2020-12-10 17:00:08 +01:00
Steffen Gaisser 18f90ef2fc Merge pull request 'power update' (#295) from KSat/fsfw:mueller/power-update into development 
Reviewed-on: #295
 2020-12-10 16:59:52 +01:00
Robin Müller 413e008d35 Merge remote-tracking branch 'upstream/development' into feature/has-file-system-if-init 2020-12-10 16:59:44 +01:00
Steffen Gaisser 9813e65dda Merge branch 'development' into mueller/power-update 2020-12-10 16:59:43 +01:00
Robin Müller 50ad2c0380 resolved merge conflicts 2020-12-10 16:57:43 +01:00
Steffen Gaisser f0380e4acc Merge branch 'development' into mueller/DeviceHandler-LocalPools 2020-12-10 16:57:24 +01:00
Steffen Gaisser 9fe2fc4cae Merge pull request 'new internal error reporter using local pools' (#292) from KSat/fsfw:mueller/internal-error-rprtr-update into development 
Reviewed-on: #292
 2020-12-10 16:55:06 +01:00
Robin Müller 67a8b031d0 Merge remote-tracking branch 'upstream/development' into mueller/LocalPoolRefactoring 2020-12-10 16:54:22 +01:00
Steffen Gaisser 0120ec29fd Merge branch 'development' into mueller/internal-error-rprtr-update 2020-12-10 16:53:45 +01:00
Steffen Gaisser 7d3641d42e Merge pull request 'thermal update' (#296) from KSat/fsfw:mueller/thermal-update into development 
Reviewed-on: #296
 2020-12-10 16:53:30 +01:00
Steffen Gaisser 65f411ace2 Merge branch 'development' into mueller/thermal-update 2020-12-10 16:53:16 +01:00
Robin Müller cbdf56e62b Merge remote-tracking branch 'upstream/development' into mueller/enhanced-controller 2020-12-10 16:52:44 +01:00
Robin Müller 5628d16197 Merge remote-tracking branch 'upstream/development' into feature/has-file-system-if-init 2020-12-10 16:51:42 +01:00
Robin Müller d7ca1df85b Merge remote-tracking branch 'upstream/development' into mueller/internal-error-rprtr-update 2020-12-10 16:50:14 +01:00
Robin Müller b1012b7cef Merge remote-tracking branch 'upstream/development' into mueller/power-update 2020-12-10 16:46:39 +01:00
Steffen Gaisser 03e4504815 Merge pull request 'some minor changes' (#291) from KSat/fsfw:mueller/datalinklayer-convergence into development 
Reviewed-on: #291
 2020-12-10 16:45:21 +01:00
Steffen Gaisser 80531e73c9 Merge branch 'development' into mueller/datalinklayer-convergence 2020-12-10 16:45:14 +01:00
Steffen Gaisser 3dafdc9071 Merge pull request 'controller base update' (#290) from KSat/fsfw:mueller/controller-update into development 
Reviewed-on: #290
 2020-12-10 16:42:45 +01:00
Steffen Gaisser d412e4ff5d Merge branch 'development' into mueller/controller-update 2020-12-10 16:42:30 +01:00
Robin Müller be9913f262 themral module update 2020-12-10 16:40:22 +01:00
Robin Müller f81c9d7ecc resolved merge conflicts 2020-12-10 16:36:09 +01:00
Robin Müller 0a5099e293 deleted file which was renamed 2020-12-10 16:34:25 +01:00
Robin Müller ff62ab8427 removed core component 2020-12-10 16:32:52 +01:00
Robin Müller 14e254141c Merge remote-tracking branch 'upstream/development' into mueller/thermal-update 2020-12-10 16:30:21 +01:00
Steffen Gaisser 14ecce084e Merge branch 'development' into mueller/parameter-convergence 2020-12-10 16:24:19 +01:00
Steffen Gaisser 4fbebcb019 Merge pull request 'monitoring update' (#294) from KSat/fsfw:mueller/monitoring-update into development 
Reviewed-on: #294
 2020-12-10 16:24:00 +01:00
Steffen Gaisser 96a9ee9fc4 Merge branch 'development' into mueller/monitoring-update 2020-12-10 16:18:34 +01:00
Steffen Gaisser a0a2752fd0 Merge branch 'development' into mueller/cmake-init 2020-12-09 10:07:22 +01:00