Merge pull request #23 from winemug/dev

Dev to master v1.4.2

Author: winemug

batt_check.py

@@ -19,7 +19,7 @@ def __init__(self):
         self.res1 = 180  # resistor connected to VBATT (/1000)
         self.res2 = 100  # resistor connected to GND (/1000)
         self.reps = 10  # how many times to take each measurement for averaging
-        self.pcround = 5  # round % battery to nearest
+        self.pcround = 1  # round % battery to nearest
 
         # Define Pins/Ports on ADC
         self.SPICLK = 16

podcomm/definitions.py

@@ -24,8 +24,8 @@
 
 API_VERSION_MAJOR = 1
 API_VERSION_MINOR = 4
-API_VERSION_REVISION = 1
-API_VERSION_BUILD = 19201
+API_VERSION_REVISION = 2
+API_VERSION_BUILD = 19210
 
 REST_URL_PING = "/omnipy/ping"
 REST_URL_OMNIPY_SHUTDOWN = "/omnipy/shutdown"

podcomm/pdm.py

@@ -130,8 +130,8 @@ def acknowledge_alerts(self, alert_mask):
                 self.logger.info("Acknowledging alerts with bitmask %d" % alert_mask)
                 self.pod.last_command = {"command": "ACK_ALERTS", "mask": alert_mask, "success": False}
                 self._assert_pod_address_assigned()
+                self._internal_update_status()
                 self._assert_immediate_bolus_not_active()
-                #self._internal_update_status()
                 self._assert_can_acknowledge_alerts()
 
                 if self.pod.state_alert | alert_mask != self.pod.state_alert:
@@ -242,6 +242,7 @@ def bolus(self, bolus_amount):
 
                 self._assert_pod_address_assigned()
                 self._assert_can_generate_nonce()
+                self._internal_update_status()
                 self._assert_immediate_bolus_not_active()
                 self._assert_not_faulted()
                 self._assert_status_running()
@@ -285,6 +286,7 @@ def cancel_bolus(self):
                 self.pod.last_command = {"command": "BOLUS_CANCEL", "canceled": 0, "success": False}
                 self._assert_pod_address_assigned()
                 self._assert_can_generate_nonce()
+                self._internal_update_status()
                 self._assert_not_faulted()
                 self._assert_status_running()
 
@@ -319,6 +321,7 @@ def cancel_temp_basal(self):
                 if not self.debug_status_skip:
                     self._assert_pod_address_assigned()
                     self._assert_can_generate_nonce()
+                    self._internal_update_status()
                     self._assert_immediate_bolus_not_active()
                     self._assert_not_faulted()
                     self._assert_status_running()
@@ -356,6 +359,7 @@ def set_temp_basal(self, basalRate, hours, confidenceReminder=False):
                 if not self.debug_status_skip:
                     self._assert_pod_address_assigned()
                     self._assert_can_generate_nonce()
+                    self._internal_update_status()
                     self._assert_immediate_bolus_not_active()
                     self._assert_not_faulted()
                     self._assert_status_running()
@@ -405,6 +409,7 @@ def set_basal_schedule(self, schedule):
                                          "success": False}
                 self._assert_pod_address_assigned()
                 self._assert_can_generate_nonce()
+                self._internal_update_status()
                 self._assert_immediate_bolus_not_active()
                 self._assert_not_faulted()
                 self._assert_status_running()
@@ -445,7 +450,7 @@ def deactivate_pod(self):
                 self._assert_immediate_bolus_not_active()
                 self.logger.debug("Deactivating pod")
                 self.pod.last_command = {"command": "DEACTIVATE", "success": False}
-                #self._internal_update_status()
+                self._internal_update_status()
                 self._assert_can_deactivate()
 
                 request = request_deactivate()
@@ -494,6 +499,8 @@ def pair_pod(self, candidate_address, utc_offset):
                     response_parse(response, self.pod)
 
                     self._assert_pod_can_activate()
+                else:
+                    self._internal_update_status()
 
                 if self.pod.state_progress == PodProgress.TankFillCompleted:
 
@@ -538,7 +545,7 @@ def activate_pod(self):
                 self.logger.debug("Activating pod")
                 self.pod.last_command = {"command": "ACTIVATE",
                                          "success": False}
-
+                self._internal_update_status()
                 if self.pod.state_progress > PodProgress.ReadyForInjection:
                     raise PdmError("Pod is already activated")
 
@@ -614,7 +621,7 @@ def inject_and_start(self, basal_schedule):
                 self.pod.last_command = {"command": "START",
                                          "hourly_rates": basal_schedule,
                                          "success": False}
-
+                self._internal_update_status()
                 if self.pod.state_progress >= PodProgress.Running:
                     raise PdmError("Pod has passed the injection stage")
 

podcomm/pr_rileylink.py

@@ -80,14 +80,14 @@ class Encoding(IntEnum):
 
 
 PA_LEVELS = [0x12,
-             0x0E,
-             0x1D,
-             0x34,
-             0x2C,
-             0x60,
-             0x84,
-             0xC8,
-             0xC0]
+             0x0E, 0x0E,
+             0x1D, 0x1D,
+             0x34, 0x34, 0x34,
+             0x2C, 0x2C, 0x2C, 0x2C,
+             0x60, 0x60, 0x60, 0x60,
+             0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84,
+             0xC8, 0xC8, 0xC8, 0xC8, 0xC8, 0xC8, 0xC8, 0xC8, 0xC8,
+             0xC0, 0xC0]
 
 g_rl_address = None
 g_rl_version = None

podcomm/protocol_radio.py

@@ -285,15 +285,6 @@ def _send_and_get(self, pdm_message, pdm_message_address, ack_address_override=N
                             continue
                         else:
                             self.logger.debug("Failed recovery")
-                            if packet_count == 1:
-                                self.logger.debug("Calming pod down in case of reception problem on our end")
-                                ack_packet = self._final_ack(self.ack_address_override, 1)
-                                try:
-                                    self.packet_radio.set_tx_power(TxPower.Highest)
-                                    self._send_packet(ack_packet)
-                                except Exception:
-                                    self.logger.exception("Ignored.")
-                            self._reset_sequences()
                             raise
                     elif part < packet_count - 1:
                         if repeat_count < 2:
@@ -322,7 +313,6 @@ def _send_and_get(self, pdm_message, pdm_message_address, ack_address_override=N
                             continue
                         else:
                             self.logger.debug("Failed recovery")
-                            self._reset_sequences()
                             raise
                     elif part < packet_count - 1:
                         if repeat_count < 6:
@@ -333,7 +323,6 @@ def _send_and_get(self, pdm_message, pdm_message_address, ack_address_override=N
                             continue
                         else:
                             self.logger.debug("Failed recovery")
-                            self._reset_sequences()
                             raise
                     else:
                         if repeat_count < 10:
@@ -344,7 +333,6 @@ def _send_and_get(self, pdm_message, pdm_message_address, ack_address_override=N
                             continue
                         else:
                             self.logger.debug("Failed recovery")
-                            self._reset_sequences()
                             raise
                 except RecoverableProtocolError as rpe:
                     self.logger.debug("Trying to recover from protocol error")