Commit Graph

498 Commits

Author SHA1 Message Date
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
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
1fc9fc2751 mgt debugging 2021-04-24 13:01:49 +02:00
7d1d41bfaa cs gyro 1 change 2021-04-12 10:22:13 +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
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
08351bcda2 added more spi test code, preprocessor defines
and various bugfixes
2021-04-02 15:14:08 +02:00
fca78108a2 added device handler 2021-04-02 13:25:37 +02:00
ce33a710e9 pushed stuff 2021-04-01 17:19:12 +02:00
5b2c53cfd4 small form improvements 2021-04-01 17:06:35 +02:00
1134505457 now its compiling 2021-04-01 16:33:30 +02:00
0ad380842e Merge branch 'meier/max13865pt1000Handler' into mueller/master 2021-04-01 16:22:25 +02:00
c3f97dde30 fixes 2021-04-01 16:21:24 +02:00
6f49031e92 some adaptions 2021-04-01 15:42:51 +02:00
fe4c8ad136 Merge branch 'mueller/master' into meier/max13865pt1000Handler 2021-04-01 15:34:28 +02:00
53dafa70c3 one missing zeros 2021-04-01 15:22:16 +02:00
330aba7ea5 compiling 2021-04-01 15:14:50 +02:00
Martin Zietz
ff62b75029 polling sequence table entries for acs devices 2021-04-01 15:32:43 +02:00
79a66cee6a added rpi acs board code to q7s 2021-04-01 14:06:56 +02:00
30df0904a0 updated default Q7S sysroot 2021-04-01 13:31:10 +02:00
a91c24a3a7 deleted folder which was moved 2021-04-01 11:07:56 +02:00
ed46e6f1bb moved i2c to fsfw_hal as well 2021-04-01 11:06:26 +02:00
c0bb934ddb moved spi code to fsfw_hal 2021-04-01 10:59:36 +02:00
853a728d4c updated host osal 2021-04-01 10:37:34 +02:00
4177f54f68 added unix path helper 2021-04-01 10:24:21 +02:00
a0b1fb874d Merge remote-tracking branch 'origin/mueller/added-fsfw-hal' into mueller/master 2021-04-01 10:14:01 +02:00
a1ed7ffb71 updated to new fsfw 2021-04-01 10:12:57 +02:00
0cca76750b Merge remote-tracking branch 'origin/develop' into mueller/master 2021-04-01 10:11:36 +02:00
f17261db0f fsfw update 2021-04-01 10:09:37 +02:00
Martin Zietz
dd5d6343fa Merge branch 'meier/mgtHandler' of https://egit.irs.uni-stuttgart.de/eive/eive_obsw into meier/mgtHandler 2021-03-29 16:54:22 +02:00
9cec3f4b1a fixes in imqt 2021-03-29 16:40:14 +02:00
7066c315f0 corrections ofr updated common udp code 2021-03-29 14:42:33 +02:00
c867fabb6e fsfw updated 2021-03-29 14:37:08 +02:00
79ef32fa1a added way to supply definesto cmake 2021-03-29 14:31:55 +02:00
Martin Zietz
9c0014d0f1 merged origin mgtHandler 2021-03-26 14:07:13 +01:00
Martin Zietz
5d6bf3d402 submodules add 2021-03-26 14:05:56 +01:00
34ef313ab0 imqt handler compiled 2021-03-26 13:55:32 +01:00
d953a9ff32 fixed merge conflicts 2021-03-26 12:30:24 +01:00
00f09afe41 imtq instantiation 2021-03-26 12:08:37 +01:00