Commit Graph

2833 Commits

Author SHA1 Message Date
041aaf01db Merge branch 'development' into mueller/host-cmake-improvements 2020-12-22 15:21:34 +01:00
6663c69ee9 Merge pull request 'cmake fixes' (#314) from mueller/cmake-fixes into development
Reviewed-on: fsfw/fsfw#314
2020-12-22 15:18:58 +01:00
cb7a22c370 Merge branch 'development' into mueller/cmake-fixes 2020-12-22 15:18:47 +01:00
5941bd710a Merge pull request 'clearing HK message included now' (#322) from KSat/fsfw:mueller/ipc-update into development
Reviewed-on: fsfw/fsfw#322
2020-12-22 15:13:51 +01:00
631bbf70c2 Merge branch 'development' into mueller/ipc-update 2020-12-22 15:13:20 +01:00
85d6e02291 Merge pull request 'nullptr check added' (#324) from KSat/fsfw:mueller/datapool-update into development
Reviewed-on: fsfw/fsfw#324
2020-12-22 15:12:03 +01:00
3b59a50e9a Merge branch 'development' into mueller/datapool-update 2020-12-22 15:11:37 +01:00
4a154140f3 Merge pull request 'unittest update' (#323) from KSat/fsfw:mueller/unittest-update into development
Reviewed-on: fsfw/fsfw#323
2020-12-22 15:11:27 +01:00
b0fcb404b3 Merge branch 'development' into mueller/unittest-update 2020-12-22 15:11:02 +01:00
422a0f1ee0 Merge pull request 'defaultcfg update' (#319) from KSat/fsfw:mueller/defaultcfg-update into development
Reviewed-on: fsfw/fsfw#319
2020-12-22 15:05:36 +01:00
d396bab455 Merge branch 'development' into mueller/defaultcfg-update 2020-12-22 15:05:16 +01:00
11778c706c Merge pull request 'deleted tpp files, replaced by source files' (#313) from mueller/deleted-storagman-tpp into development
Reviewed-on: fsfw/fsfw#313
2020-12-22 15:05:01 +01:00
cf954ac8d1 Merge branch 'development' into mueller/deleted-storagman-tpp 2020-12-22 14:46:19 +01:00
5e315ce083 Merge pull request 'LocalPoolVar: using long name now' (#312) from KSat/fsfw:mueller/datapoollocal-long-name into development
Reviewed-on: fsfw/fsfw#312
2020-12-22 14:45:56 +01:00
49aa937968 Merge branch 'development' into mueller/datapoollocal-long-name 2020-12-22 14:45:24 +01:00
eb310a72ef Merge pull request 'added hk service 3' (#311) from KSat/fsfw:mueller/hk-service3 into development
Reviewed-on: fsfw/fsfw#311
2020-12-22 14:44:05 +01:00
dca5e1b51c Merge branch 'development' into mueller/hk-service3 2020-12-22 14:43:26 +01:00
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
7ba660a222 removed comment 2020-12-22 14:18:48 +01:00
947dfd69e9 service types.h delted 2020-12-22 14:16:33 +01:00
3b391d3380 deleted service types header 2020-12-22 14:15:21 +01:00
362578e982 transition delay abstract 2020-12-22 14:12:35 +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
8896752927 updated readme 2020-12-22 13:22:10 +01:00
632f319a2f updated readme 2020-12-22 13:19:00 +01:00
95a8dd418c added cmake lists 2020-12-22 13:29:58 +01:00
ee05a34c9e added gitmodules 2020-12-22 13:27:47 +01:00
5e8aff0603 unittest update 2020-12-22 13:25:00 +01:00
e41aba719c updated testcfg 2020-12-22 13:20:17 +01:00
b97b67d56e updating unittest folder 2020-12-22 13:19:07 +01:00
770336fff3 added ipc cmakelists 2020-12-22 13:06:35 +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