Commit Graph

157 Commits

Author SHA1 Message Date
810eec0031 Merge branch 'hotfix/fsfwconfig' into meier/pcduhandler 2020-12-27 17:07:37 +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
afec8e7b2d tmtc p60dock 2020-12-27 15:27:16 +01:00
7604091dc6 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
6b4bc4a710 resolved merge conflict 2020-12-21 10:29:44 +01:00
17b4cee817 cspcomif removed commented lines 2020-12-21 10:27:29 +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
4f761a4ed0 added eclipse project and launch files 2020-12-17 19:50:11 +01:00
8a91401c52 deleted linux bsp arduino files 2020-12-17 19:47:21 +01:00
ad79ea46fd additional include for win compileation 2020-12-17 19:45:20 +01:00
a60726e91c updated gitignore file 2020-12-17 19:43:20 +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
9c216e1f42 tmtc update 2020-12-17 18:43:27 +01:00
c5790f59b8 tmtc update 2020-12-17 18:16:49 +01:00
aaf1b16006 tmtc points to new commit 2020-12-17 18:11:40 +01:00
3bacafcab7 tmtc update 2020-12-17 18:04:33 +01:00
9613b11f59 tmtc update 2020-12-17 18:04:04 +01:00
cc569bdec4 added new tmtc submodule 2020-12-17 17:47:40 +01:00
f0f4464ec9 removed tmtc submodule, will be replaced 2020-12-17 17:46:11 +01:00
1152e81a77 tmtc update 2020-12-17 17:45:42 +01:00
8ce6b44c31 fsfw update 2020-12-17 17:44:54 +01:00
cbe7ec69c9 tmtc p60dock 2020-12-17 15:49:11 +01:00
234e1a87cd Merge branch 'master' into meier_eiveobsw
update meier_eiveobsw
2020-12-17 14:28:22 +01:00
37b0249ef7 added tmtc 2020-12-17 14:27:49 +01:00
7b1308342c updated tmtc 2020-12-17 14:19:05 +01:00
771adb3743 p60 dock handler completed 2020-12-17 13:26:00 +01:00
28eb6333f5 ping test 2020-12-16 15:17:10 +01:00
3ae7675d7d fsfw update 2020-12-16 14:05:38 +01:00
b9151fbd6e successful change of endian swapping in p60dock param set 2020-12-16 11:02:49 +01:00
62747e83aa working parameter getting and setting of p60dock 2020-12-16 10:56:32 +01:00
1757c0fc37 updated obsw config 2020-12-14 22:52:53 +01:00
df992638cc stuff stored in local poo lnow 2020-12-14 22:50:15 +01:00
03c0d5ba8e Merge branch 'mueller/master' into develop 2020-12-14 22:30:35 +01:00
54c11f6503 formatting 2020-12-14 22:23:28 +01:00
269b8ee9b8 again, indentation.. 2020-12-14 22:21:47 +01:00
68d0fa95b0 indentation 2020-12-14 22:18:25 +01:00
949f6418a0 tmtc update 2020-12-14 22:15:07 +01:00
9acdd98b5a Merge branch 'master' into develop 2020-12-14 22:12:42 +01:00
77b81cf395 updated submodules 2020-12-14 22:09:18 +01:00
dd127fece8 hosted build working again 2020-12-14 22:03:57 +01:00
869bc657d9 fsfw update 2020-12-14 21:57:52 +01:00