Merge pull request Luos-io#93 from Luos-io/tx_it

Tx it pyluos adaptations

Author: Nicolas Rabault

pyluos/containers/container.py

@@ -103,18 +103,22 @@ def uuid(self):
     def luos_statistics(self):
         self._push_value('luos_statistics', "")
         time.sleep(0.3)
-        max_table = [self._luos_statistics["msg_stack"], self._luos_statistics["luos_stack"]]
-        max_val = max(max_table)
-        s = self.alias + " statistics :"
-        s = s + "\n.luos allocated RAM occupation \t= " + repr(max_val)
-        s = s + "%\n\t.Message stack \t\t= " + repr(self._luos_statistics["msg_stack"])
-        s = s + "%\n\t.Luos stack \t\t= " + repr(self._luos_statistics["luos_stack"])
-        s = s + "%\n.Dropped messages number \t= " + repr(self._luos_statistics["msg_drop"])
-        s = s + "\n.Max luos loop delay \t\t= " + repr(self._luos_statistics["loop_ms"])
-        s = s + "ms\n.Msg fail ratio \t\t= " + repr(self._luos_statistics["fail_ratio"])
-        s = s + "%\n.Nak msg max number \t\t= " + repr(self._luos_statistics["nak_max"])
-        s = s + "\n.Collision msg max number \t= " + repr(self._luos_statistics["collision_max"])
-        print(s)
+        try:
+            max_table = [self._luos_statistics["rx_msg_stack"], self._luos_statistics["luos_stack"], self._luos_statistics["tx_msg_stack"], self._luos_statistics["buffer_occupation"]]
+            max_val = max(max_table)
+            s = self.alias + " statistics :"
+            s = s + "\n.luos allocated RAM occupation \t= " + repr(max_val)
+            s = s + "%\n\t.RX message stack \t  = " + repr(self._luos_statistics["rx_msg_stack"])
+            s = s + "%\n\t.TX message stack \t  = " + repr(self._luos_statistics["tx_msg_stack"])
+            s = s + "%\n\t.Luos stack \t\t  = " + repr(self._luos_statistics["luos_stack"])
+            s = s + "%\n\t.Buffer occupation \t  = " + repr(self._luos_statistics["buffer_occupation"])
+            s = s + "%\n.Dropped messages number \t= " + repr(self._luos_statistics["msg_drop"])
+            s = s + "\n.Max luos loop delay \t\t= " + repr(self._luos_statistics["loop_ms"])
+            s = s + "ms\n.msg max retry number \t\t= " + repr(self._luos_statistics["max_retry"])
+            s = s + "\n"
+            print(s)
+        except:
+            print(self.alias + " statistics collection failed.\n")
 
     def rename(self, name):
         # check if the string start with a number before sending

pyluos/containers/state.py

@@ -14,7 +14,7 @@ def state(self):
 
     @state.setter
     def state(self, new_val):
-        self._value == new_val
+        self._value = new_val
         self._push_value('io_state', new_val)
 
     def _update(self, new_state):

pyluos/containers/unknown.py

@@ -32,14 +32,14 @@ def __init__(self, id, alias, device):
     def _update(self, new_state):
         Container._update(self, new_state)
         if 'io_state' in new_state:
-            new_state = new_state['io_state']
-            if new_state != self._state:
-                self._pub_event('changed', self._state, new_state)
+            val = new_state['io_state']
+            if val != self._state:
+                self._pub_event('changed', self._state, val)
 
-                evt = 'pressed' if new_state == True else 'released'
-                self._pub_event(evt, self._state, new_state)
+                evt = 'pressed' if val == True else 'released'
+                self._pub_event(evt, self._state, val)
 
-                self._state = new_state
+                self._state = val
         if 'rot_position' in new_state:
             self._angular_position = new_state['rot_position']
         if 'rot_speed' in new_state:
@@ -95,7 +95,7 @@ def state(self):
 
     @state.setter
     def state(self, new_val):
-        self._state == new_val
+        self._state = new_val
         self._push_value('io_state', new_val)
 
     @property

pyluos/device.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 import os
 import sys
 import json
@@ -160,8 +161,16 @@ def benchmark(self, target_id, data, repetition):
         self._write( json.dumps(self._bench_settings).encode() + '\r'.encode() + self._bench_Data)
 
         state = self._poll_once()
+        startTime = time.time()
+        retry = 0
         while ('benchmark' not in state):
             state = self._poll_once()
+            if (time.time()-startTime > 30):
+                self._write( json.dumps(self._bench_settings).encode() + '\r'.encode() + self._bench_Data)
+                retry = retry+1
+                if (retry == 3):
+                    return (0, 100)
+                startTime = time.time()
 
         #self._pause = False
         return (state['benchmark']['data_rate'], state['benchmark']['fail_rate'])

pyluos/io/serial_io.py

@@ -23,7 +23,7 @@
     JSONDecodeError = ValueError
 
 class Serial(IOHandler):
-    poll_frequency = 100
+    poll_frequency = 200
 
     @classmethod
     def available_hosts(cls):

pyluos/version.py

@@ -1 +1 @@
-version = '1.4.1'
+version = '1.4.2'