Commit Graph

3334 Commits

Author SHA1 Message Date
d63c825c7f fixed merge conflicts 2021-04-26 17:50:36 +02:00
ebdc492ed1 self test wip 2021-04-26 14:25:23 +02:00
4c146b27c9 corrections in plocHandler, endianness 2021-04-26 11:28:19 +02:00
bbb50e4b4f imqt base functions 2021-04-26 07:56:02 +02:00
ec76222907 added wiretapping mode check in handleDeviceTm of PlocHandler 2021-04-25 15:54:48 +02:00
84a0935f63 get commanded dipole wip 2021-04-25 15:53:44 +02:00
a92e99c1c4 Merge branch 'develop' into meier/mgtHandler 2021-04-25 12:47:45 +02:00
56c0c551cb imqt wip 2021-04-25 12:47:41 +02:00
01abe0a4cb Merge pull request 'Update to v1.1.0' (#29) from develop into master
Reviewed-on: eive/eive_obsw#29
2021-04-25 12:43:23 +02:00
5dc39fb89e 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
dde50dcc96 Merge remote-tracking branch 'origin/develop' into mueller/mgt-rtd-pusc 2021-04-25 12:38:22 +02:00
c1ae98f1c8 obsw version update 2021-04-25 12:37:59 +02:00
daea8373b5 OBSW VERsion 2021-04-25 12:35:24 +02:00
e66f7f8202 Merge pull request 'Added FSFW HAL, some GPIO modules moved, FSFW update' (#27) from mueller/added-fsfw-hal into develop
Reviewed-on: eive/eive_obsw#27
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
2021-04-25 12:34:26 +02:00
57d457c43e Merge remote-tracking branch 'origin/meier/mgtHandler' into mueller/master 2021-04-25 12:25:55 +02:00
a49638724a tmtc update 2021-04-25 12:23:34 +02:00
e26df38609 fsfw update 2021-04-25 11:33:32 +02:00
2f766f012d tmtc update 2021-04-25 11:32:49 +02:00
2e4a8e1f94 tmtc and obj factory update 2021-04-25 11:32:21 +02:00
dec95f3217 added modgen submodule 2021-04-25 11:10:05 +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
e752e36480 fsfw update 2021-04-25 00:00:17 +02:00
fa192a353b everything seems to work now 2021-04-24 23:41:27 +02:00
9ab9b2fdeb added dns name 2021-04-24 23:17:45 +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
1ad89a0d16 updated fsfw and tmtc submodule 2021-04-24 22:51:04 +02:00
Martin Zietz
2c40bf86fb typo fix 2021-04-24 14:55:15 +02:00
Martin Zietz
ff11fa4904 ploc build for q7s 2021-04-24 14:22:22 +02:00
Martin Zietz
1fc9fc2751 mgt debugging 2021-04-24 13:01:49 +02:00
be77f86685 readme update 2021-04-24 12:46:08 +02:00
c54eccfe43 tc mem write and tc mem read implemented 2021-04-22 17:32:39 +02:00
a973d67d07 changes in plocDefinitions and plocHandler 2021-04-19 17:17:22 +02:00
cc075844fd wip 2021-04-16 18:59:48 +02:00
e2242ed526 plocHandler wip 2021-04-15 13:17:15 +02:00
7d1d41bfaa cs gyro 1 change 2021-04-12 10:22:13 +02:00
67cc196169 plocHandler wip 2021-04-12 10:16:59 +02:00
1b710fefe0 merged origin 2021-04-11 15:21:15 +02:00
697a601681 spi chipselects changes 2021-04-11 15:18:55 +02:00
3de0c72073 common versioning file 2021-04-11 12:25:23 +02:00
5909d4811b plocHandler wip 2021-04-11 12:04:13 +02:00
fc389b1944 Merge branch 'develop' into mueller/added-fsfw-hal 2021-04-10 22:49:14 +02:00
f2c7bfc942 resolved merge conflicts 2021-04-10 22:22:39 +02:00
43a3bcbf0a fsfw and fsfw_hal update 2021-04-10 21:59:19 +02:00
e43266490d non block almostr eworking 2021-04-02 16:44:25 +02:00
e98e04a940 minor formatting stuff 2021-04-02 15:26:57 +02:00
1935a15800 hal update 2021-04-02 15:16:41 +02:00