Commit Graph

1243 Commits

Author SHA1 Message Date
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
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
bd972ae356 Merge branch 'development' into mueller/thermal-update 2020-12-03 18:33:50 +01:00
64cf0d0a70 thermal update 2020-12-03 18:32:32 +01:00
c70ed5004e Merge branch 'development' into mueller/power-update 2020-12-03 18:30:27 +01:00
9ba8ef1ae2 power update 2020-12-03 18:29:28 +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
ddcaee4aae Merge branch 'mueller/internal-error-rprtr-update' of https://egit.irs.uni-stuttgart.de/KSat/fsfw into mueller/internal-error-rprtr-update 2020-12-03 13:27:00 +01:00
c6db9944fd changelog update 2020-12-03 13:26:50 +01:00
c94f8a8ddb Merge branch 'development' into mueller/internal-error-rprtr-update 2020-12-03 13:24:01 +01:00
f7f062570e new internal error reporter using local pools 2020-12-03 13:21:44 +01:00
98f9896911 Merge branch 'development' into mueller/datalinklayer-convergence 2020-12-03 13:19:43 +01:00
5e092778ed some minor changes 2020-12-03 13:17:28 +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
3f9f062435 changelog update 2020-12-03 13:11:52 +01:00
74ba8b7664 changel og updated 2020-12-03 13:10:33 +01:00
0a80bf29b1 Merge branch 'development' into mueller/parameter-convergence 2020-12-03 13:05:12 +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
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
114c1d9061 Merge branch 'feature/has-file-system-if-init' of https://egit.irs.uni-stuttgart.de/KSat/fsfw into feature/has-file-system-if-init 2020-12-01 17:18:01 +01:00
f1c5f19213 changelog update 2020-12-01 17:17:53 +01:00