Commit Graph

3833 Commits

Author SHA1 Message Date
dcc111e4fa moved no comamnd and raw command to device handler IF 2020-12-23 20:17:10 +01:00
e94238762f Merge remote-tracking branch 'upstream/development' into development 2020-12-23 20:15:39 +01:00
ccbbef7778 Merge branch 'development' into mueller/master 2020-12-22 17:54:10 +01:00
bda9546f51 Merge branch 'development' into mueller/tmstorage 2020-12-22 17:35:26 +01:00
52d9a55d06 Merge pull request 'better error handling' (#329) from KSat/fsfw:mueller/osal-windows-tweak into development
Reviewed-on: fsfw/fsfw#329
2020-12-22 17:34:41 +01:00
c19b838657 Merge branch 'development' into mueller/osal-windows-tweak 2020-12-22 17:34:33 +01:00
f9e36d7268 Merge pull request 'include guards' (#330) from KSat/fsfw:mueller/tmtcpacket-tiny-tweak into development
Reviewed-on: fsfw/fsfw#330
2020-12-22 17:31:35 +01:00
0eff30e065 Merge branch 'development' into mueller/tmtcpacket-tiny-tweak 2020-12-22 17:31:25 +01:00
27fe235700 Merge branch 'development' into mueller/osal-windows-tweak 2020-12-22 17:30:42 +01:00
bc8c3da1b7 Merge branch 'development' into mueller/tmstorage 2020-12-22 17:30:27 +01:00
2706669011 Merge pull request 'time stamper ID added' (#328) from KSat/fsfw:mueller/fwObject-timestamper into development
Reviewed-on: fsfw/fsfw#328
2020-12-22 17:28:49 +01:00
ba1f8f7171 Merge branch 'development' into mueller/master 2020-12-22 16:38:41 +01:00
208ad7d479 fixed timeslot task doc 2020-12-22 16:24:52 +01:00
e55df691ff upstream subsystem taken over 2020-12-22 16:24:15 +01:00
f017e9c6d4 include guards 2020-12-22 16:22:11 +01:00
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