Commit Graph

121 Commits

Author SHA1 Message Date
a851a19c59 Merge remote-tracking branch 'origin/hotfix/fsfwconfig' into mueller/master 2020-12-27 17:01:57 +01:00
90d1b601be more fixes 2020-12-27 17:00:38 +01:00
7af1cede48 Merge branch 'hotfix/fsfwconfig' into meier/pcduhandler 2020-12-27 16:57:55 +01:00
804871ee27 another fix 2020-12-27 16:56:51 +01:00
c9e1db9373 Merge branch 'hotfix/fsfwconfig' into meier/pcduhandler 2020-12-27 16:48:34 +01:00
2f91a1e881 another fix 2020-12-27 16:46:01 +01:00
4c5febe71f fsfwconfig fix 2020-12-27 16:45:37 +01:00
668d4c0674 fixed merge conflict 2020-12-27 15:32:16 +01:00
f70c767a1c rm3100 continued 2020-12-21 23:09:35 +01:00
7aa00093de p60dock, acu and pdu handler completed 2020-12-21 10:26:28 +01:00
468c36f82f working pdu2handler 2020-12-20 17:35:03 +01:00
8d951db169 issue with makefile 2020-12-20 13:31:44 +01:00
2fa60a00e7 c++ include used 2020-12-17 19:38:26 +01:00
97e6986fac tmtc update 2020-12-17 19:38:09 +01:00
1757c0fc37 updated obsw config 2020-12-14 22:52:53 +01:00
dd127fece8 hosted build working again 2020-12-14 22:03:57 +01:00
c82cdf96db read module cfg and read hk from p60 dock, intermediate state 2020-12-09 12:00:24 +01:00
87e121f016 parts of p60dock handler 2020-12-04 14:14:08 +01:00
473aa805c0 resolved merge conflicts 2020-11-25 16:17:16 +01:00
e85ed4eadb todo added 2020-11-20 18:32:06 +01:00
ae4305e22e restructured.. a bit 2020-11-20 18:10:39 +01:00