Commit Graph

157 Commits

Author SHA1 Message Date
cb01bcd97d Merge branch 'hotfix/fsfwconfig' into meier/pcduhandler 2020-12-27 17:07:37 +01:00
64972f1e43 more fixes 2020-12-27 17:00:38 +01:00
c3833c4a4c Merge branch 'hotfix/fsfwconfig' into meier/pcduhandler 2020-12-27 16:57:55 +01:00
3df7a6d23e another fix 2020-12-27 16:56:51 +01:00
86b36352dc Merge branch 'hotfix/fsfwconfig' into meier/pcduhandler 2020-12-27 16:48:34 +01:00
d359222b45 another fix 2020-12-27 16:46:01 +01:00
025337227c fsfwconfig fix 2020-12-27 16:45:37 +01:00
6dbafec3ad fixed merge conflict 2020-12-27 15:32:16 +01:00
4636a809f4 tmtc p60dock 2020-12-27 15:27:16 +01:00
fdf72f2fb3 Merge pull request 'TMTC updated' (#7) from mueller/tmtc-update into develop
Reviewed-on: eive/eive_obsw#7
2020-12-27 15:22:45 +01:00
dce00e9b53 resolved merge conflict 2020-12-21 10:29:44 +01:00
f330650b55 cspcomif removed commented lines 2020-12-21 10:27:29 +01:00
f573d15830 p60dock, acu and pdu handler completed 2020-12-21 10:26:28 +01:00
c9fbd2c048 working pdu2handler 2020-12-20 17:35:03 +01:00
23fd408e08 issue with makefile 2020-12-20 13:31:44 +01:00
208fd889f7 added eclipse project and launch files 2020-12-17 19:50:11 +01:00
39ff3f6c9b deleted linux bsp arduino files 2020-12-17 19:47:21 +01:00
26ffc5a470 additional include for win compileation 2020-12-17 19:45:20 +01:00
2450d2240e updated gitignore file 2020-12-17 19:43:20 +01:00
4e11eafd28 c++ include used 2020-12-17 19:38:26 +01:00
688ada173e tmtc update 2020-12-17 19:38:09 +01:00
c74405d4a8 tmtc update 2020-12-17 18:43:27 +01:00
90c06122f2 tmtc update 2020-12-17 18:16:49 +01:00
20fffd8b48 tmtc points to new commit 2020-12-17 18:11:40 +01:00
8d99dd6021 tmtc update 2020-12-17 18:04:33 +01:00
2881d4e7b2 tmtc update 2020-12-17 18:04:04 +01:00
a59432f41f added new tmtc submodule 2020-12-17 17:47:40 +01:00
b2a460d77f removed tmtc submodule, will be replaced 2020-12-17 17:46:11 +01:00
b19cfbfc2b tmtc update 2020-12-17 17:45:42 +01:00
0ebd9e2c43 fsfw update 2020-12-17 17:44:54 +01:00
a9f2c98f8d tmtc p60dock 2020-12-17 15:49:11 +01:00
d69e79ce07 Merge branch 'master' into meier_eiveobsw
update meier_eiveobsw
2020-12-17 14:28:22 +01:00
009850273b added tmtc 2020-12-17 14:27:49 +01:00
5f46e4ab6a updated tmtc 2020-12-17 14:19:05 +01:00
5fac6424ca p60 dock handler completed 2020-12-17 13:26:00 +01:00
32bd57d6d1 ping test 2020-12-16 15:17:10 +01:00
f022504fe4 fsfw update 2020-12-16 14:05:38 +01:00
380543756d successful change of endian swapping in p60dock param set 2020-12-16 11:02:49 +01:00
f778292d8e working parameter getting and setting of p60dock 2020-12-16 10:56:32 +01:00
e0c57f5d5d updated obsw config 2020-12-14 22:52:53 +01:00
48386a8e3f stuff stored in local poo lnow 2020-12-14 22:50:15 +01:00
29c07461b3 Merge branch 'mueller/master' into develop 2020-12-14 22:30:35 +01:00
ccf9770172 formatting 2020-12-14 22:23:28 +01:00
20911a15a2 again, indentation.. 2020-12-14 22:21:47 +01:00
512cf58579 indentation 2020-12-14 22:18:25 +01:00
7db8914c32 tmtc update 2020-12-14 22:15:07 +01:00
45283131e3 Merge branch 'master' into develop 2020-12-14 22:12:42 +01:00
e539d63293 updated submodules 2020-12-14 22:09:18 +01:00
fd75183590 hosted build working again 2020-12-14 22:03:57 +01:00
9b990f86fd fsfw update 2020-12-14 21:57:52 +01:00