Commit Graph

1534 Commits

Author SHA1 Message Date
5c45b823ad include fix 2020-12-21 13:52:41 +01:00
fc4da433d5 using winsock2 now 2020-12-21 13:49:42 +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
c8ddfe598b timemanager update 2020-12-15 23:00:30 +01:00
a411df18db deleted tpp files, replaced by source files 2020-12-15 22:52:29 +01:00
cd1fb88313 Merge remote-tracking branch 'upstream/development' into mueller/linux-update 2020-12-15 22:49:18 +01:00
4f33a1908a Merge branch 'development' into mueller/hk-service3 2020-12-15 22:44:24 +01:00
e39c4fe2a8 added hk service 3 2020-12-15 22:42:50 +01:00
e7da1e37c3 Merge branch 'development' into mueller/tmtcservices-update 2020-12-15 15:57:09 +01:00
356bd2717e Merge pull request 'event update' (#308) from KSat/fsfw:mueller/event-update into development
Reviewed-on: fsfw/fsfw#308
2020-12-15 15:56:47 +01:00
82a83a50ee change log update 2020-12-15 15:39:33 +01:00
72c54d59fa fsfw config 2020-12-15 15:32:56 +01:00
175db9e6fc Merge branch 'development' into mueller/event-update 2020-12-15 15:20:29 +01:00
5ba1932076 Merge pull request 'task convergence' (#307) from KSat/fsfw:mueller/tasks-update into development
Reviewed-on: fsfw/fsfw#307
2020-12-15 15:20:15 +01:00
703d2590ff update csb 2020-12-15 15:20:08 +01:00
9dabdf4b56 Merge branch 'development' into mueller/tasks-update 2020-12-15 15:19:38 +01:00
a343baa813 Merge pull request 'Subsystem Update' (#306) from KSat/fsfw:mueller/subsyste-update into development
Reviewed-on: fsfw/fsfw#306
2020-12-15 15:16:58 +01:00
eb5ac573a9 Merge branch 'mueller/tmtcservices-update' of https://egit.irs.uni-stuttgart.de/KSat/fsfw into mueller/tmtcservices-update 2020-12-15 15:16:51 +01:00
fcce61aee0 Merge remote-tracking branch 'upstream/development' into mueller/tmtcservices-update 2020-12-15 15:16:45 +01:00
4e4ffeb608 Merge branch 'development' into mueller/tmtcservices-update 2020-12-15 15:16:29 +01:00
103d8b8c6a fixed timeslot task IF 2020-12-15 15:12:31 +01:00
4c152e9fd8 subsystem doc upodate 2020-12-15 15:07:41 +01:00
a57af5852d made check sequence 2020-12-15 15:04:07 +01:00
2c92fa64bc Merge branch 'development' into mueller/subsyste-update 2020-12-15 14:44:19 +01:00
d85686fd8d Merge pull request 'FreeRTOS update' (#305) from KSat/fsfw:mueller/FreeRTOS into development
Reviewed-on: fsfw/fsfw#305
2020-12-15 14:44:08 +01:00
534805957c Merge branch 'development' into mueller/FreeRTOS 2020-12-15 14:42:31 +01:00
4e6aa3128b Merge pull request 'type update' (#304) from KSat/fsfw:mueller/type into development
Reviewed-on: fsfw/fsfw#304
2020-12-15 14:42:16 +01:00
f733a85a9c type update 2020-12-15 14:41:33 +01:00
335c75ba5b Merge branch 'development' into mueller/type 2020-12-15 14:31:27 +01:00
c53920f5ac Merge pull request 'RMAP folder convergence' (#302) from KSat/fsfw:mueller/rmap-convergence into development
Reviewed-on: fsfw/fsfw#302
2020-12-15 14:31:13 +01:00
a6a95b7719 Merge branch 'development' into mueller/rmap-convergence 2020-12-15 14:30:01 +01:00