Commit Graph

1416 Commits

Author SHA1 Message Date
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
c41d5b44d4 Merge branch 'development' into feature/has-file-system-if-init 2020-12-01 17:16:54 +01:00
09caeffbc7 added new interface for file systems 2020-12-01 17:15:25 +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
5eb2cbde0e some additional ionclude fixes 2020-12-01 17:08:03 +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
a0689320d1 more include fixes 2020-12-01 16:55:24 +01:00
c741ef3945 using relative includes now 2020-12-01 16:50:02 +01:00
8cddf8f509 more relative includes 2020-12-01 16:24:38 +01:00
29eb720071 introducing relative includes 2020-12-01 16:22:59 +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
07246b8974 Merge remote-tracking branch 'upstream/development' into mueller/DHB-update 2020-12-01 15:39:20 +01:00
2f3ed2d587 Merge remote-tracking branch 'upstream/development' into mueller/enhanced-controller 2020-12-01 15:36:12 +01:00
8c14cdfbd8 changelog update 2020-12-01 15:34:56 +01:00
3149006603 Merge remote-tracking branch 'upstream/development' into mueller/LocalPoolRefactoring 2020-12-01 15:34:13 +01:00
9c64ebcaec Merge remote-tracking branch 'upstream/development' into mueller/LocalPoolRefactoring 2020-12-01 15:33:23 +01:00
a5134769ed Merge branch 'development' into mueller/newLocalDataPools 2020-12-01 15:27:41 +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
6024c40334 Merge remote-tracking branch 'upstream/development' into mueller/DHB-update 2020-12-01 15:23:36 +01:00
c9bfc0bbfd change log update 2020-12-01 15:22:18 +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
c9adcc742b Merge remote-tracking branch 'upstream/development' into mueller/enhanced-controller 2020-12-01 15:17:33 +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