Commit Graph

1182 Commits

Author SHA1 Message Date
8ae13a189d Merge remote-tracking branch 'upstream/development' into mueller/enhanced-controller 2020-12-10 17:11:01 +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
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
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
be9913f262 themral module update 2020-12-10 16:40:22 +01:00
f81c9d7ecc resolved merge conflicts 2020-12-10 16:36:09 +01:00
0a5099e293 deleted file which was renamed 2020-12-10 16:34:25 +01:00
ff62ab8427 removed core component 2020-12-10 16:32:52 +01:00
14e254141c Merge remote-tracking branch 'upstream/development' into mueller/thermal-update 2020-12-10 16:30:21 +01:00
4fbebcb019 Merge pull request 'monitoring update' (#294) from KSat/fsfw:mueller/monitoring-update into development
Reviewed-on: fsfw/fsfw#294
2020-12-10 16:24:00 +01:00
96a9ee9fc4 Merge branch 'development' into mueller/monitoring-update 2020-12-10 16:18:34 +01:00
faedd40665 Merge pull request 'DHB additional step for performOperation' (#281) from KSat/fsfw:mueller/DHB-update into development
Reviewed-on: fsfw/fsfw#281
2020-12-08 15:53:05 +01:00
7f40566031 include removed 2020-12-08 15:50:21 +01:00
a612e19e94 ndentation 2020-12-08 15:49:46 +01:00
81988e77d9 Merge remote-tracking branch 'upstream/development' into mueller/internal-error-rprtr-update 2020-12-08 15:48:41 +01:00
9891086e65 Merge branch 'development' into mueller/datalinklayer-convergence 2020-12-08 15:46:49 +01:00
2514082af7 Merge remote-tracking branch 'upstream/development' into mueller/monitoring-update 2020-12-08 15:46:25 +01:00
012fb6f314 Merge remote-tracking branch 'upstream/development' into feature/has-file-system-if-init 2020-12-08 15:45:09 +01:00
ac5446b2b1 removed hk switcher helper member 2020-12-08 15:43:58 +01:00
b0053c3b77 Merge remote-tracking branch 'upstream/development' into mueller/controller-update 2020-12-08 15:42:51 +01:00
38819d796c Merge remote-tracking branch 'upstream/development' into mueller/enhanced-controller 2020-12-08 15:40:43 +01:00
eb781ecc7a Merge remote-tracking branch 'upstream/development' into mueller/DHB-update 2020-12-08 15:36:16 +01:00
42dd641924 Merge remote-tracking branch 'upstream/development' into mueller/DHB-update 2020-12-08 15:34:51 +01:00
7ff772d9d6 Merge pull request 'Local Data Pool Init' (#280) from KSat/fsfw:mueller/newLocalDataPools into development
Reviewed-on: fsfw/fsfw#280
2020-12-08 15:34:30 +01:00
bd1137d089 replaced hardcoded value with NO_COMMAND 2020-12-08 15:33:32 +01:00
2b8a2c4f29 Merge branch 'development' into mueller/newLocalDataPools 2020-12-08 15:18:48 +01:00
ba52d54244 Merge remote-tracking branch 'upstream/development' into mueller/internal-error-rprtr-update 2020-12-08 15:17:25 +01:00
6064984671 Merge remote-tracking branch 'upstream/development' into mueller/internal-error-rprtr-update 2020-12-08 15:16:29 +01:00
3b0e5daeed Merge branch 'mueller/datalinklayer-convergence' of https://egit.irs.uni-stuttgart.de/KSat/fsfw into mueller/datalinklayer-convergence 2020-12-08 15:15:50 +01:00
8504bf3f42 Merge remote-tracking branch 'upstream/development' into mueller/datalinklayer-convergence 2020-12-08 15:15:42 +01:00
4a46349286 minor imrpovements 2020-12-08 15:14:39 +01:00
34dac6f312 Merge branch 'development' into mueller/datalinklayer-convergence 2020-12-08 15:11:32 +01:00
5e132de712 Merge pull request 'makeEvent API improved' (#288) from KSat/fsfw:mueller/make-event-update into development
Reviewed-on: fsfw/fsfw#288
2020-12-08 15:10:55 +01:00
913914ce93 Merge branch 'mueller/make-event-update' of https://egit.irs.uni-stuttgart.de/KSat/fsfw into mueller/make-event-update 2020-12-08 14:58:34 +01:00
6ee4ceeb65 deleted event.cpp source file 2020-12-08 14:58:24 +01:00