Merge pull request #169 from Luos-io/rc_2.2.7

Pyluos version 2.2.7

Author: JeromeGalan

pyluos/device.py

@@ -258,15 +258,15 @@ def _update(self, new_state):
                 getattr(self, alias)._kill()
         if 'assert' in new_state.keys() :
             # A node assert, print assert informations
-            if (('node_id' in new_state.keys()['assert']) and ('file' in new_state.keys()['assert']) and ('line' in new_state.keys()['assert'])):
+            if (('node_id' in new_state['assert']) and ('file' in new_state['assert']) and ('line' in new_state['assert'])):
                 s = "************************* ASSERT *************************\n"
                 s += "*  Node " + str(new_state['assert']['node_id']) + " assert in file " + new_state['assert']['file'] + " line " + str(new_state['assert']['line'])
                 s += "\n**********************************************************"
                 print (s)
         if 'services' not in new_state.keys():
             return
 
-        for alias, mod in new_state.keys()['services'].items():
+        for alias, mod in new_state['services'].items():
             if hasattr(self, alias):
                 getattr(self, alias)._update(mod)
 

pyluos/io/serial_io.py

@@ -114,21 +114,14 @@ def extract_line(s):
                             return extract_line(s[H+1:])
                         else:
                             # Footer is ok
-                            for _, search_void in enumerate(s[data_start:6]):
-                                if search_void == b'{}\n':
-                                    # Drop void datas
-                                    for index, search_header in enumerate(data):
-                                        if search_header == b'\x7E':
-                                            return extract_line(s[(data_start + index + 1):])
-                            # Return the data
                             return s[data_start:data_end], s[data_end + 1:]
 
         buff = b''
 
         while self._running:
             to_read = self._serial.in_waiting
 
-            if (to_read == 0) and (len(buff) == 0):
+            if to_read == 0:
                 time.sleep(self.period)
                 continue
 

pyluos/services/service.py

@@ -51,6 +51,9 @@ def __repr__(self):
                 'id={self.id}>'.format(self=self))
 
     def _update(self, new_state):
+        if not isinstance(new_state, dict):
+            new_state = {new_state: ""}
+
         if ((time.time() - self._last_update) != 0):
             self.refresh_freq = ((200.0 * self.refresh_freq) + (1.0 / (time.time() - self._last_update))) / 201.0
             self._last_update = time.time()

pyluos/version.py

@@ -1 +1 @@
-version = '2.2.6'
+version = '2.2.7'