Update pybytes to 1.5.0 (#133)

Author: Xykon

esp32/frozen/Pybytes/_pybytes.py

@@ -273,16 +273,13 @@ def connect(self):
                     self.enable_terminal()
 
                 # CHECK PYMESH FIRMWARE VERSION
-                try:
-                    if os.uname().pymesh:
-                        try:
-                            from pybytes_pymesh_config import PybytesPymeshConfig
-                        except:
-                            from _pybytes_pymesh_config import PybytesPymeshConfig
-                        self.__pymesh = PybytesPymeshConfig(self)
-                        self.__pymesh.pymesh_init()
-                except Exception as e:
-                    print("Exception: {}".format(e))
+                if hasattr(os.uname(), 'pymesh'):
+                    try:
+                        from pybytes_pymesh_config import PybytesPymeshConfig
+                    except:
+                        from _pybytes_pymesh_config import PybytesPymeshConfig
+                    self.__pymesh = PybytesPymeshConfig(self)
+                    self.__pymesh.pymesh_init()
             else:
                 print('ERROR! Could not connect to Pybytes!')
 

esp32/frozen/Pybytes/_pybytes_constants.py

@@ -96,6 +96,7 @@ class constants:
     __FCOTA_COMMAND_FILE_UPDATE = 0x02
     __FCOTA_PING = 0x03
     __FCOTA_COMMAND_FILE_DELETE = 0x04
+    __FCOTA_COMMAND_FILE_UPDATE_NO_RESET = 0x05
 
     __DEVICE_TYPE_WIPY = 0x00
     __DEVICE_TYPE_LOPY = 0x01

esp32/frozen/Pybytes/_pybytes_protocol.py

@@ -276,6 +276,23 @@ def __process_recv_message(self, message):
                     else:
                         self.send_fcota_ping("file update failed!")
 
+                elif (command == constants.__FCOTA_COMMAND_FILE_UPDATE_NO_RESET):
+                    bodyString = body[1:len(body)].decode()
+                    splittedBody = bodyString.split(',')
+                    if (len(splittedBody) >= 2):
+                        path = splittedBody[0]
+                        print_debug(2, path[len(path)-7:len(path)])
+                        if (path[len(path)-7:len(path)] != '.pymakr'):
+                            self.send_fcota_ping('updating file...')
+                        newContent = bodyString[len(path)+1:len(body)]
+                        if (self.__FCOTA.update_file_content(path, newContent) is True): # noqa
+                            size = self.__FCOTA.get_file_size(path)
+                            self.send_fcota_file(newContent, path, size)
+                        else:
+                            self.send_fcota_ping('file update failed!')
+                    else:
+                        self.send_fcota_ping("file update failed!")
+
                 elif (command == constants.__FCOTA_PING):
                     self.send_fcota_ping('')
 

esp32/frozen/Pybytes/_pybytes_pymesh_config.py

@@ -150,7 +150,7 @@ def write_config(self, wmac, file='/flash/pymesh_config.json', pymeshSettings={}
                 "ble_api": False,
                 "ble_name_prefix": "Device-{}".format(wmac),
                 "br_prio": 0,
-                "br_ena": False,
+                "br_ena": customSettings["br_ena"],
                 "autostart": True
             }
 

esp32/pycom_version.h

@@ -17,7 +17,7 @@
 #define SIGFOX_VERSION_NUMBER                          "1.0.1"
 
 #if (VARIANT == PYBYTES)
-#define PYBYTES_VERSION_NUMBER                         "1.4.0"
+#define PYBYTES_VERSION_NUMBER                         "1.5.0"
 #endif
 
 #endif /* VERSION_H_ */