|
|
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 |
|
|
|
d7839b46a5
|
Merge branch 'development' into mueller/make-event-update
|
2020-12-08 14:53:09 +01:00 |
|
|
|
4084df6214
|
Merge branch 'development' into mueller/parameter-convergence
|
2020-12-08 14:52:22 +01:00 |
|
|
|
6bda443181
|
Merge branch 'development' into mueller/DHB-update
|
2020-12-08 14:51:38 +01:00 |
|
|
|
f0b13427e6
|
changelog update
|
2020-12-08 14:51:36 +01:00 |
|
|
|
de0fd94b7f
|
Merge branch 'development' into mueller/enhanced-controller
|
2020-12-08 14:51:27 +01:00 |
|
|
|
31373e9605
|
Merge pull request 'Includes for unittest folder relative' (#285) from KSat/fsfw:mueller/unittest-fixes into development
Reviewed-on: fsfw/fsfw#285
|
2020-12-08 14:49:47 +01:00 |
|
|
|
1ecdf34df4
|
Merge branch 'development' into mueller/unittest-fixes
|
2020-12-08 14:49:20 +01:00 |
|
|
|
6f474daae0
|
Merge branch 'development' into mueller/controller-update
|
2020-12-08 14:46:18 +01:00 |
|
|
|
7d70cce4de
|
namepsace fix
|
2020-12-08 14:45:43 +01:00 |
|
|
|
fdbe5408b7
|
renamed namespaces
|
2020-12-08 14:43:44 +01:00 |
|
|
|
0c5050ceac
|
Merge branch 'development' into feature/has-file-system-if-init
|
2020-12-08 14:40:02 +01:00 |
|
|
|
7e9702c140
|
Merge branch 'mueller/make-event-update' of https://egit.irs.uni-stuttgart.de/KSat/fsfw into mueller/make-event-update
|
2020-12-08 14:20:08 +01:00 |
|
|
|
2a025de321
|
changelog update
|
2020-12-08 14:19:53 +01:00 |
|
|
|
66e902d75d
|
Merge branch 'development' into mueller/make-event-update
|
2020-12-08 14:17:56 +01:00 |
|
|
|
2e9e8331ea
|
Merge pull request 'op divider additional features' (#286) from KSat/fsfw:mueller/op-divider-update into development
Reviewed-on: fsfw/fsfw#286
|
2020-12-08 14:15:34 +01:00 |
|
|
|
2df41cad88
|
Merge branch 'development' into mueller/op-divider-update
|
2020-12-08 14:13:44 +01:00 |
|
|
|
6e852c6c05
|
Merge pull request 'Fix for ActionHelper unittests' (#293) from mueller/action-unittest-fix into development
Reviewed-on: fsfw/fsfw#293
|
2020-12-08 14:13:23 +01:00 |
|
|
|
db5c54fcfe
|
Merge branch 'development' into mueller/action-unittest-fix
|
2020-12-08 14:12:49 +01:00 |
|
|
|
aa3fe1e7f0
|
Merge pull request 'Host OSAL bugfixes' (#289) from mueller/host-osal-atomic into development
Reviewed-on: fsfw/fsfw#289
|
2020-12-08 14:10:31 +01:00 |
|
|
|
d93a8692e0
|
cmakelists update
|
2020-12-07 12:59:09 +01:00 |
|
|
|
489a2097b8
|
fix for host osal linux
|
2020-12-07 12:25:30 +01:00 |
|
|
|
c4ba243885
|
small bugfixes
|
2020-12-07 12:17:02 +01:00 |
|
|
|
33d4b57400
|
additional build option
|
2020-12-07 02:03:42 +01:00 |
|
|
|
5e234f1e23
|
cmake init, printChar tests
|
2020-12-07 01:40:10 +01:00 |
|
|
|
bb11bc5685
|
task if is set now
|
2020-12-05 17:11:34 +01:00 |
|
|
|
8b74fcff38
|
Merge branch 'development' into mueller/unittest-fixes
|
2020-12-05 11:51:54 +01:00 |
|
|
|
334815463b
|
Merge branch 'development' into mueller/power-update
|
2020-12-05 11:51:14 +01:00 |
|
|
|
e6143eb0d8
|
Merge branch 'development' into mueller/monitoring-update
|
2020-12-05 11:51:04 +01:00 |
|
|
|
90f851f9b3
|
Merge branch 'development' into mueller/parameter-convergence
|
2020-12-05 11:49:47 +01:00 |
|
|
|
b6f0049535
|
Merge branch 'development' into feature/has-file-system-if-init
|
2020-12-05 11:47:01 +01:00 |
|
|
|
cb73e507b5
|
Merge branch 'development' into mueller/make-event-update
|
2020-12-05 11:46:39 +01:00 |
|
|
|
50a1ee5691
|
Merge branch 'development' into mueller/thermal-update
|
2020-12-05 11:46:06 +01:00 |
|
