Commit Graph

615 Commits

Author SHA1 Message Date
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
5179954176 ploc handler wip 2021-03-29 14:37:52 +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
f600cf7f52 Merge branch 'meier/max13865pt1000Handler' of https://egit.irs.uni-stuttgart.de/eive/eive_obsw into meier/max13865pt1000Handler 2021-03-25 17:15:59 +01:00
d764b77a83 transition delay set to 5000 again 2021-03-25 17:15:54 +01: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
f5ef77facc Merge branch 'develop' of https://egit.irs.uni-stuttgart.de/eive/eive_obsw into develop 2021-03-21 17:35:28 +01:00
3fd5f72d00 IMTQHandler wip 2021-03-21 17:35:14 +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
8b82468652 Merge remote-tracking branch 'origin/develop' into mueller/fsfw-update 2021-03-19 15:54:12 +01:00
f8b2d237e8 fixed for fsfw update 2021-03-19 15:52:39 +01:00
3ad60aaabc Merge pull request 'Update package' (#25) from mueller/update-package into develop
Reviewed-on: eive/eive_obsw#25
2021-03-19 15:48:22 +01:00
4bc8b60a4a Merge branch 'mueller/master' of https://egit.irs.uni-stuttgart.de/eive/eive_obsw into mueller/master 2021-03-19 15:44:22 +01:00
918d40f8d1 fsfw update 2021-03-19 15:42:11 +01:00
97c5d01d2e IMTQ dipole actuation command, wip 2021-03-19 15:33:43 +01:00
9a55eb5508 IMQT wip 2021-03-17 11:14:48 +01:00
a2044d38bc rtd handler compiled 2021-03-13 14:42:30 +01:00
667c91d47e lowered transition times and changed pst to 1sec 2021-03-07 14:11:13 +01:00
191b75926a disabled acs board test 2021-03-07 14:07:17 +01:00
0db53f44c3 L3DG20H device handler tested 2021-03-07 14:06:29 +01:00
ab13fe15e4 doc added 2021-03-07 12:55:22 +01:00