attempt unifying G5 support, legacy cals

Try throwing in compatibility layer, if a bit hacky, for everything.

2 files changed, 44 insertions, 8 deletions

diff --git a/dexcom_reader/database_records.py b/dexcom_reader/database_records.py
index 3812573..9274d24 100644
--- a/dexcom_reader/database_records.py
+++ b/dexcom_reader/database_records.py
@@ -91,7 +91,7 @@ class GenericXMLRecord(GenericTimestampedRecord):
 
 class InsertionRecord(GenericTimestampedRecord):
   FIELDS = ['insertion_time', 'session_state']
-  FORMAT = '<3Ic10BH'
+  FORMAT = '<3IcH'
 
   @property
   def insertion_time(self):
@@ -111,6 +111,8 @@ class InsertionRecord(GenericTimestampedRecord):
   def __repr__(self):
     return '%s:  state=%s' % (self.display_time, self.session_state)
 
+class G5InsertionRecord (InsertionRecord):
+  FORMAT = '<3Ic10BH'
 
 class Calibration(GenericTimestampedRecord):
   FORMAT = '<2Iddd3cdb'
@@ -184,6 +186,12 @@ class Calibration(GenericTimestampedRecord):
   def crc(self):
     return struct.unpack('H', self.raw_data[-2:])[0]
 
+class LegacyCalibration (Calibration):
+  @classmethod
+  def _ClassSize(cls):
+
+    return cls.LEGACY_SIZE
+
 
 class SubCal (GenericTimestampedRecord):
   FORMAT = '<IIIIc'
@@ -207,7 +215,7 @@ class SubCal (GenericTimestampedRecord):
     return util.ReceiverTimeToTime(self.data[3])
 
 class MeterRecord(GenericTimestampedRecord):
-  FORMAT = '<2IHI5BH'
+  FORMAT = '<2IHIH'
   FIELDS = ['meter_glucose', 'meter_time' ]
 
   @property
@@ -221,6 +229,8 @@ class MeterRecord(GenericTimestampedRecord):
   def __repr__(self):
     return '%s: Meter BG:%s' % (self.display_time, self.meter_glucose)
 
+class G5MeterRecord (MeterRecord):
+  FORMAT = '<2IHI5BH'
 
 class EventRecord(GenericTimestampedRecord):
   # sys_time,display_time,glucose,meter_time,crc
@@ -280,7 +290,7 @@ class EGVRecord(GenericTimestampedRecord):
   # uint, uint, ushort, byte, ushort
   # (system_seconds, display_seconds, glucose, trend_arrow, crc)
   FIELDS = ['glucose', 'trend_arrow']
-  FORMAT = '<2IHBBBBBBBBBcBH'
+  FORMAT = '<2IHcH'
 
   @property
   def full_glucose(self):
@@ -288,7 +298,7 @@ class EGVRecord(GenericTimestampedRecord):
 
   @property
   def full_trend(self):
-    return self.data[12]
+    return self.data[3]
 
   @property
   def display_only(self):
@@ -318,3 +328,11 @@ class EGVRecord(GenericTimestampedRecord):
     else:
       return '%s: CGM BG:%s (%s) DO:%s' % (self.display_time, self.glucose,
                                            self.trend_arrow, self.display_only)
+
+class G5EGVRecord (EGVRecord):
+  FORMAT = '<2IHBBBBBBBBBcBH'
+  @property
+  def full_trend(self):
+    return self.data[12]
+
+
diff --git a/dexcom_reader/readdata.py b/dexcom_reader/readdata.py
index 5e91499..0f20e71 100644
--- a/dexcom_reader/readdata.py
+++ b/dexcom_reader/readdata.py
@@ -266,17 +266,21 @@ class Dexcom(object):
     for x in xrange(header[1]):
       yield record_type.Create(data, x)
 
-  def ParsePage(self, header, data):
-    record_type = constants.RECORD_TYPES[ord(header[2])]
-    revision = int(header[3])
-    generic_parser_map = {
+  PARSER_MAP = {
       'USER_EVENT_DATA': database_records.EventRecord,
       'METER_DATA': database_records.MeterRecord,
       'CAL_SET': database_records.Calibration,
+      # 'CAL_SET': database_records.Calibration,
       'INSERTION_TIME': database_records.InsertionRecord,
       'EGV_DATA': database_records.EGVRecord,
       'SENSOR_DATA': database_records.SensorRecord,
     }
+  def ParsePage(self, header, data):
+    record_type = constants.RECORD_TYPES[ord(header[2])]
+    revision = int(header[3])
+    generic_parser_map = self.PARSER_MAP
+    if revision < 2 and record_type == 'CAL_SET':
+      generic_parser_map.update(CAL_SET=database_records.LegacyCalibration)
     xml_parsed = ['PC_SOFTWARE_PARAMETER', 'MANUFACTURING_DATA']
     if record_type in generic_parser_map:
       return self.GenericRecordYielder(header, data,
@@ -310,6 +314,20 @@ class Dexcom(object):
       records.extend(self.ReadDatabasePage(record_type, x))
     return records
 
+class DexcomG5 (Dexcom):
+  PARSER_MAP = {
+      'USER_EVENT_DATA': database_records.EventRecord,
+      'METER_DATA': database_records.G5MeterRecord,
+      'CAL_SET': database_records.Calibration,
+      'INSERTION_TIME': database_records.G5InsertionRecord,
+      'EGV_DATA': database_records.G5EGVRecord,
+      'SENSOR_DATA': database_records.SensorRecord,
+    }
+
+def GetDevice (port, G5=False):
+  if G5:
+    return DexcomG5(port)
+  return Dexcom(port)
 
 if __name__ == '__main__':
   Dexcom.LocateAndDownload()