Commit Graph

684 Commits

Author SHA1 Message Date
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
76c31a4d13 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
b042335ed1 Merge remote-tracking branch 'origin/meier/mgtHandler' into mueller/master 2021-04-25 12:25:55 +02:00
9fd7943e2e tmtc update 2021-04-25 12:23:34 +02:00
1472c3754d fsfw update 2021-04-25 11:33:32 +02:00
4580a4ef37 tmtc update 2021-04-25 11:32:49 +02:00
132acf0dd3 tmtc and obj factory update 2021-04-25 11:32:21 +02:00
4ec2454542 added modgen submodule 2021-04-25 11:10:05 +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
b3054baccf fsfw update 2021-04-25 00:00:17 +02:00
24a3b11d62 everything seems to work now 2021-04-24 23:41:27 +02:00
962b267454 added dns name 2021-04-24 23:17:45 +02:00
5cf2338f09 adaptions for new fsfw, using pus c now 2021-04-24 23:04:17 +02:00
1e1446c40e issue with poolManager.subscribe in max handler 2021-04-24 22:55:26 +02:00
c276c11e21 updated fsfw and tmtc submodule 2021-04-24 22:51:04 +02:00
Martin Zietz
cbbc501039 typo fix 2021-04-24 14:55:15 +02:00
Martin Zietz
e4a715e24c ploc build for q7s 2021-04-24 14:22:22 +02:00
Martin Zietz
fa2c9344d6 mgt debugging 2021-04-24 13:01:49 +02:00
2e28016281 readme update 2021-04-24 12:46:08 +02:00
a0a5c4c8aa tc mem write and tc mem read implemented 2021-04-22 17:32:39 +02:00
7c28b2a0bc changes in plocDefinitions and plocHandler 2021-04-19 17:17:22 +02:00
b0e8a8624a wip 2021-04-16 18:59:48 +02:00
0916ca87d9 plocHandler wip 2021-04-15 13:17:15 +02:00
0c892982ae cs gyro 1 change 2021-04-12 10:22:13 +02:00
5d4c2bd521 plocHandler wip 2021-04-12 10:16:59 +02:00
c6171a6c2a merged origin 2021-04-11 15:21:15 +02:00
97e5eb7319 spi chipselects changes 2021-04-11 15:18:55 +02:00
0b9ae5e4ec common versioning file 2021-04-11 12:25:23 +02:00
400f60c7be plocHandler wip 2021-04-11 12:04:13 +02:00
0677852cfc Merge branch 'develop' into mueller/added-fsfw-hal 2021-04-10 22:49:14 +02:00
3046b62ddb resolved merge conflicts 2021-04-10 22:22:39 +02:00
c4a6a680c8 fsfw and fsfw_hal update 2021-04-10 21:59:19 +02:00
5fbaca9b9f non block almostr eworking 2021-04-02 16:44:25 +02:00
14b69ed7e9 minor formatting stuff 2021-04-02 15:26:57 +02:00
1647b8a98e hal update 2021-04-02 15:16:41 +02:00