Commit Graph

114 Commits

Author SHA1 Message Date
49c7b3fd45 fixed conflicts 2021-06-21 18:01:23 +02:00
ba5832d30e fixed merge conflicts 2021-06-21 17:51:08 +02:00
0bcfafc76d
Merge remote-tracking branch 'origin/develop' into meier/ImtqHandler 2021-06-21 17:45:56 +02:00
4b4ac7902f applied changes according to pr comments 2021-06-21 17:25:13 +02:00
8d8bb41334 rw chip select decoding 2021-06-21 17:15:19 +02:00
89dc521e04
small q7s fix 2021-06-21 17:00:34 +02:00
2b25b3a605
q7s compiling 2021-06-21 16:46:49 +02:00
Martin Zietz
428ae97e0e reaction wheels testing 2021-06-21 14:46:46 +02:00
df9119241e RwHandler first commands 2021-06-21 09:50:26 +02:00
6d09006f1a
compiling again 2021-06-16 17:19:14 +02:00
d74f8860c8 fixed merge conflicts 2021-06-15 15:39:39 +02:00
89b11d725b IMTQ handler complete 2021-06-15 15:13:47 +02:00
46d49e130b fixed merge conflicts 2021-06-11 14:55:28 +02:00
3a024c9a30
object manager singleton now 2021-06-08 16:45:25 +02:00
Martin Zietz
427e36ed15 some fixes in IMTQ Handler 2021-06-06 14:11:05 +02:00
7dfaedd1d5 fixed merge conflicts and added threshold configuration to Max31865Handler 2021-06-02 10:25:35 +02:00
30eb733e82
small include fix 2021-05-27 14:09:07 +02:00
72939f569d compile failure 2021-05-27 14:04:33 +02:00
70e43960ae rtd update 2021-05-27 13:50:05 +02:00
546273d5b8
added core controller stub 2021-05-26 14:16:16 +02:00
6e86794541 small fix for q7s 2021-05-24 01:28:31 +02:00
5c591f628a
compiling with translation files 2021-05-17 19:49:29 +02:00
ed2c7a2ec1
q7s compiling 2021-05-17 16:53:06 +02:00
09e66ceb49 Merge branch 'develop' into meier/master 2021-05-17 13:56:54 +02:00
486ca36cbc uio implementation 2021-05-16 19:22:04 +02:00
33c229d08a all sus initialized 2021-05-13 13:17:12 +02:00
44bde15a46 solved merge conflicts 2021-05-12 17:01:11 +02:00
2d170a1f61 sus delay implementation 2021-05-12 13:06:56 +02:00
a6465c42ba save before changing to internally clocked mode 2021-05-09 18:18:27 +02:00
fab28904de working SUS in externally clocked mode 2021-05-09 16:48:55 +02:00
be29d0e71f some tries to get data from max1227 in externally clocked mode 2021-05-08 22:49:21 +02:00
1eb9909377 save before making change in spicomif 2021-05-07 18:48:42 +02:00
5ce0a63ad6 save before implementing SusHandler with chip select 2021-05-06 18:00:58 +02:00
fd9adee1ae rad sensor working 2021-05-03 12:49:14 +02:00
f708a67fa8 rad sensor change wip 2021-05-03 11:59:33 +02:00
b873831645 spi decoder callbacks wip 2021-05-02 13:48:39 +02:00
bd63550efd Merge branch 'meier/master' into develop 2021-04-29 17:45:43 +02:00
8509e15736 integrated gyro and mgm handler 2021-04-29 17:45:19 +02:00
619058bf25 tmtc merge conflict 2021-04-27 17:39:14 +02:00
ea2b1fbda4 basic structure for ILH PLOC control 2021-04-27 17:34:50 +02:00
ac0cd39f86 fixed merge conflicts 2021-04-26 17:50:36 +02:00
b042335ed1 Merge remote-tracking branch 'origin/meier/mgtHandler' into mueller/master 2021-04-25 12:25:55 +02:00
1472c3754d fsfw update 2021-04-25 11:33:32 +02:00
132acf0dd3 tmtc and obj factory update 2021-04-25 11:32:21 +02:00
c2a366e449 fixed merge conflicts 2021-04-25 10:51:59 +02:00
053e5f6e92 merged mueller master 2021-04-25 09:33:21 +02:00
076c00717c deleted faulty header includes 2021-04-25 09:24:41 +02:00
3902951a70 Merge branch 'mueller/master' into meier/mgtHandler 2021-04-25 00:06:04 +02:00
24a3b11d62 everything seems to work now 2021-04-24 23:41:27 +02:00
5cf2338f09 adaptions for new fsfw, using pus c now 2021-04-24 23:04:17 +02:00