Commit Graph

621 Commits

Author SHA1 Message Date
9e6a7c6faf Merge pull request 'meier/master' (#33) from meier/master into develop
Reviewed-on: eive/eive_obsw#33
Reviewed-by: Robin Müller <robin.mueller.m@gmail.com>
2021-05-17 14:59:46 +02:00
09e66ceb49 Merge branch 'develop' into meier/master 2021-05-17 13:56:54 +02:00
8508957f5b added etl and tmtc 2021-05-17 13:54:12 +02:00
b0c2606e6a updated fsfw_hal 2021-05-13 13:42:47 +02:00
5b2e226bdc updated submodules 2021-05-13 13:35:24 +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
65d0c1fabf Sus handler complete 2021-05-12 16:38:20 +02:00
2d170a1f61 sus delay implementation 2021-05-12 13:06:56 +02:00
e1e69539ca changed SusHandler MAX1227 to internal clock mode 2021-05-10 11:13:39 +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
261f16f15b write setup byte and conversions 2021-05-09 14:46:42 +02:00
98387a6d24 this works with q7s and new sus 2021-05-09 14:39:56 +02:00
950eab2373 this works with the old SUS 2021-05-09 12:09:39 +02:00
eeb8167cdc this worked with the prototype SUS 2021-05-09 10:06:36 +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
60a9358648 correct board output now 2021-05-05 22:51:29 +02:00
4b2d641a8a fsfw update 2021-05-05 22:48:35 +02:00
0250d53e57 fixes for bbb build 2021-05-05 22:47:24 +02:00
5ace0dd61f beagle bone build working 2021-05-05 22:43:17 +02:00
ad05d61a2e added BBB support 2021-05-05 20:25:52 +02:00
3c6ec68faa rad sensor working 2021-05-03 13:35:16 +02:00
fd9adee1ae rad sensor working 2021-05-03 12:49:14 +02:00
31b4246bca another try to read out the adc 2021-05-03 12:05:19 +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
f2caa84098 Merge branch 'meier/master' into meier/max1227Handler 2021-04-30 09:04:20 +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
ed6eea82c5 max1227 wip 2021-04-29 10:40:11 +02:00
619058bf25 tmtc merge conflict 2021-04-27 17:39:14 +02:00
2473b2ef21 Merge branch 'develop' of https://egit.irs.uni-stuttgart.de/eive/eive_obsw into develop 2021-04-27 17:36:05 +02:00
ea2b1fbda4 basic structure for ILH PLOC control 2021-04-27 17:34:50 +02:00
255313d165 added PLOC sequence count. Not tested yet 2021-04-27 12:18:04 +02:00
bf1f2ae1b5 fixed conflicts 2021-04-26 17:59:26 +02:00
ac0cd39f86 fixed merge conflicts 2021-04-26 17:50:36 +02:00
4e8a6b65ec self test wip 2021-04-26 14:25:23 +02:00
cdde3e29a8 corrections in plocHandler, endianness 2021-04-26 11:28:19 +02:00
ad48d5888d imqt base functions 2021-04-26 07:56:02 +02:00
986ee97721 added wiretapping mode check in handleDeviceTm of PlocHandler 2021-04-25 15:54:48 +02:00
191f4b6d0c get commanded dipole wip 2021-04-25 15:53:44 +02:00
70ff6a06f7 Merge branch 'develop' into meier/mgtHandler 2021-04-25 12:47:45 +02:00
d877887826 imqt wip 2021-04-25 12:47:41 +02:00
c19cdaaa16 Merge pull request 'Update v1.2 - MGT - RTD - PUSC' (#28) from mueller/mgt-rtd-pusc into develop
Reviewed-on: eive/eive_obsw#28
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
2021-04-25 12:40:38 +02:00
89dbe078c9 Merge remote-tracking branch 'origin/develop' into mueller/mgt-rtd-pusc 2021-04-25 12:38:22 +02:00
38ea091a7f obsw version update 2021-04-25 12:37:59 +02:00
e1c7ed419f OBSW VERsion 2021-04-25 12:35:24 +02:00