Commit Graph

2361 Commits

Author SHA1 Message Date
20a44b4b67 Merge branch 'master' into develop 2021-06-21 17:41:46 +02:00
3927377e94
bumped revision 2021-06-21 17:36:37 +02:00
aaba7d5857
small fix 2021-06-21 17:33:22 +02:00
d241101d88
updated tmtc 2021-06-21 17:30:37 +02:00
0b9bbf6212
tmtccmd update 2021-06-21 17:21:18 +02:00
01b5ae8252 Merge branch 'mueller/master' into develop 2021-06-21 17:18:27 +02:00
8fc67c2665
tmtccmd update 2021-06-21 16:46:31 +02:00
4daddf7255
deleted tmtc_core folder 2021-06-15 17:12:05 +02:00
805470df6d commit tmtccmd 2021-06-15 15:39:14 +02:00
0e317a435a Merge branch 'develop' of https://egit.irs.uni-stuttgart.de/eive/eive_tmtc into develop 2021-06-15 15:23:57 +02:00
e4eed4602d imtq tests 2021-06-15 15:23:27 +02:00
6debacd946
tmtccmd update 2021-06-12 15:08:41 +02:00
24fbb26ac0
bumped version 2021-06-12 13:55:12 +02:00
208724f0a9
updated README 2021-06-12 13:54:08 +02:00
fe1e6a2877 Merge branch 'mueller/master' into meier/imtq 2021-06-12 13:50:26 +02:00
d413ec6d08 added imtq x axis self test 2021-06-12 13:49:25 +02:00
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
cc5e4459b4 Merge pull request 'Update to v1.5.0' (#4) from develop into master
Reviewed-on: eive/eive_tmtc#4
2021-05-17 18:16:40 +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