Commit Graph

1412 Commits

Author SHA1 Message Date
d8be07b4db Merge pull request 'Linux convergence' (#310) from KSat/fsfw:mueller/linux-update into development
Reviewed-on: fsfw/fsfw#310
2020-12-22 14:43:15 +01:00
1ad94bae7d Merge remote-tracking branch 'upstream/development' into mueller/timeman-update 2020-12-22 14:27:36 +01:00
8349e12e43 Merge branch 'development' into mueller/timeman-update 2020-12-22 15:14:08 +01:00
332a327777 Merge branch 'development' into mueller/timeman-update 2020-12-22 14:48:11 +01:00
9ac07368da changelog update 2020-12-22 14:26:42 +01:00
7934104cbb Merge branch 'mueller/tmtcservices-update' of https://egit.irs.uni-stuttgart.de/KSat/fsfw into mueller/tmtcservices-update 2020-12-22 14:19:22 +01:00
7075952a8b Merge branch 'development' into mueller/tmtcservices-update 2020-12-22 15:17:12 +01:00
d607332f8d removed comment 2020-12-22 14:19:13 +01:00
3b391d3380 deleted service types header 2020-12-22 14:15:21 +01:00
9b22a2f3ac Merge branch 'mueller/devicehandlers-update' of https://egit.irs.uni-stuttgart.de/KSat/fsfw into mueller/devicehandlers-update 2020-12-22 14:11:46 +01:00
6135c6b2df Merge branch 'development' into mueller/devicehandlers-update 2020-12-22 15:08:14 +01:00
9937842ded get transiition delay abstract 2020-12-22 14:11:36 +01:00
331d940852 Merge remote-tracking branch 'upstream/development' into mueller/tmtcservices-update 2020-12-22 14:07:33 +01:00
dda7b5ff6c Merge remote-tracking branch 'upstream/development' into mueller/tmtcservices-update 2020-12-22 14:06:13 +01:00
620ab01e38 Merge remote-tracking branch 'upstream/development' into mueller/ipc-update 2020-12-22 13:53:41 +01:00
0fec6172a1 Merge remote-tracking branch 'upstream/development' into mueller/unittest-update 2020-12-22 13:31:03 +01:00
4c41e36044 nullptr check added 2020-12-22 13:29:06 +01:00
6b1a8afe2b unittest update 2 2020-12-22 13:25:50 +01:00
820731de7b updated docs, added new doc folder 2020-12-22 13:23:19 +01:00
6f756a721c clearing HK messagei ncluded now 2020-12-22 13:05:59 +01:00
d53645e6ea Merge branch 'mueller/devicehandlers-update' of https://egit.irs.uni-stuttgart.de/KSat/fsfw into mueller/devicehandlers-update 2020-12-22 12:53:21 +01:00
9de2b054ef updated changelog 2020-12-22 12:53:03 +01:00
a53959affa Merge branch 'development' into mueller/devicehandlers-update 2020-12-22 12:49:49 +01:00
0a7aaffe6a Merge remote-tracking branch 'upstream/development' into mueller/defaultcfg-update 2020-12-22 12:47:33 +01:00
ca2d242adb defaultcfg update 2020-12-22 12:45:51 +01:00
b28bf35fc3 devicehandler updates 2020-12-22 12:44:55 +01:00
31b82975c7 typo fix 2020-12-21 19:51:34 +01:00
5317391f8a reverted change 2020-12-21 17:19:43 +01:00
1d080ba6cb clock update 2020-12-21 14:07:06 +01:00
5c45b823ad include fix 2020-12-21 13:52:41 +01:00
de183e6c65 removed comment 2020-12-20 17:01:22 +01:00
d8e5000d47 msvc tests 2020-12-20 15:32:03 +01:00
3540adf022 added warning flags 2020-12-20 13:21:12 +01:00
a0d5b23311 small improvement 2020-12-20 02:09:08 +01:00
ebe7f02fc4 better error handling 2020-12-20 01:56:21 +01:00
c64a9654ea xcompile update 2020-12-19 22:51:10 +01:00
d186b70d2e comment added 2020-12-19 18:41:28 +01:00
8ede00fdf1 small bugfixes 2020-12-19 18:38:02 +01:00
b8e703ca83 linked against OS 2020-12-19 13:04:16 +01:00
be20978998 better path determination 2020-12-19 12:10:29 +01:00
e030d7ed97 correct interface and private includes 2020-12-19 02:29:22 +01:00
c0099481a1 added freertos cmakelists 2020-12-19 00:21:08 +01:00
62b5c19063 small fix 2020-12-17 20:18:16 +01:00
ac40b1c966 cmake list formatting 2020-12-17 11:46:50 +01:00
74c49e1481 Merge branch 'development' into mueller/master 2020-12-16 14:05:29 +01:00
07814abf3a Merge branch 'development' into mueller/datapoollocal-long-name 2020-12-16 14:03:23 +01:00
086cbe1e39 Merge remote-tracking branch 'upstream/development' into development 2020-12-16 12:00:59 +01:00
f128a1dc3d made datalinklayer optional 2020-12-15 23:44:43 +01:00
c48f1c8ee6 Merge branch 'development' into mueller/cmake-fixes 2020-12-15 23:05:32 +01:00
ea289be29e Merge branch 'development' into mueller/timeman-update 2020-12-15 23:03:03 +01:00