Commit Graph

1046 Commits

Author SHA1 Message Date
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
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
9781105ad0 moved catch factory again 2020-12-03 14:50:28 +01:00
03aacea4dd fixed unittest 2020-12-03 14:44:11 +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
7b742a2e67 warning removed from osal 2020-12-02 01:00:07 +01:00
8ad30d489a important bugfix for host osal 2020-12-02 00:58:13 +01:00
73d3defe9f error output improved 2020-12-02 00:32:07 +01:00
f5c384de14 some bugfixes 2020-12-02 00:27:53 +01:00
206d4b58b2 removed boolean var 2020-12-02 00:17:12 +01:00
a92f6c5d8e mutex bugfix for host 2020-12-02 00:05:54 +01:00
37196c8e3b atomic fix 2020-12-01 23:47:11 +01:00
d3711e2dc2 Merge branch 'development' into mueller/make-event-update 2020-12-01 17:46:30 +01:00
94b108e03d changelog update 2020-12-01 17:45:23 +01:00
606aac687b make event api change 2020-12-01 17:44:36 +01:00
ede099bdc9 Merge branch 'development' into mueller/op-divider-update 2020-12-01 17:10:02 +01:00
29e701d14d op divider additional features 2020-12-01 17:08:46 +01:00
51b9e0074b Revert "testcfg update"
This reverts commit 36b76fa07c.
2020-12-01 17:06:05 +01:00
36b76fa07c testcfg update 2020-12-01 17:04:33 +01:00
f0f7388c0d Merge pull request 'added 201 packet' (#284) from KSat/fsfw:mueller/service201-packets into development
Reviewed-on: fsfw/fsfw#284
2020-12-01 16:06:08 +01:00
b198a6c13c added packet 2020-12-01 16:04:40 +01:00
409f2d1779 Merge pull request 'PUS Improvements' (#283) from KSat/fsfw:mueller/pus-improvements into development
Reviewed-on: fsfw/fsfw#283
2020-12-01 15:27:05 +01:00
ea83261881 Merge branch 'mueller/pus-improvements' of https://egit.irs.uni-stuttgart.de/KSat/fsfw into mueller/pus-improvements 2020-12-01 15:26:14 +01:00
0a016f391a changelog update 2020-12-01 15:26:06 +01:00
0b94ed9612 Merge branch 'development' into mueller/pus-improvements 2020-12-01 15:23:50 +01:00
052e6e86db Merge pull request 'Small tweaks' (#263) from fsfwexample/small-tweaks into development
Reviewed-on: fsfw/fsfw#263
2020-12-01 15:21:22 +01:00
e097f1b5d6 Merge branch 'development' into fsfwexample/small-tweaks 2020-12-01 15:12:35 +01:00
70b4ca8753 Merge branch 'development' into fsfwexample/small-tweaks 2020-12-01 15:12:18 +01:00
221bf7e228 Merge remote-tracking branch 'upstream/development' into mueller/pus-improvements 2020-12-01 15:10:55 +01:00
0b32d3dac8 change log update 2020-12-01 15:10:23 +01:00
0217dda67b Merge pull request 'Added health service' (#282) from KSat/fsfw:mueller/healthservice into development
Reviewed-on: fsfw/fsfw#282
2020-12-01 15:09:56 +01:00
506f5ff48b Merge branch 'mueller/pus-improvements' of https://egit.irs.uni-stuttgart.de/KSat/fsfw into mueller/pus-improvements 2020-12-01 15:07:19 +01:00
a5b1fb0803 Merge remote-tracking branch 'upstream/development' into mueller/pus-improvements 2020-12-01 15:07:13 +01:00
e80d799865 Merge branch 'master' into mueller/pus-improvements 2020-12-01 15:06:36 +01:00
c72ba92247 health service update 2020-12-01 15:05:54 +01:00
257e3e2db9 change log update 2020-12-01 15:03:49 +01:00