Commit Graph

93 Commits

Author SHA1 Message Date
58c20e31cc fixed merge conflicts 2021-06-11 13:51:56 +02:00
7a4d6ee13a Merge branch 'master' into develop 2021-05-17 18:16:25 +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
e8f48480f5
passing through op code 2021-05-17 17:48:02 +02:00
acb48916cf
updated tmtccmd 2021-05-17 17:42:04 +02:00
a82e6b2e64
update tmtccmd 2021-05-17 16:01:53 +02:00
06750809cb ploc tests 2021-04-27 17:38:52 +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
e3342cf474 imtq service 8 reply, read command dipole 2021-04-26 14:56:51 +02:00
4d2b7a6150 get commanded dipole service 8 hook wip 2021-04-25 17:46:53 +02:00
574a3e9207 Merge pull request 'Update to v1.4' (#3) from develop into master
Reviewed-on: eive/eive_tmtc#3
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
2021-04-25 12:31:37 +02:00
986f88e290 tmtccmd update 2021-04-25 12:03:49 +02:00
3b5d92f908 pushed new version number 2021-04-25 11:15:02 +02:00
684ae7a9c4 Merge branch 'mueller/master' into develop 2021-04-25 11:11:12 +02:00
7cc06ef0e0 minor change 2021-04-24 23:17:36 +02:00
3c343f751f updated tmtccmd submodule 2021-04-24 22:50:35 +02:00
79e897b035 ploc tc mem write and tc mem read test 2021-04-24 13:27:57 +02:00
Martin Zietz
3e466f06ef turning on imqt channel 2021-04-18 18:52:47 +02:00
Martin Zietz
934b79a2f1 Merge branch 'develop' into meier/imtq 2021-04-18 16:36:53 +02:00
Martin Zietz
5fe23be649 Merge branch 'develop' of https://egit.irs.uni-stuttgart.de/eive/eive_tmtc into develop 2021-04-18 16:35:49 +02:00
Martin Zietz
85f5bf2e6e pdu channel definitions 2021-04-18 16:35:18 +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
e993d2d2ea Merge branch 'mueller/master' into develop 2021-04-10 23:00:46 +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
Martin Zietz
80ee42089e imtq wip 2021-03-25 17:53:05 +01:00
754edffeae include fixes 2021-03-23 14:24:04 +01:00
74c61842c8 minor fixes 2021-03-23 13:44:33 +01:00
19f5ba62de submodule update 2021-03-23 13:43:31 +01:00
10fa7658d0 Merge branch 'develop' of https://egit.irs.uni-stuttgart.de/eive/eive_tmtc into develop 2021-03-23 13:12:56 +01:00
52428e4e03 tmtccmd update 2021-03-23 13:12:41 +01:00
146cb52b66 merged new tmtc 2021-03-23 13:08:51 +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
4d9df1ba87 moved submodule to github 2021-03-19 16:00:57 +01:00
81cd88f521 syrlinks hk handler test 2021-03-01 12:14:04 +01:00
cf572c311c fixed merge conflicts 2021-02-27 13:42:41 +01:00