Commit Graph

987 Commits

Author SHA1 Message Date
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
fcb5e9b48c
remove stray letter 2022-05-19 13:22:24 +02:00
260a083091
continued hk parsing 2022-05-19 13:20:22 +02:00
9bd0783c57 deleted bakcup files 2022-05-19 11:01:11 +02:00
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
8ca85d4474 updated tmtccmd 2022-05-19 00:46:21 +02:00
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
01337e38d6 Merge branch 'develop' into mohr/looooop 2022-05-18 22:29:33 +02:00
2ba33309a7 hk handling back to using a dict as I learned it is now ordered 2022-05-18 21:43:57 +02:00
817a89370a add battery tv test procedure 2022-05-18 20:00:59 +02:00
ca5fd6468c Merge remote-tracking branch 'origin/develop' into kranz/master 2022-05-18 18:42:18 +02:00
973bdeadd6 proc service added 2022-05-18 18:39:18 +02:00
b008cc8392 README fix 2022-05-18 18:32:20 +02:00
dff2c1b041 made parsed hk in json an array, so it can be iterated in order 2022-05-18 17:40:03 +02:00
b0bdb2208f using dle encoder in tm tcp server 2022-05-18 17:03:03 +02:00
bde8a29473 added TODO 2022-05-18 16:41:10 +02:00
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
963f48120e added sending of TM via TCP Port 2022-05-17 22:11:58 +02:00
476066a5ac changed controller commanding to allow more flexibility 2022-05-17 22:11:31 +02:00
73c8e95dce fixed looping mode 2022-05-17 22:10:53 +02:00
2beffdbb27 updated tmtccmd version 2022-05-17 22:04:56 +02:00
b185e94cb5 Merge remote-tracking branch 'origin/master' into develop 2022-05-17 17:49:42 +02:00
a6f669e974
cleaner TM handling 2022-05-17 17:21:03 +02:00
ccc0096aa5 Merge pull request 'v1.11.0' (#72) from develop into master
Reviewed-on: #72
2022-05-17 15:04:47 +02:00
1d6002abcf
update changelog 2022-05-17 15:03:05 +02:00
79d900f57b
bump version 2022-05-17 15:00:55 +02:00
66d788abf4
other small update for README 2022-05-17 14:57:54 +02:00
1272a5aa89
add back requirements.txt and update README 2022-05-17 14:55:23 +02:00
cff6661f5d
update README 2022-05-17 14:46:23 +02:00
Uli
1cdc06c4d2 Merge branch 'mohr/looooop' into mohr/thermal 2022-05-17 14:45:46 +02:00
5ee77ae9b8 Merge pull request 'first version of continous operation' (#69) from mohr/looooop into develop
Reviewed-on: #69
2022-05-17 14:34:44 +02:00
8455490fe1
form improvements 2022-05-17 14:34:05 +02:00
963e9b7a5b Merge remote-tracking branch 'origin/develop' into mohr/looooop 2022-05-17 14:31:09 +02:00
8162cf1508 Merge pull request 'Package update' (#71) from mueller/package-update into develop
Reviewed-on: #71
2022-05-17 14:30:51 +02:00
a9efd5c86d
delete requirements.txt 2022-05-17 14:28:36 +02:00
86395ac6e7
added setup.cfg and setup.py file 2022-05-17 14:28:17 +02:00
78996b2ef6
README fixes 2022-05-17 14:14:48 +02:00
85ed307b58
bump tmtccmd again 2022-05-17 14:11:20 +02:00
f89483e6ba
Merge remote-tracking branch 'origin/develop' into mohr/looooop 2022-05-17 13:51:12 +02:00
0ebf044496
new run cfg 2022-05-17 13:20:30 +02:00
497cd16c81
bump tmtccmd dependency 2022-05-17 13:20:08 +02:00
893b1822e2 Merge pull request 'TMTC simplification' (#70) from mueller/tmtc-simplification into develop
Reviewed-on: #70
2022-05-17 12:53:10 +02:00
542e6ca48f Merge branch 'mueller/tmtc-simplification' of https://egit.irs.uni-stuttgart.de/eive/eive-tmtc into mueller/tmtc-simplification 2022-05-17 11:41:01 +02:00
b1f96d8a9d
reduce comment block 2022-05-17 11:40:52 +02:00
Uli
a45aa3410b Merge remote-tracking branch 'origin/mohr/looooop' into mohr/looooop 2022-05-17 11:36:41 +02:00
619790e01a spelling 2022-05-17 11:33:40 +02:00
14c3f7acb4 Merge branch 'develop' into mohr/looooop 2022-05-17 11:25:48 +02:00
1a9b44711a Merge branch 'develop' into mueller/tmtc-simplification 2022-05-17 11:21:56 +02:00