mtype is not a packet concern

Author: ps2

analysis/data/all.txt

@@ -41,8 +41,7 @@ def commands(self):
         return cmds
 
     def packets(self):
-        message_type = self.body[0:2]
-        body_remaining = self.body[2:] + self.computed_crc_bytes()
+        body_remaining = self.body + self.computed_crc_bytes()
         packets = []
         while len(body_remaining) > 0:
             packet = Packet()
@@ -52,7 +51,6 @@ def packets(self):
                 packet.packet_type = Packet.PACKET_TYPE_PDM
                 packet.pod_address_2 = self.pod_id
                 packet.byte9 = self.byte9
-                packet.message_type = message_type
                 segment_len = min(Packet.MAX_BODY_SEGMENT_LEN,len(body_remaining))
                 packet.body = body_remaining[:segment_len]
                 packet.body_len = len(self.body)
@@ -66,6 +64,3 @@ def packets(self):
             packets.append(packet)
 
         return packets
-
-        #1f07b1ee9000000000000002510251f3
-        #1f07b1ee900000000000000251e2

analysis/data/one_tb.txt

@@ -26,7 +26,7 @@ class Packet(object):
     PACKET_TYPE_ACK = 0b010
     PACKET_TYPE_CON = 0b100
 
-    MAX_BODY_SEGMENT_LEN = 23
+    MAX_BODY_SEGMENT_LEN = 25
     MAX_CON_BODY_SEGMENT_LEN = 30
 
     PACKET_TYPE_STRINGS = {
@@ -42,7 +42,6 @@ def __init__(self, data=""):
         self.packet_type = None
         self.body = None
         self.body_len = None
-        self.message_type = None
         self.crc = None
         if len(data) < 10:
             return
@@ -58,17 +57,15 @@ def __init__(self, data=""):
             self.pod_address_2 = data[5:9].encode("hex")
 
         if (self.packet_type != Packet.PACKET_TYPE_CON and
-           self.packet_type != Packet.PACKET_TYPE_ACK and len(data) > 13):
+           self.packet_type != Packet.PACKET_TYPE_ACK and len(data) > 11):
             self.byte9 = ord(data[9])
             self.body_len = ord(data[10])
-            self.message_type = data[11:13]
-            segment_len = min(Packet.MAX_BODY_SEGMENT_LEN,self.body_len,len(data)-14)
-            self.body = data[13:(13+segment_len)]
-            self.crc = ord(data[13+segment_len])
+            segment_len = min(Packet.MAX_BODY_SEGMENT_LEN,self.body_len,len(data)-12)
+            self.body = data[11:(11+segment_len)]
+            self.crc = ord(data[11+segment_len])
         else:
             self.byte9 = None
             self.body_len = 0
-            self.message_type = None
             self.body = None
             self.crc = ord(data[9])
 
@@ -98,6 +95,7 @@ def assign_from_string(self, line):
             self.pod_address_2 = None
             self.byte9 = None
             self.received_at = dateutil.parser.parse(elems[0])
+            legacy_mtype = ""
             for elem in elems[1:]:
                 (key,v) = elem.split(':')
                 if key == "ID1":
@@ -118,10 +116,10 @@ def assign_from_string(self, line):
                     self.byte9 = int(v,16)
                 if key == "BLEN":
                     self.body_len = int(v)
-                if key == "MTYPE":
-                    self.message_type = v.decode('hex')
+                if key == "MTYPE":  # Legacy format
+                    legacy_mtype = v.decode('hex')
                 if key == "BODY":
-                    self.body = v.decode('hex')
+                    self.body = legacy_mtype + v.decode('hex')
         except ValueError:
             self.body = None
         except OverflowError:
@@ -140,7 +138,6 @@ def tx_data(self):
         if self.packet_type != self.PACKET_TYPE_CON and self.body is not None:
             data += chr(self.byte9)
             data += chr(self.body_len)
