|
|
0f6d878d86
|
update
|
2020-12-14 20:48:41 +01:00 |
|
|
|
57853ba566
|
event update
|
2020-12-14 20:22:59 +01:00 |
|
|
|
e06b15cb9c
|
Merge pull request 'fixed includes' (#303) from KSat/fsfw:mueller/int-unittest-fixes into development
Reviewed-on: fsfw/fsfw#303
|
2020-12-14 13:16:27 +01:00 |
|
|
|
3f3c2481ad
|
Merge branch 'development' into mueller/int-unittest-fixes
|
2020-12-14 13:16:09 +01:00 |
|
|
|
bd4ca743f5
|
Merge pull request 'Hotfixes for development branch' (#301) from hotfix/deviceHandlerThermalSet into development
Reviewed-on: fsfw/fsfw#301
|
2020-12-14 13:15:49 +01:00 |
|
|
|
720e3baa90
|
fixed includes
|
2020-12-14 10:48:39 +01:00 |
|
|
|
bc6936dddd
|
indentation corrected (again)
|
2020-12-12 18:35:58 +01:00 |
|
|
|
d0d6247753
|
and now it compiles
|
2020-12-12 00:01:36 +01:00 |
|
|
|
101babd863
|
indentation consistent now
|
2020-12-11 23:53:29 +01:00 |
|
|
|
f9d5403204
|
added device handler thermalset
|
2020-12-11 23:50:00 +01:00 |
|
|
|
3c316218f7
|
Merge pull request 'Enhanced Controller Base' (#276) from KSat/fsfw:mueller/enhanced-controller into development
Reviewed-on: fsfw/fsfw#276
|
2020-12-10 17:25:25 +01:00 |
|
|
|
d61c25f2d2
|
Merge branch 'development' into mueller/enhanced-controller
|
2020-12-10 17:25:10 +01:00 |
|
|
|
60ee66ec36
|
Merge pull request 'CMake Init' (#298) from mueller/cmake-init into development
Reviewed-on: fsfw/fsfw#298
|
2020-12-10 17:23:21 +01:00 |
|
|
|
03cc343527
|
Merge branch 'development' into mueller/cmake-init
|
2020-12-10 17:23:09 +01:00 |
|
|
|
0489c7a42d
|
Merge remote-tracking branch 'upstream/development' into mueller/enhanced-controller
|
2020-12-10 17:23:07 +01:00 |
|
|
|
000129172a
|
Merge pull request 'device handler uses local pools now' (#299) from KSat/fsfw:mueller/DeviceHandler-LocalPools into development
Reviewed-on: fsfw/fsfw#299
|
2020-12-10 17:22:55 +01:00 |
|
|
|
45b02083c9
|
Merge branch 'development' into mueller/DeviceHandler-LocalPools
|
2020-12-10 17:22:44 +01:00 |
|
|
|
5577eb893f
|
Merge pull request 'Local Pool Refactoring' (#275) from KSat/fsfw:mueller/LocalPoolRefactoring into development
Reviewed-on: fsfw/fsfw#275
|
2020-12-10 17:21:26 +01:00 |
|
|
|
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 |
|
|
|
7986584d17
|
updated comment
|
2020-12-10 17:18:46 +01:00 |
|
|
|
5cf4f4e839
|
Merge remote-tracking branch 'upstream/development' into mueller/enhanced-controller
|
2020-12-10 17:14:15 +01:00 |
|
|
|
9c59079e94
|
Merge remote-tracking branch 'upstream/development' into mueller/LocalPoolRefactoring
|
2020-12-10 17:12:01 +01:00 |
|
|
|
8ae13a189d
|
Merge remote-tracking branch 'upstream/development' into mueller/enhanced-controller
|
2020-12-10 17:11:01 +01:00 |
|
|
|
b8f4cfe953
|
Merge branch 'development' into mueller/DeviceHandler-LocalPools
|
2020-12-10 17:10:45 +01:00 |
|
|
|
2c7936cecd
|
Merge pull request 'Parameter Improvements' (#250) from KSat/fsfw:mueller/parameter-convergence into development
Reviewed-on: fsfw/fsfw#250
|
2020-12-10 17:09:55 +01:00 |
|
|
|
804155e951
|
Merge remote-tracking branch 'upstream/development' into mueller/LocalPoolRefactoring
|
2020-12-10 17:09:41 +01:00 |
|
|
|
a2823835dd
|
explicit cast added
|
2020-12-10 17:05:41 +01:00 |
|
|
|
4964ba0246
|
Merge remote-tracking branch 'upstream/development' into mueller/parameter-convergence
|
2020-12-10 17:02:07 +01:00 |
|
|
|
2569080425
|
Merge remote-tracking branch 'upstream/development' into mueller/parameter-convergence
|
2020-12-10 17:01:07 +01:00 |
|
|
|
3fd18f9c58
|
Merge branch 'development' into mueller/DeviceHandler-LocalPools
|
2020-12-10 17:00:51 +01:00 |
|
|
|
c99ef61c77
|
Merge pull request 'added new interface for file systems' (#287) from KSat/fsfw:feature/has-file-system-if-init into development
Reviewed-on: fsfw/fsfw#287
|
2020-12-10 17:00:37 +01:00 |
|
|
|
616a073bb0
|
Merge branch 'development' into feature/has-file-system-if-init
|
2020-12-10 17:00:08 +01:00 |
|
|
|
18f90ef2fc
|
Merge pull request 'power update' (#295) from KSat/fsfw:mueller/power-update into development
Reviewed-on: fsfw/fsfw#295
|
2020-12-10 16:59:52 +01:00 |
|
|
|
413e008d35
|
Merge remote-tracking branch 'upstream/development' into feature/has-file-system-if-init
|
2020-12-10 16:59:44 +01:00 |
|
|
|
9813e65dda
|
Merge branch 'development' into mueller/power-update
|
2020-12-10 16:59:43 +01:00 |
|
|
|
50ad2c0380
|
resolved merge conflicts
|
2020-12-10 16:57:43 +01:00 |
|
|
|
f0380e4acc
|
Merge branch 'development' into mueller/DeviceHandler-LocalPools
|
2020-12-10 16:57:24 +01:00 |
|
|
|
9fe2fc4cae
|
Merge pull request 'new internal error reporter using local pools' (#292) from KSat/fsfw:mueller/internal-error-rprtr-update into development
Reviewed-on: fsfw/fsfw#292
|
2020-12-10 16:55:06 +01:00 |
|
|
|
67a8b031d0
|
Merge remote-tracking branch 'upstream/development' into mueller/LocalPoolRefactoring
|
2020-12-10 16:54:22 +01:00 |
|
|
|
0120ec29fd
|
Merge branch 'development' into mueller/internal-error-rprtr-update
|
2020-12-10 16:53:45 +01:00 |
|
|
|
7d3641d42e
|
Merge pull request 'thermal update' (#296) from KSat/fsfw:mueller/thermal-update into development
Reviewed-on: fsfw/fsfw#296
|
2020-12-10 16:53:30 +01:00 |
|
|
|
65f411ace2
|
Merge branch 'development' into mueller/thermal-update
|
2020-12-10 16:53:16 +01:00 |
|
|
|
cbdf56e62b
|
Merge remote-tracking branch 'upstream/development' into mueller/enhanced-controller
|
2020-12-10 16:52:44 +01:00 |
|
|
|
5628d16197
|
Merge remote-tracking branch 'upstream/development' into feature/has-file-system-if-init
|
2020-12-10 16:51:42 +01:00 |
|
|
|
d7ca1df85b
|
Merge remote-tracking branch 'upstream/development' into mueller/internal-error-rprtr-update
|
2020-12-10 16:50:14 +01:00 |
|
|
|
b1012b7cef
|
Merge remote-tracking branch 'upstream/development' into mueller/power-update
|
2020-12-10 16:46:39 +01:00 |
|
|
|
03e4504815
|
Merge pull request 'some minor changes' (#291) from KSat/fsfw:mueller/datalinklayer-convergence into development
Reviewed-on: fsfw/fsfw#291
|
2020-12-10 16:45:21 +01:00 |
|
|
|
80531e73c9
|
Merge branch 'development' into mueller/datalinklayer-convergence
|
2020-12-10 16:45:14 +01:00 |
|
|
|
3dafdc9071
|
Merge pull request 'controller base update' (#290) from KSat/fsfw:mueller/controller-update into development
Reviewed-on: fsfw/fsfw#290
|
2020-12-10 16:42:45 +01:00 |
|
|
|
d412e4ff5d
|
Merge branch 'development' into mueller/controller-update
|
2020-12-10 16:42:30 +01:00 |
|
