From 71a4ed5f63e01731bc1f3292753d482a13183a62 Mon Sep 17 00:00:00 2001
From: "Robin.Mueller" <robin.mueller.m@gmail.com>
Date: Mon, 27 Jan 2020 00:51:27 +0100
Subject: [PATCH] TM service 3 gps recv bugfix
---
tm/OBSW_TmService3.py | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/tm/OBSW_TmService3.py b/tm/OBSW_TmService3.py
index 9a14653..fbc1b12 100644
--- a/tm/OBSW_TmService3.py
+++ b/tm/OBSW_TmService3.py
@@ -65,17 +65,17 @@ class Service3TM(PUSTelemetry):
"Velocity X", "Velocity Y", "Velocity Z"]
fixMode = self.byteArrayData[4]
svInFix = self.byteArrayData[5]
- gnssWeek = struct.unpack('>H', self.byteArrayData[5:7])[0]
- timeOfWeek = struct.unpack('>I', self.byteArrayData[7:11])[0]
- latitude = struct.unpack('>I', self.byteArrayData[11:15])[0]
- longitude = struct.unpack('>I', self.byteArrayData[15:19])[0]
- msa = struct.unpack('>I', self.byteArrayData[19:23])[0]
- positionX = struct.unpack('>d', self.byteArrayData[23:31])[0]
- positionY = struct.unpack('>d', self.byteArrayData[31:39])[0]
- positionZ = struct.unpack('>d', self.byteArrayData[39:47])[0]
- vx = struct.unpack('>d', self.byteArrayData[47:55])[0]
- vy = struct.unpack('>d', self.byteArrayData[55:63])[0]
- vz = struct.unpack('>d', self.byteArrayData[63:71])[0]
+ gnssWeek = struct.unpack('>H', self.byteArrayData[6:8])[0]
+ timeOfWeek = struct.unpack('>I', self.byteArrayData[8:12])[0]
+ latitude = struct.unpack('>I', self.byteArrayData[12:16])[0]
+ longitude = struct.unpack('>I', self.byteArrayData[16:20])[0]
+ msa = struct.unpack('>I', self.byteArrayData[20:24])[0]
+ positionX = struct.unpack('>d', self.byteArrayData[24:32])[0]
+ positionY = struct.unpack('>d', self.byteArrayData[32:40])[0]
+ positionZ = struct.unpack('>d', self.byteArrayData[40:48])[0]
+ vx = struct.unpack('>d', self.byteArrayData[48:56])[0]
+ vy = struct.unpack('>d', self.byteArrayData[56:64])[0]
+ vz = struct.unpack('>d', self.byteArrayData[64:72])[0]
self.hkContent = [fixMode, svInFix, gnssWeek, timeOfWeek, latitude, longitude, msa, positionX, positionY,
positionZ, vx, vy, vz]
elif self.sid == 0x4300 or self.sid == 0x4400:
--
GitLab