-            data += self.message_type
             data += self.body
         data += chr(self.compute_crc_for(bytearray(data)))
         return data
@@ -154,8 +151,6 @@ def __eq__(self, other):
             return False
         if self.packet_type != other.packet_type:
             return False
-        if self.message_type != other.message_type:
-            return False
         if self.body != other.body:
             return False
         if self.byte9 != other.byte9:
@@ -170,7 +165,6 @@ def __hash__(self):
             hash(self.pod_address_1),
             hash(self.pod_address_2),
             hash(self.packet_type),
-            hash(self.message_type),
             hash(self.body),
             hash(self.byte9),
             hash(self.sequence)])
@@ -206,12 +200,11 @@ def __str__(self):
             )
         if self.body != None:
             # All other packets with enough bytes to have a body
-            return "%s ID2:%s B9:%02x BLEN:%s MTYPE:%s BODY:%s CRC:%02x" % (
+            return "%s ID2:%s B9:%02x BLEN:%s BODY:%s CRC:%02x" % (
                 base_str,
                 self.pod_address_2,
                 self.byte9,
                 self.body_len,
-                self.message_type.encode('hex'),
                 self.body.encode('hex'),
                 crc,
             )
@@ -242,8 +235,6 @@ def as_dict(self):
             if self.body is not None:
                 obj["body"] = self.body.encode('hex')
                 obj["body_len"] = self.body_len
-            if self.message_type is not None:
-                obj["message_type"] = self.message_type.encode('hex')
             if self.received_at is not None:
                 obj["received_at"] = self.received_at
         else:
@@ -264,7 +255,7 @@ def is_valid(self):
             if self.body is None:
                 return False
             big_body_ok = self.body_len > Packet.MAX_BODY_SEGMENT_LEN and len(self.body) == Packet.MAX_BODY_SEGMENT_LEN
-            small_body_ok = self.body_len == 0 or self.body_len == len(self.body)
+            small_body_ok = self.body_len == 0 or self.body_len == len(self.body) - 2
             body_ok = (big_body_ok or small_body_ok)
         return self.crc_ok() and body_ok
 

analysis/data/temp_basals.txt

@@ -23,8 +23,18 @@ def test_init_pdm_packet_with_extraneous_data(self):
         packet = Packet("1f07b1eeae1f07b1ee181f1a0eeb5701b202010a0101a000340034170d000208000186a01912345678".decode('hex'))
         self.assertTrue(packet.is_valid())
         self.assertEqual(packet.packet_type, Packet.PACKET_TYPE_PDM)
+        self.assertEqual(packet.raw_hex(), "1f07b1eeae1f07b1ee181f1a0eeb5701b202010a0101a000340034170d000208000186a019")
 
     def test_init_ack_packet_with_extraneous_data(self):
         packet = Packet("1f01482a5e1f01482ae51824c9e2fa95146a9a9444bbfa0f1474514e7d".decode('hex'))
         self.assertTrue(packet.is_valid())
         self.assertEqual(packet.packet_type, Packet.PACKET_TYPE_ACK)
+        self.assertEqual(packet.raw_hex(), "1f01482a5e1f01482ae5")
+
+    def test_read_packet_output_format(self):
+        packet = Packet().assign_from_string("2016-06-17T20:50:34.882742 ID1:1f014829 PTYPE:POD SEQ:14 ID2:1f014829 B9:24 BLEN:10 MTYPE:1d18 BODY:02ada800002be7ff021c CRC:40")
+        self.assertTrue(packet.is_valid())
+        self.assertEqual(packet.packet_type, Packet.PACKET_TYPE_POD)
+        self.assertEqual(packet.body_len, 10)
+        self.assertEqual(len(packet.body), 12)  # Includes crc
+        self.assertEqual(str(packet), "2016-06-17T20:50:34.882742 ID1:1f014829 PTYPE:POD SEQ:14 ID2:1f014829 B9:24 BLEN:10 BODY:1d1802ada800002be7ff021c CRC:40")