Commit Graph

2971 Commits

Author SHA1 Message Date
14a0573f3d one define now 2020-12-14 20:58:20 +01:00
b14c1c43cc small fix 2020-12-14 20:50:56 +01:00
2100ae34f2 event folder taken over 2020-12-14 20:49:17 +01:00
0f6d878d86 update 2020-12-14 20:48:41 +01:00
57853ba566 event update 2020-12-14 20:22:59 +01:00
a0e7584e84 tiny tweak 2020-12-14 20:19:23 +01:00
3bae575b5a Merge branch 'development' into mueller/subsyste-update 2020-12-14 13:16:44 +01:00
4d5186b6cd Merge branch 'development' into mueller/tasks-update 2020-12-14 13:16:36 +01:00
e06b15cb9c Merge pull request 'fixed includes' (#303) from KSat/fsfw:mueller/int-unittest-fixes into development
Reviewed-on: fsfw/fsfw#303
2020-12-14 13:16:27 +01:00
3f3c2481ad Merge branch 'development' into mueller/int-unittest-fixes 2020-12-14 13:16:09 +01:00
bd4ca743f5 Merge pull request 'Hotfixes for development branch' (#301) from hotfix/deviceHandlerThermalSet into development
Reviewed-on: fsfw/fsfw#301
2020-12-14 13:15:49 +01:00
81c00cd3dc Merge remote-tracking branch 'upstream/development' into development 2020-12-14 13:02:10 +01:00
d62e092be6 task convergence 2020-12-14 11:49:30 +01:00
a547fafa33 minor tweaks 2020-12-14 11:49:01 +01:00
3dd86039bb changes taken over 2020-12-14 11:43:32 +01:00
9d5ac16398 some more improvements 2020-12-14 11:43:08 +01:00
5eafd4f353 tiny format stuff 2020-12-14 11:42:02 +01:00
d3239b9064 tiny format stuff 2020-12-14 11:41:40 +01:00
89de4cc321 changes and tweaks taken over 2020-12-14 11:40:26 +01:00
e97787cceb some more tweaks 2020-12-14 11:39:19 +01:00
252bfa5c39 subsystem convergence 2020-12-14 11:35:45 +01:00
7eeba71619 subsystem update 2020-12-14 11:34:54 +01:00
5c6916a078 small tweaks 2020-12-14 11:23:23 +01:00
313d898aef small update 2020-12-14 11:22:44 +01:00
620c9c6ae1 taken over freeRTOS changes 2020-12-14 11:19:05 +01:00
94fa917202 some tweaks 2020-12-14 11:17:22 +01:00
dc72fa938d type update 2020-12-14 11:10:22 +01:00
073cd4f5e1 small tweaks 2020-12-14 11:09:53 +01:00
7ace117c42 added cmakelistst 2020-12-14 11:06:09 +01:00
0ccd266f51 internal unittests fixed 2020-12-14 10:49:00 +01:00
720e3baa90 fixed includes 2020-12-14 10:48:39 +01:00
f161a94113 taken over upstream fixes 2020-12-14 10:44:48 +01:00
692aa087d8 taken over cleaned up branch 2020-12-13 22:13:22 +01:00
715386e366 clened up a bit 2020-12-13 22:12:57 +01:00
3f77fab2d9 taken over cmake lists 2020-12-13 22:01:38 +01:00
7c390c07ee taken over unnittest folder from upstream 2020-12-13 21:58:54 +01:00
0b056720ba taken over master 2020-12-13 21:57:06 +01:00
d944e25d4a taken over upstream changes 2020-12-13 21:54:46 +01:00
f69113b4d5 taken over upstream change in ipc 2020-12-13 21:53:37 +01:00
0e42ba062d notice taken over 2020-12-13 21:51:46 +01:00
62e16b13d3 Merge branch 'mueller/master' of https://egit.irs.uni-stuttgart.de/KSat/fsfw into mueller/master 2020-12-13 21:51:09 +01:00
b7dbdb072d taken over upstream changes 2020-12-13 21:50:33 +01:00
bc6936dddd indentation corrected (again) 2020-12-12 18:35:58 +01:00
5927d944de cmake fixes 2020-12-12 18:32:24 +01:00
d0d6247753 and now it compiles 2020-12-12 00:01:36 +01:00
101babd863 indentation consistent now 2020-12-11 23:53:29 +01:00
f9d5403204 added device handler thermalset 2020-12-11 23:50:00 +01:00
bb7ebf4b27 removed glob pool 2020-12-10 17:29:23 +01:00
3c316218f7 Merge pull request 'Enhanced Controller Base' (#276) from KSat/fsfw:mueller/enhanced-controller into development
Reviewed-on: fsfw/fsfw#276
2020-12-10 17:25:25 +01:00
d61c25f2d2 Merge branch 'development' into mueller/enhanced-controller 2020-12-10 17:25:10 +01:00