Merge pull request #24 from winemug/dev

merge for v1.4.3

Author: winemug

.gitignore

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

batt_check.py

@@ -545,16 +545,16 @@ def activate_pod(self):
                 self.logger.debug("Activating pod")
                 self.pod.last_command = {"command": "ACTIVATE",
                                          "success": False}
+                radio = self.get_radio(new=True)
                 self._internal_update_status()
                 if self.pod.state_progress > PodProgress.ReadyForInjection:
                     raise PdmError("Pod is already activated")
 
-                radio = None
                 if self.pod.state_progress == PodProgress.PairingSuccess:
                     if radio is not None:
                         self.pod.radio_packet_sequence = radio.packet_sequence
 
-                    radio = self.get_radio(new=True)
+                    
                     radio.radio_address = self.pod.radio_address
                     radio.message_sequence = 2
 

omni.py

@@ -79,15 +79,13 @@ class Encoding(IntEnum):
     FOURBSIXB = 2
 
 
-PA_LEVELS = [0x12,
-             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]
+PA_LEVELS = [0x0E, 
+             0x1D,
+             0x34,
+             0x2C,
+             0x60,
+             0x84, 0x84,
+             0xC8]
 
 g_rl_address = None
 g_rl_version = None
@@ -346,7 +344,7 @@ def set_tx_power(self, tx_power):
             elif tx_power == TxPower.High:
                 self._set_amp(PA_LEVELS.index(0xC8))
             elif tx_power == TxPower.Highest:
-                self._set_amp(PA_LEVELS.index(0xC0))
+                self._set_amp(PA_LEVELS.index(0xC8))
         except Exception as e:
             raise PacketRadioError("Error while setting tx level") from e
 

podcomm/definitions.py

@@ -218,7 +218,7 @@ def _kill_btle_subprocess(self):
 
     def _reset_sequences(self):
         self.packet_sequence = 0
-        self.message_sequence = 0
+        self.message_sequence = (self.message_sequence + 1) % 16
 
     def _send_and_get(self, pdm_message, pdm_message_address, ack_address_override=None,
                       tx_power=None, double_take=False, expect_critical_follow_up=False):
@@ -274,17 +274,16 @@ def _send_and_get(self, pdm_message, pdm_message_address, ack_address_override=N
                             timeout = 15
                             continue
                         elif repeat_count == 1:
-                            self._reset_sequences()
                             timeout = 10
                             time.sleep(2)
                             continue
                         elif repeat_count == 2:
-                            self._reset_sequences()
                             self._radio_init()
                             timeout = 15
                             continue
                         else:
                             self.logger.debug("Failed recovery")
+                            self._reset_sequences()
                             raise
                     elif part < packet_count - 1:
                         if repeat_count < 2:
@@ -337,6 +336,7 @@ def _send_and_get(self, pdm_message, pdm_message_address, ack_address_override=N
                 except RecoverableProtocolError as rpe:
                     self.logger.debug("Trying to recover from protocol error")
                     self.packet_sequence = (rpe.packet.sequence + 1) % 32
+                    self.message_sequence = (self.message_sequence + 1) % 16
                     if expected_type == RadioPacketType.POD and rpe.packet.type == RadioPacketType.ACK:
                         raise StatusUpdateRequired()
                     continue

podcomm/pdm.py

@@ -30,8 +30,8 @@
 
 app = Flask(__name__, static_url_path="/")
 configureLogging()
-logger = getLogger(with_console=False)
-get_packet_logger(with_console=False)
+logger = getLogger(with_console=True)
+get_packet_logger(with_console=True)
 
 
 class RestApiException(Exception):