Commit Graph

515 Commits

Author SHA1 Message Date
c4b348c97f 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
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
fa2c9344d6 mgt debugging 2021-04-24 13:01:49 +02:00
0c892982ae cs gyro 1 change 2021-04-12 10:22:13 +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
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
437f4573b5 added more spi test code, preprocessor defines
and various bugfixes
2021-04-02 15:14:08 +02:00
2dbe893197 added device handler 2021-04-02 13:25:37 +02:00
ffa11ce253 pushed stuff 2021-04-01 17:19:12 +02:00
62834bebcc small form improvements 2021-04-01 17:06:35 +02:00
e79a8e0926 now its compiling 2021-04-01 16:33:30 +02:00
bcc2f89f12 Merge branch 'meier/max13865pt1000Handler' into mueller/master 2021-04-01 16:22:25 +02:00
aa606b031a fixes 2021-04-01 16:21:24 +02:00
e1454db4b9 some adaptions 2021-04-01 15:42:51 +02:00
248c381ade Merge branch 'mueller/master' into meier/max13865pt1000Handler 2021-04-01 15:34:28 +02:00
29d8c8c0c8 one missing zeros 2021-04-01 15:22:16 +02:00
af48c6528d compiling 2021-04-01 15:14:50 +02:00
Martin Zietz
0027a43315 polling sequence table entries for acs devices 2021-04-01 15:32:43 +02:00
12be9bf7e4 added rpi acs board code to q7s 2021-04-01 14:06:56 +02:00
e86106615a updated default Q7S sysroot 2021-04-01 13:31:10 +02:00
1a4830aea9 deleted folder which was moved 2021-04-01 11:07:56 +02:00
fb7abbc82b moved i2c to fsfw_hal as well 2021-04-01 11:06:26 +02:00