From 45edd299832fee51335edcfd2069b0ccffc95d82 Mon Sep 17 00:00:00 2001 From: "Robin.Mueller" <robin.mueller.m@gmail.com> Date: Fri, 20 Dec 2019 20:13:16 +0100 Subject: [PATCH] gps service test for gps0 and gps1 --- comIF/OBSW_Ethernet_ComIF.py | 5 ++--- tc/OBSW_TcPacker.py | 8 ++++---- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/comIF/OBSW_Ethernet_ComIF.py b/comIF/OBSW_Ethernet_ComIF.py index b2095bb..b921e96 100644 --- a/comIF/OBSW_Ethernet_ComIF.py +++ b/comIF/OBSW_Ethernet_ComIF.py @@ -44,9 +44,8 @@ class EthernetComIF(CommunicationInterface): ready = self.dataAvailable(pollTimeout) if ready is False: pass - elif ready[0]: - packet = self.receiveTelemetry() - self.tmtcPrinter.printTelemetry(packet) + elif ready: + self.receiveTelemetry() def receiveTelemetry(self, parameters=0): data = self.recvSocket.recvfrom(1024)[0] diff --git a/tc/OBSW_TcPacker.py b/tc/OBSW_TcPacker.py index 6a11214..4abae19 100644 --- a/tc/OBSW_TcPacker.py +++ b/tc/OBSW_TcPacker.py @@ -37,11 +37,11 @@ def serviceTestSelect(service, serviceQueue): return packService200TestInto(serviceQueue) elif service == "Dummy": return packDummyDeviceTestInto(serviceQueue) - elif service == "GPS": + elif service == "GPS0": # Object ID: GPS Device objectId = bytearray([0x44, 0x00, 0x1F, 0x00]) return packGpsTestInto(objectId, serviceQueue) - elif service == "rGPS": + elif service == "GPS1": # Object ID: GPS Device objectId = bytearray([0x44, 0x00, 0x20, 0x00]) return packGpsTestInto(objectId, serviceQueue) @@ -153,8 +153,8 @@ def packGpsTestInto(objectId, tcQueue): modeData = packModeData(objectId, 1, 0) command = PUSTelecommand(service=200, subservice=1, SSC=12, data=modeData) tcQueue.put(command.packCommandTuple()) - # pack wait interval until mode is one - tcQueue.put(("wait", 3)) + # pack wait interval until mode is on and a few gps replies have been received + tcQueue.put(("wait", 6)) # Set Mode Off tcQueue.put(("print", "\n\rTesting GPS: Set Off")) modeData = packModeData(objectId, 0, 0) -- GitLab