Merge pull request #2 from openaps/dev

bump version on next dev

4 files changed, 50 insertions, 18 deletions

diff --git a/dexcom_reader/constants.py b/dexcom_reader/constants.py
index 2f60020..421c190 100644
--- a/dexcom_reader/constants.py
+++ b/dexcom_reader/constants.py
@@ -55,7 +55,9 @@ READ_HARDWARE_BOARD_ID = 49
 READ_FIRMWARE_SETTINGS = 54
 READ_ENABLE_SETUP_WIZARD_FLAG = 55
 READ_SETUP_WIZARD_STATE = 57
-MAX_COMMAND = 59
+READ_CHARGER_CURRENT_SETTING = 59
+WRITE_CHARGER_CURRENT_SETTING = 60
+MAX_COMMAND = 61
 MAX_POSSIBLE_COMMAND = 255
 
 EGV_VALUE_MASK = 1023
diff --git a/dexcom_reader/database_records.py b/dexcom_reader/database_records.py
index 79ae323..8d471f4 100644
--- a/dexcom_reader/database_records.py
+++ b/dexcom_reader/database_records.py
@@ -137,6 +137,7 @@ class MeterRecord(GenericTimestampedRecord):
 class EventRecord(GenericTimestampedRecord):
   # sys_time,display_time,glucose,meter_time,crc
   FORMAT = '<2I2c2IH'
+  FIELDS = ['event_type', 'event_sub_type', 'event_value' ]
 
   @property
   def event_type(self):
@@ -171,7 +172,7 @@ class EventRecord(GenericTimestampedRecord):
 class SensorRecord(GenericTimestampedRecord):
   # uint, uint, uint, uint, ushort
   # (system_seconds, display_seconds, unfiltered, filtered, rssi, crc)
-  FORMAT = '<2IIIHH'
+  FORMAT = '<2IIIhH'
   # (unfiltered, filtered, rssi)
   FIELDS = ['unfiltered', 'filtered', 'rssi']
   @property
@@ -184,17 +185,7 @@ class SensorRecord(GenericTimestampedRecord):
 
   @property
   def rssi(self):
-    return self.data[3]
-
-  """
-  def to_dict (self):
-    return dict(display_time=self.display_time.isoformat( )
-      , system_time=self.system_time.isoformat( )
-      , unfiltered=self.unfiltered
-      , filtered=self.filtered
-      , rssi=self.rssi
-      )
-  """
+    return self.data[4]
 
 
 class EGVRecord(GenericTimestampedRecord):
diff --git a/dexcom_reader/readdata.py b/dexcom_reader/readdata.py
index 3009f37..cc02de3 100644
--- a/dexcom_reader/readdata.py
+++ b/dexcom_reader/readdata.py
@@ -151,12 +151,19 @@ class Dexcom(object):
     return util.ReceiverTimeToTime(struct.unpack('I', rtc)[0])
 
   def ReadSystemTimeOffset(self):
-    rtc = self.GenericReadCommand(constants.READ_SYSTEM_TIME_OFFSET).data
-    return datetime.timedelta(seconds=struct.unpack('i', rtc)[0])
+    raw = self.GenericReadCommand(constants.READ_SYSTEM_TIME_OFFSET).data
+    return datetime.timedelta(seconds=struct.unpack('i', raw)[0])
 
   def ReadDisplayTimeOffset(self):
-    rtc = self.GenericReadCommand(constants.READ_DISPLAY_TIME_OFFSET).data
-    return datetime.timedelta(seconds=struct.unpack('i', rtc)[0])
+    raw = self.GenericReadCommand(constants.READ_DISPLAY_TIME_OFFSET).data
+    return datetime.timedelta(seconds=struct.unpack('i', raw)[0])
+
+  def WriteDisplayTimeOffset(self, offset=None):
+    payload = struct.pack('i', offset)
+    self.WriteCommand(constants.WRITE_DISPLAY_TIME_OFFSET, payload)
+    packet = self.readpacket()
+    return dict(ACK=ord(packet.command) == constants.ACK)
+
 
   def ReadDisplayTime(self):
     return self.ReadSystemTime() + self.ReadDisplayTimeOffset()
@@ -172,8 +179,40 @@ class Dexcom(object):
     return CLOCK_MODE[ord(cm[0])]
 
   def ReadDeviceMode(self):
+    # ???
     return self.GenericReadCommand(constants.READ_DEVICE_MODE).data
 
+  def ReadBlindedMode(self):
+    MODES = { 0: False }
+    raw = self.GenericReadCommand(constants.READ_BLINDED_MODE).data
+    mode = MODES.get(bytearray(raw)[0], True)
+    return mode
+
+  def ReadHardwareBoardId(self):
+    return self.GenericReadCommand(constants.READ_HARDWARE_BOARD_ID).data
+
+  def ReadEnableSetupWizardFlag (self):
+    # ???
+    return self.GenericReadCommand(constants.READ_ENABLE_SETUP_WIZARD_FLAG).data
+
+  def ReadSetupWizardState (self):
+    # ???
+    return self.GenericReadCommand(constants.READ_SETUP_WIZARD_STATE).data
+
+  def WriteChargerCurrentSetting (self, status):
+    MAP = ( 'Off', 'Power100mA', 'Power500mA', 'PowerMax', 'PowerSuspended' )
+    payload = str(bytearray([MAP.index(status)]))
+    self.WriteCommand(constants.WRITE_CHARGER_CURRENT_SETTING, payload)
+    packet = self.readpacket()
+    raw = bytearray(packet.data)
+    return dict(ACK=ord(packet.command) == constants.ACK, raw=list(raw))
+
+  def ReadChargerCurrentSetting (self):
+    MAP = ( 'Off', 'Power100mA', 'Power500mA', 'PowerMax', 'PowerSuspended' )
+    raw = bytearray(self.GenericReadCommand(constants.READ_CHARGER_CURRENT_SETTING).data)
+    return MAP[raw[0]]
+
+
   def ReadManufacturingData(self):
     data = self.ReadRecords('MANUFACTURING_DATA')[0].xmldata
     return ET.fromstring(data)
diff --git a/setup.py b/setup.py
index 5de075a..3bad349 100644
--- a/setup.py
+++ b/setup.py
@@ -10,7 +10,7 @@ def readme():
         return f.read()
 
 setup(name='dexcom_reader',
-    version='0.0.7', # http://semver.org/
+    version='0.0.8', # http://semver.org/
     description='Audit, and inspect data from Dexcom G4.',
     long_description=readme(),
     author="Will Nowak",