Commit Graph

474 Commits

Author SHA1 Message Date
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
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
9d40ddc3da added all max handler 2021-03-25 13:10:48 +01:00
0b4dac0e3d rtd handler improvements 2021-03-24 12:53:25 +01:00
27617106bb fixed q7s 2021-03-23 16:52:19 +01:00
3342b280c9 updated project files again 2021-03-23 16:47:35 +01:00
88d0f9fc0e using new fsfw_hal now 2021-03-23 16:45:07 +01:00
485f61041f integrating fsfw_hal 2021-03-23 16:15:31 +01:00
d4ac84abba added fsfw hal 2021-03-23 16:06:23 +01:00
2b10df9e7f updated tmtc submodule 2021-03-23 13:44:45 +01:00
11e24a295a fixed merge conflicts 2021-03-23 09:09:50 +01:00
8fedd2315f minor changes in object factory 2021-03-22 13:57:21 +01:00
Martin Zietz
88138af39d solved all merge conflicts 2021-03-22 13:09:06 +01:00
Martin Zietz
f01656df4c deleted polling sequence file 2021-03-22 12:47:45 +01:00
Martin Zietz
58b94642da added fsfw 2021-03-22 12:17:00 +01:00
5a3faf6c86 readem update 2021-03-20 16:09:11 +01:00
d01da07554 Merge branch 'mueller/master' into develop 2021-03-20 15:55:38 +01:00
c9fa2c4b82 updated fsfw and obj factory 2021-03-20 15:55:15 +01:00
7e6c59bb1b corrected project files for host build 2021-03-20 15:07:04 +01:00
49bb0518d9 submodule update 2021-03-20 15:00:47 +01:00
91ea410130 Merge pull request 'FSFW Update' (#26) from mueller/fsfw-update into develop
Reviewed-on: eive/eive_obsw#26
2021-03-19 16:13:02 +01:00