Commit Graph

2407 Commits

Author SHA1 Message Date
Markus Kranz 0943a7a998 Merge remote-tracking branch 'origin/develop' into kranz/master 2022-05-23 09:34:54 +02:00
Ulrich Mohr 85a3c936a4 tmtcgui -m7 is kinda working like I would expect it to 2022-05-23 00:20:06 +02:00
Ulrich Mohr 1f7faef083 Merge remote-tracking branch 'origin/develop' into mohr/looooop 2022-05-22 22:02:44 +02:00
Ulrich Mohr 4237ed0d29 working on gui 2022-05-22 21:35:51 +02:00
Ulrich Mohr 77f77489c2 using new prompt in controllers 2022-05-22 21:29:09 +02:00
Ulrich Mohr 2cb801dc97 added prompt that either uses cli or, if available qt 2022-05-22 21:28:34 +02:00
Markus Kranz b8e61b38b0 extended tv test procedures 2022-05-20 16:40:58 +02:00
Robin Müller ff66dd5dd2 Merge pull request 'bump tmtccmd dependency' (#77) from mueller/bump-tmtccmd into develop
Reviewed-on: #77
2022-05-20 15:31:57 +02:00
Robin Müller 9e8dc4f1e2
bump tmtccmd dependency 2022-05-20 15:30:11 +02:00
Robin Müller 881baf7a82 Merge pull request 'HK Parsing and TC PROC Tests' (#76) from mueller/hk-parsing into develop
Reviewed-on: #76
2022-05-19 19:30:19 +02:00
Robin Müller 022551139c
some improvements 2022-05-19 19:24:57 +02:00
Robin Müller e15d3a0b7a
continued procedures 2022-05-19 18:47:23 +02:00
Robin Müller da3f143a9b Merge remote-tracking branch 'origin/develop' into mueller/hk-parsing 2022-05-19 18:16:50 +02:00
Robin Müller d9abd03fa9 Merge pull request 'Init tv test procedure' (#74) from kranz/master into develop
Reviewed-on: #74
2022-05-19 18:16:42 +02:00
Markus Kranz d53e26b589 switch to generic hk function 2022-05-19 18:14:38 +02:00
Robin Müller a6132dd4f8
some bugfixes 2022-05-19 17:52:01 +02:00
Robin Müller 3caaffc151 Merge remote-tracking branch 'origin/develop' into mueller/hk-parsing 2022-05-19 17:37:41 +02:00
Markus Kranz 72de2d99ca Merge remote-tracking branch 'origin/develop' into kranz/master 2022-05-19 17:19:18 +02:00
Robin Müller ef4c0a9189
added mgm hk handling 2022-05-19 14:50:24 +02:00
Robin Müller 730acf5ebe
added gyros hk handling 2022-05-19 13:58:43 +02:00
Robin Müller ff651a7f7a Merge pull request 'continued hk parsing' (#75) from mueller/hk-parsing into develop
Reviewed-on: #75
2022-05-19 13:23:48 +02:00
Robin Müller fcb5e9b48c
remove stray letter 2022-05-19 13:22:24 +02:00
Robin Müller 260a083091
continued hk parsing 2022-05-19 13:20:22 +02:00
Markus Kranz 9bd0783c57 deleted bakcup files 2022-05-19 11:01:11 +02:00
Markus Kranz 2557662c4d Merge remote-tracking branch 'origin/develop' into kranz/master 2022-05-19 10:49:52 +02:00
Uli 084a51ee67 Merge remote-tracking branch 'origin/mohr/looooop' into mohr/looooop 2022-05-19 00:46:48 +02:00
Ulrich Mohr 8ca85d4474 updated tmtccmd 2022-05-19 00:46:21 +02:00
Robin Müller 480e0f07e0 Merge pull request 'Improvements to Loop Mode and HK Parsing' (#73) from mohr/looooop into develop
Reviewed-on: #73
2022-05-18 22:29:43 +02:00
Robin Müller 01337e38d6 Merge branch 'develop' into mohr/looooop 2022-05-18 22:29:33 +02:00
Ulrich Mohr 2ba33309a7 hk handling back to using a dict as I learned it is now ordered 2022-05-18 21:43:57 +02:00
Robin Müller 817a89370a add battery tv test procedure 2022-05-18 20:00:59 +02:00
Markus Kranz ca5fd6468c Merge remote-tracking branch 'origin/develop' into kranz/master 2022-05-18 18:42:18 +02:00
Markus Kranz 973bdeadd6 proc service added 2022-05-18 18:39:18 +02:00
Robin Müller b008cc8392 README fix 2022-05-18 18:32:20 +02:00
Ulrich Mohr dff2c1b041 made parsed hk in json an array, so it can be iterated in order 2022-05-18 17:40:03 +02:00
Ulrich Mohr b0bdb2208f using dle encoder in tm tcp server 2022-05-18 17:03:03 +02:00
Ulrich Mohr bde8a29473 added TODO 2022-05-18 16:41:10 +02:00
Ulrich Mohr 437be64a28 move tcp server into own class and reverted hk handling back to functions from class 2022-05-18 16:02:23 +02:00
Uli de50dcc7fc Merge branch 'develop' into mohr/looooop 2022-05-17 22:14:57 +02:00
Ulrich Mohr 963f48120e added sending of TM via TCP Port 2022-05-17 22:11:58 +02:00
Ulrich Mohr 476066a5ac changed controller commanding to allow more flexibility 2022-05-17 22:11:31 +02:00
Ulrich Mohr 73c8e95dce fixed looping mode 2022-05-17 22:10:53 +02:00
Ulrich Mohr 2beffdbb27 updated tmtccmd version 2022-05-17 22:04:56 +02:00
Robin Müller b185e94cb5 Merge remote-tracking branch 'origin/master' into develop 2022-05-17 17:49:42 +02:00
Robin Müller a6f669e974
cleaner TM handling 2022-05-17 17:21:03 +02:00
Robin Müller ccc0096aa5 Merge pull request 'v1.11.0' (#72) from develop into master
Reviewed-on: #72
2022-05-17 15:04:47 +02:00
Robin Müller 1d6002abcf
update changelog 2022-05-17 15:03:05 +02:00
Robin Müller 79d900f57b
bump version 2022-05-17 15:00:55 +02:00
Robin Müller 66d788abf4
other small update for README 2022-05-17 14:57:54 +02:00
Robin Müller 1272a5aa89
add back requirements.txt and update README 2022-05-17 14:55:23 +02:00