Commit Graph

1115 Commits

Author SHA1 Message Date
d412e4ff5d Merge branch 'development' into mueller/controller-update 2020-12-10 16:42:30 +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
2514082af7 Merge remote-tracking branch 'upstream/development' into mueller/monitoring-update 2020-12-08 15:46:25 +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
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
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
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
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
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
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
e6143eb0d8 Merge branch 'development' into mueller/monitoring-update 2020-12-05 11:51:04 +01:00
cb73e507b5 Merge branch 'development' into mueller/make-event-update 2020-12-05 11:46:39 +01:00
32eec9dfda Merge pull request 'OSAL MessageQueue Hotfix' (#297) from mueller/osal-mq-hotfix into development
Reviewed-on: fsfw/fsfw#297
2020-12-05 11:43:13 +01:00
c8f4bdd09a Merge branch 'development' into mueller/host-osal-atomic 2020-12-05 10:48:59 +01:00
6766abc0fa changelog update 2020-12-05 10:41:37 +01:00
c0e9c22f34 hotfix for message queue 2020-12-05 10:40:53 +01:00
983556b3b3 evil bug fixed 2020-12-05 01:21:04 +01:00
778f524714 Merge branch 'development' into mueller/monitoring-update 2020-12-03 18:26:23 +01:00
ec3c83bcc1 monitoring update 2020-12-03 18:24:51 +01:00
9781105ad0 moved catch factory again 2020-12-03 14:50:28 +01:00
03aacea4dd fixed unittest 2020-12-03 14:44:11 +01:00
ffcbc11351 Merge branch 'development' into mueller/controller-update 2020-12-03 13:16:25 +01:00
795ff585f8 controller base update 2020-12-03 13:14:30 +01:00
464988ca61 update 2020-12-03 13:00:04 +01:00
0cf65af506 Merge branch 'development' into mueller/newLocalDataPools 2020-12-03 12:58:30 +01:00
2deb7037b0 todo added 2020-12-02 01:07:40 +01:00
558220643e small form improvements 2020-12-02 01:01:31 +01:00