Commit Graph

78 Commits

Author SHA1 Message Date
Robin Müller 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
Robin Müller 7a4d6ee13a Merge branch 'master' into develop 2021-05-17 18:16:25 +02:00
Robin Müller 74c9da8504
bumped minor version 2021-05-17 18:14:52 +02:00
Robin Müller 16ec4a1914
merge origin development 2021-05-17 18:08:43 +02:00
Robin Müller b4dcf2296c Merge branch 'mueller/master' into develop 2021-05-17 18:02:44 +02:00
Robin Müller 877b9bb5c1
smaller changes 2021-05-17 18:01:55 +02:00
Robin Müller eb9e93fbee
updated GUI 2021-05-17 17:59:24 +02:00
Robin Müller e8f48480f5
passing through op code 2021-05-17 17:48:02 +02:00
Robin Müller acb48916cf
updated tmtccmd 2021-05-17 17:42:04 +02:00
Robin Müller a82e6b2e64
update tmtccmd 2021-05-17 16:01:53 +02:00
Jakob Meier 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
Jakob Meier 986f88e290 tmtccmd update 2021-04-25 12:03:49 +02:00
Robin Müller 3b5d92f908 pushed new version number 2021-04-25 11:15:02 +02:00
Robin Müller 684ae7a9c4 Merge branch 'mueller/master' into develop 2021-04-25 11:11:12 +02:00
Robin Müller 7cc06ef0e0 minor change 2021-04-24 23:17:36 +02:00
Robin Müller 3c343f751f updated tmtccmd submodule 2021-04-24 22:50:35 +02:00
Robin Müller 2e84c822c8 bumped version numbr 2021-04-10 23:01:01 +02:00
Robin Müller e993d2d2ea Merge branch 'mueller/master' into develop 2021-04-10 23:00:46 +02:00
Robin Müller 8703aeea55 updated tmtc 2021-04-10 22:59:51 +02:00
Jakob Meier 754edffeae include fixes 2021-03-23 14:24:04 +01:00
Robin Müller 74c61842c8 minor fixes 2021-03-23 13:44:33 +01:00
Robin Müller 19f5ba62de submodule update 2021-03-23 13:43:31 +01:00
Jakob Meier 10fa7658d0 Merge branch 'develop' of https://egit.irs.uni-stuttgart.de/eive/eive_tmtc into develop 2021-03-23 13:12:56 +01:00
Robin Müller 52428e4e03 tmtccmd update 2021-03-23 13:12:41 +01:00
Jakob Meier 146cb52b66 merged new tmtc 2021-03-23 13:08:51 +01:00
Robin Müller 5f1803b663 updated to new tmtccmd 2021-03-20 15:00:36 +01:00
Robin Müller 4d737bfc12 some renaming 2021-03-19 18:03:41 +01:00
Robin Müller 6e3bef7ac5 fixes 2021-03-19 18:01:17 +01:00
Robin Müller dc999188c0 some fixes (some pep related) 2021-03-19 17:50:09 +01:00
Robin Müller 04920feea5 newline 2021-03-19 17:43:18 +01:00
Robin Müller e06bb91f08 minor corrections 2021-03-19 17:42:36 +01:00
Robin Müller 27c1da4f77 moved EIVE to new tmtc commander 2021-03-19 17:39:52 +01:00
Robin Müller 4d9df1ba87 moved submodule to github 2021-03-19 16:00:57 +01:00
Jakob Meier 81cd88f521 syrlinks hk handler test 2021-03-01 12:14:04 +01:00
Jakob Meier cf572c311c fixed merge conflicts 2021-02-27 13:42:41 +01:00
Robin Müller d1899ef181 updated hk handling 2021-02-27 13:13:12 +01:00
Jakob Meier 07381147f7 syrlinks hk test wip 2021-02-27 13:09:55 +01:00
Robin Müller 90c45ea0c7 adapted object IDs 2021-02-23 22:07:21 +01:00
Jakob Meier 1d5fe4ebc7 deployment test 2021-02-16 15:33:26 +01:00
Robin Müller 2b85ece071 core update 2021-02-14 12:19:17 +01:00
Robin Müller 55cf05918c Merge remote-tracking branch 'origin/develop' into mueller/master 2021-02-14 12:18:46 +01:00
Jakob Meier 110ec9644a removed unused class in heater test 2021-02-14 10:14:24 +01:00
Jakob Meier 56f3f9c3f1 Merge branch 'develop' into meier/heaterhandler 2021-02-14 10:09:13 +01:00
Jakob Meier e19883d80f heater selection input 2021-02-14 09:37:28 +01:00
Robin Müller c10fbe7fbe Merge remote-tracking branch 'origin/develop' into mueller/master 2021-02-13 19:00:08 +01:00
Jakob Meier 4433fb68ac heater print adaption 2021-02-11 08:18:42 +01:00
Robin Müller a0280c880b updated version tag for first release 2021-02-09 12:53:44 +01:00
Robin Müller d9fc5563ce updated core develop 2021-02-09 12:46:30 +01:00
Jakob Meier cf5ca54fbe service 8 reply interpretation 2021-02-09 12:35:10 +01:00
Jakob Meier b4868b78e1 resolved merge conflicts 2021-02-06 16:41:06 +01:00