Commit Graph

111 Commits

Author SHA1 Message Date
bd7f15ebb6 fixed merge conflicts 2021-06-24 17:49:23 +02:00
865f152bc6 Merge remote-tracking branch 'origin/develop' into meier/ImtqHandler 2021-06-21 17:45:56 +02:00
72f7d6c88f applied changes according to pr comments 2021-06-21 17:25:13 +02:00
257a1611d0 small q7s fix 2021-06-21 17:00:34 +02:00
d591c2f1c4 q7s compiling 2021-06-21 16:46:49 +02:00
bed7f0e2d6 compiling again 2021-06-16 17:19:14 +02:00
0913442804 fixed merge conflicts 2021-06-15 15:39:39 +02:00
5e7cdd9f7f IMTQ handler complete 2021-06-15 15:13:47 +02:00
61f3a3e1c6 fixed merge conflicts 2021-06-11 14:55:28 +02:00
b7e26be45e object manager singleton now 2021-06-08 16:45:25 +02:00
Martin Zietz
ddd33e5752 some fixes in IMTQ Handler 2021-06-06 14:11:05 +02:00
076c616496 fixed merge conflicts and added threshold configuration to Max31865Handler 2021-06-02 10:25:35 +02:00
a40310bb88 small include fix 2021-05-27 14:09:07 +02:00
6fa9b65345 compile failure 2021-05-27 14:04:33 +02:00
a7e71a7154 rtd update 2021-05-27 13:50:05 +02:00
6a1611686d fixed include names 2021-05-27 13:34:28 +02:00
d075495628 added core controller stub 2021-05-26 14:16:16 +02:00
260eb167f5 small fix for q7s 2021-05-24 01:28:31 +02:00
1d0a4bca94 compiling with translation files 2021-05-17 19:49:29 +02:00
d380e3106a q7s compiling 2021-05-17 16:53:06 +02:00
532fb3228a Merge branch 'develop' into meier/master 2021-05-17 13:56:54 +02:00
a39d47cff5 uio implementation 2021-05-16 19:22:04 +02:00
d46007ba67 all sus initialized 2021-05-13 13:17:12 +02:00
e337f97e62 solved merge conflicts 2021-05-12 17:01:11 +02:00
48af7ef0fb sus delay implementation 2021-05-12 13:06:56 +02:00
20eb5be102 save before changing to internally clocked mode 2021-05-09 18:18:27 +02:00
189bdb7c90 working SUS in externally clocked mode 2021-05-09 16:48:55 +02:00
6861cd399e some tries to get data from max1227 in externally clocked mode 2021-05-08 22:49:21 +02:00
f4eb5d81ba save before making change in spicomif 2021-05-07 18:48:42 +02:00
931c17e971 save before implementing SusHandler with chip select 2021-05-06 18:00:58 +02:00
ff4a156a45 rad sensor working 2021-05-03 12:49:14 +02:00
8d2993f88d rad sensor change wip 2021-05-03 11:59:33 +02:00
b708028c61 spi decoder callbacks wip 2021-05-02 13:48:39 +02:00
38d2864d7f Merge branch 'meier/master' into develop 2021-04-29 17:45:43 +02:00
34ad009707 integrated gyro and mgm handler 2021-04-29 17:45:19 +02:00
f43dbba8e2 tmtc merge conflict 2021-04-27 17:39:14 +02:00
0430579795 basic structure for ILH PLOC control 2021-04-27 17:34:50 +02:00
d63c825c7f fixed merge conflicts 2021-04-26 17:50:36 +02:00
57d457c43e Merge remote-tracking branch 'origin/meier/mgtHandler' into mueller/master 2021-04-25 12:25:55 +02:00
e26df38609 fsfw update 2021-04-25 11:33:32 +02:00
2e4a8e1f94 tmtc and obj factory update 2021-04-25 11:32:21 +02:00
1a45d54383 fixed merge conflicts 2021-04-25 10:51:59 +02:00
766c460629 merged mueller master 2021-04-25 09:33:21 +02:00
edfebc8e06 deleted faulty header includes 2021-04-25 09:24:41 +02:00
fbfb3a8b83 Merge branch 'mueller/master' into meier/mgtHandler 2021-04-25 00:06:04 +02:00
fa192a353b everything seems to work now 2021-04-24 23:41:27 +02:00
3befba560c adaptions for new fsfw, using pus c now 2021-04-24 23:04:17 +02:00
634ed99a54 issue with poolManager.subscribe in max handler 2021-04-24 22:55:26 +02:00
Martin Zietz
1fc9fc2751 mgt debugging 2021-04-24 13:01:49 +02:00
e2242ed526 plocHandler wip 2021-04-15 13:17:15 +02:00