Commit Graph

291 Commits

Author SHA1 Message Date
fc87e36c2e
this should fix srv3 issues 2021-06-12 13:48:31 +02:00
58c20e31cc fixed merge conflicts 2021-06-11 13:51:56 +02:00
74c9da8504
bumped minor version 2021-05-17 18:14:52 +02:00
16ec4a1914
merge origin development 2021-05-17 18:08:43 +02:00
b4dcf2296c Merge branch 'mueller/master' into develop 2021-05-17 18:02:44 +02:00
877b9bb5c1
smaller changes 2021-05-17 18:01:55 +02:00
eb9e93fbee
updated GUI 2021-05-17 17:59:24 +02:00
acb48916cf
updated tmtccmd 2021-05-17 17:42:04 +02:00
e23bc11608 fixed merge conflicts 2021-04-26 15:01:22 +02:00
bc77e6ae76 Merge branch 'develop' into meier/imtq 2021-04-26 14:57:59 +02:00
fa58c8e2c3 Merge branch 'develop' into meier/plocHandler 2021-04-26 14:57:41 +02:00
4d2b7a6150 get commanded dipole service 8 hook wip 2021-04-25 17:46:53 +02:00
3b5d92f908 pushed new version number 2021-04-25 11:15:02 +02:00
Martin Zietz
934b79a2f1 Merge branch 'develop' into meier/imtq 2021-04-18 16:36:53 +02:00
7310513805 Merge branch 'develop' into meier/plocHandler 2021-04-11 11:09:22 +02:00
aa52ed79ea plocHandler test wip 2021-04-11 11:08:52 +02:00
2e84c822c8 bumped version numbr 2021-04-10 23:01:01 +02:00
8703aeea55 updated tmtc 2021-04-10 22:59:51 +02:00
f40b70f66e imqt handler test 2021-03-26 13:56:02 +01:00
754edffeae include fixes 2021-03-23 14:24:04 +01:00
74c61842c8 minor fixes 2021-03-23 13:44:33 +01:00
5f1803b663 updated to new tmtccmd 2021-03-20 15:00:36 +01:00
4d737bfc12 some renaming 2021-03-19 18:03:41 +01:00
6e3bef7ac5 fixes 2021-03-19 18:01:17 +01:00
dc999188c0 some fixes (some pep related) 2021-03-19 17:50:09 +01:00
04920feea5 newline 2021-03-19 17:43:18 +01:00
e06bb91f08 minor corrections 2021-03-19 17:42:36 +01:00
27c1da4f77 moved EIVE to new tmtc commander 2021-03-19 17:39:52 +01:00
90c45ea0c7 adapted object IDs 2021-02-23 22:07:21 +01:00
56f3f9c3f1 Merge branch 'develop' into meier/heaterhandler 2021-02-14 10:09:13 +01:00
a0280c880b updated version tag for first release 2021-02-09 12:53:44 +01:00
cf5ca54fbe service 8 reply interpretation 2021-02-09 12:35:10 +01:00
b4868b78e1 resolved merge conflicts 2021-02-06 16:41:06 +01:00
8a071954af heater wip 2021-02-06 16:35:53 +01:00
a84d125b4b updated to new tmtc core 2021-02-03 14:14:54 +01:00
39e8ff7134 tmp1075 temperature sensor 2021-01-30 11:20:34 +01:00
6b840eff43 tmp1075 tests 2021-01-10 11:42:06 +01:00
0c334f615f integrated pcu, acu and p60 dock tests 2020-12-29 11:29:03 +01:00
264a4a791e updated globals 2020-12-17 18:09:00 +01:00
8a4f5b4400 some small bugfixes 2020-12-17 18:00:32 +01:00
ff5fb74fb2 initiated tmtc commander 2020-12-17 17:50:00 +01:00