Commit Graph

2968 Commits

Author SHA1 Message Date
27d03dc17f upstream cmakelists f iles taken over 2020-12-22 16:21:17 +01:00
f905a753e2 upstream unittest folder adapted 2020-12-22 16:20:24 +01:00
41dc9ce6c6 cmake lists form upstream taken over 2020-12-22 16:19:30 +01:00
707bb9dd5d serviceinterface taken over 2020-12-22 16:18:50 +01:00
2e1ad41da7 power and pus upstream taken over 2020-12-22 16:18:12 +01:00
f6e7e232f5 parameter upstream taken over 2020-12-22 16:17:15 +01:00
e674b9248a better error handling 2020-12-22 16:15:40 +01:00
c174c9ecb8 osal taken over 2020-12-22 16:15:18 +01:00
571a64c42a time stamper ID added 2020-12-22 16:10:53 +01:00
e052a9694f upstream stuff 2020-12-22 16:10:13 +01:00
c603bcc91c some upstream stuff taken over 2020-12-22 16:08:24 +01:00
f21f43754b taken over upstream defaultcfg 2020-12-22 16:06:46 +01:00
7b98b0d5dd txt is md now 2020-12-22 16:04:39 +01:00
df7a2322bf timemanager update 2020-12-22 16:03:56 +01:00
8f88032110 taken over upstream .mk file 2020-12-22 16:00:30 +01:00
a73cd37e52 taken over changelog 2020-12-22 15:59:46 +01:00
75a0df4cd9 tm storage update 2020-12-22 15:59:28 +01:00
09161f22d0 updated tm storage 2020-12-22 15:58:52 +01:00
021b9b8c50 improvements 2020-12-22 15:57:43 +01:00
83458c851e Merge pull request 'timemanager update' (#315) from KSat/fsfw:mueller/timeman-update into development
Reviewed-on: fsfw/fsfw#315
2020-12-22 15:50:28 +01:00
48a89d59d6 Merge branch 'mueller/timeman-update' of https://egit.irs.uni-stuttgart.de/KSat/fsfw into mueller/timeman-update 2020-12-22 15:49:39 +01:00
958db291e8 now it compiles 2020-12-22 15:49:31 +01:00
c8ca680d5f Merge branch 'development' into mueller/timeman-update 2020-12-22 15:40:14 +01:00
d2a9b769eb Merge pull request 'tmtcservices update' (#309) from KSat/fsfw:mueller/tmtcservices-update into development
Reviewed-on: fsfw/fsfw#309
2020-12-22 15:39:07 +01:00
329cd8862a Merge branch 'development' into mueller/tmtcservices-update 2020-12-22 15:37:22 +01:00
fe26fc4824 Merge branch 'development' into mueller/timeman-update 2020-12-22 15:36:48 +01:00
ddcdfb3403 Merge pull request 'Fixed file ending of devicehanlder remake' (#326) from gaisser/fsfw:development into development
Reviewed-on: fsfw/fsfw#326
2020-12-22 15:36:33 +01:00
822cc0306c Fixed file ending of devicehanlder remake 2020-12-22 15:35:23 +01:00
483cec191b Merge pull request 'updated docs, added new doc folder' (#325) from KSat/fsfw:mueller/doc-update into development
Reviewed-on: fsfw/fsfw#325
2020-12-22 15:31:50 +01:00
5a4f453aaa Merge branch 'mueller/timeman-update' of https://egit.irs.uni-stuttgart.de/KSat/fsfw into mueller/timeman-update 2020-12-22 15:30:03 +01:00
ab9965cb81 clock corrected 2020-12-22 15:29:42 +01:00
afad130918 Merge branch 'development' into mueller/doc-update 2020-12-22 15:29:05 +01:00
7f3bdb6082 Merge pull request 'devicehandler updates' (#320) from KSat/fsfw:mueller/devicehandlers-update into development
Reviewed-on: fsfw/fsfw#320
2020-12-22 15:28:46 +01:00
117b29e413 Merge branch 'development' into mueller/devicehandlers-update 2020-12-22 15:28:38 +01:00
0e1eac4f14 Merge pull request 'HOST CMake Improvements' (#318) from mueller/host-cmake-improvements into development
Reviewed-on: fsfw/fsfw#318
2020-12-22 15:22:57 +01:00
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