Commit Graph

30 Commits

Author SHA1 Message Date
c73c41b03a fixed merge conflicts 2021-01-08 10:05:36 +01:00
64c3aa5e9d tmp1075 handler, wip 2021-01-08 09:34:43 +01:00
35d6d47bd0 updated fsfw config 2021-01-07 20:41:33 +01:00
96ea535242 Merge remote-tracking branch 'origin/develop' into mueller/master 2020-12-29 12:37:03 +01:00
be82cd472e added rpi support 2020-12-29 01:26:22 +01:00
c1e9604977 added cmake support 2020-12-29 01:09:59 +01:00
647126863c fixed merge conflict 2020-12-28 11:16:58 +01:00
aa33d23563 added polling sequence table slot for PERFORM_OPERATION 2020-12-28 11:02:24 +01:00
cb01bcd97d Merge branch 'hotfix/fsfwconfig' into meier/pcduhandler 2020-12-27 17:07:37 +01:00
4737fc4f6e Merge remote-tracking branch 'origin/hotfix/fsfwconfig' into mueller/master 2020-12-27 17:01:57 +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
8ecd0ec551 rm3100 continued 2020-12-21 23:09:35 +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
4e11eafd28 c++ include used 2020-12-17 19:38:26 +01:00
688ada173e tmtc update 2020-12-17 19:38:09 +01:00
e0c57f5d5d updated obsw config 2020-12-14 22:52:53 +01:00
fd75183590 hosted build working again 2020-12-14 22:03:57 +01:00
ed77c97432 read module cfg and read hk from p60 dock, intermediate state 2020-12-09 12:00:24 +01:00
2f4421b904 parts of p60dock handler 2020-12-04 14:14:08 +01:00
77970418d8 resolved merge conflicts 2020-11-25 16:17:16 +01:00
243f7fb49c todo added 2020-11-20 18:32:06 +01:00
909706c529 restructured.. a bit 2020-11-20 18:10:39 +01:00