Commit Graph

780 Commits

Author SHA1 Message Date
muellerr dd7a19d134 Merge branch 'kranz/master' of https://egit.irs.uni-stuttgart.de/eive/eive-tmtc into kranz/master 2022-05-23 18:33:41 +02:00
muellerr c9f5a5652e run afmt 2022-05-23 18:33:35 +02:00
muellerr 45bee6429e Merge branch 'develop' into kranz/master 2022-05-23 18:33:13 +02:00
muellerr ba69be6296 Merge pull request 'add rtd cmds' (#84) from mueller/rtd-cmds into develop
Reviewed-on: #84
2022-05-23 18:31:39 +02:00
muellerr 427efab44e Merge branch 'develop' into mueller/rtd-cmds 2022-05-23 18:30:29 +02:00
muellerr 4aa89e42ee Merge pull request 'Rad Sensor HK parsing' (#81) from mueller/rad-sensor into develop
Reviewed-on: #81
2022-05-23 18:30:17 +02:00
muellerr ea1865bd45 update changelog 2022-05-23 18:29:50 +02:00
muellerr 4de3e7d107 rad sensor reading works 2022-05-23 18:25:25 +02:00
muellerr 4251b126b7 Merge remote-tracking branch 'origin/develop' into mueller/rad-sensor 2022-05-23 18:02:03 +02:00
muellerr 9332fb8690 Merge branch 'develop' into mueller/rtd-cmds 2022-05-23 18:00:10 +02:00
muellerr 7186636d9c Merge pull request 'Supervisor command' (#82) from meier/ploc into develop
Reviewed-on: #82
2022-05-23 17:54:50 +02:00
muellerr b54ffcedff Merge branch 'develop' into meier/ploc 2022-05-23 17:54:19 +02:00
muellerr 7e36b387fe add rtd cmds 2022-05-23 17:50:08 +02:00
Jakob Meier 15e0861c4d run generator script 2022-05-23 17:03:45 +02:00
mkranz 623e1cc37e Merge remote-tracking branch 'origin/develop' into kranz/master 2022-05-23 16:44:11 +02:00
mkranz 181e6d62ad n 2022-05-23 16:42:27 +02:00
Jakob Meier 8eae5a4278 command to continue failed mpsoc update 2022-05-23 16:38:44 +02:00
muellerr 648e0b7814 bump tmtccmd 2022-05-23 16:11:55 +02:00
muellerr 17a3ea24df Merge pull request 'GUI improvements' (#79) from mohr/looooop into develop
Reviewed-on: #79
2022-05-23 15:50:04 +02:00
muellerr 2506d911de rad sensor HK parsing 2022-05-23 15:49:21 +02:00
muellerr 314071de1c rad sensor data 2022-05-23 15:38:05 +02:00
mkranz bcaac870c1 changed tcs and acs tv test proc 2022-05-23 15:28:41 +02:00
mkranz b3751004a6 added acs functional test 2022-05-23 11:53:31 +02:00
mkranz 0943a7a998 Merge remote-tracking branch 'origin/develop' into kranz/master 2022-05-23 09:34:54 +02:00
mohr 85a3c936a4 tmtcgui -m7 is kinda working like I would expect it to 2022-05-23 00:20:06 +02:00
mohr 1f7faef083 Merge remote-tracking branch 'origin/develop' into mohr/looooop 2022-05-22 22:02:44 +02:00
mohr 4237ed0d29 working on gui 2022-05-22 21:35:51 +02:00
mohr 77f77489c2 using new prompt in controllers 2022-05-22 21:29:09 +02:00
mohr 2cb801dc97 added prompt that either uses cli or, if available qt 2022-05-22 21:28:34 +02:00
mkranz b8e61b38b0 extended tv test procedures 2022-05-20 16:40:58 +02:00
muellerr 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
muellerr 9e8dc4f1e2 bump tmtccmd dependency 2022-05-20 15:30:11 +02:00
muellerr 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
muellerr 022551139c some improvements 2022-05-19 19:24:57 +02:00
muellerr e15d3a0b7a continued procedures 2022-05-19 18:47:23 +02:00
muellerr da3f143a9b Merge remote-tracking branch 'origin/develop' into mueller/hk-parsing 2022-05-19 18:16:50 +02:00
muellerr 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
mkranz d53e26b589 switch to generic hk function 2022-05-19 18:14:38 +02:00
muellerr a6132dd4f8 some bugfixes 2022-05-19 17:52:01 +02:00
muellerr 3caaffc151 Merge remote-tracking branch 'origin/develop' into mueller/hk-parsing 2022-05-19 17:37:41 +02:00
mkranz 72de2d99ca Merge remote-tracking branch 'origin/develop' into kranz/master 2022-05-19 17:19:18 +02:00
muellerr ef4c0a9189 added mgm hk handling 2022-05-19 14:50:24 +02:00
muellerr 730acf5ebe added gyros hk handling 2022-05-19 13:58:43 +02:00
muellerr 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
muellerr fcb5e9b48c remove stray letter 2022-05-19 13:22:24 +02:00
muellerr 260a083091 continued hk parsing 2022-05-19 13:20:22 +02:00
mkranz 9bd0783c57 deleted bakcup files 2022-05-19 11:01:11 +02:00
mkranz 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
mohr 8ca85d4474 updated tmtccmd 2022-05-19 00:46:21 +02:00