Merge pull request pycom#158 from pycom/pybytes_1.5.2

[pybytes] updated to v1.5.2 (pymesh BR fix)

Author: Catalin Ioana

esp32/frozen/Pybytes/_OTA.py

@@ -62,8 +62,11 @@ def get_update_manifest(self, fwtype=None, token=None):
         sysname = os.uname().sysname
         wmac = hexlify(machine.unique_id()).decode('ascii')
         if fwtype == 'pymesh':
-            request_template = "manifest.json?current_ver={}&sysname={}&token={}&ota_slot={}&wmac={}&fwtype={}"
-            req = request_template.format(current_version, sysname, token, hex(pycom.ota_slot()), wmac.upper(), fwtype)
+            request_template = "manifest.json?current_ver={}&sysname={}&token={}&ota_slot={}&wmac={}&fwtype={}&current_fwtype={}"
+            req = request_template.format(current_version, sysname, token, hex(pycom.ota_slot()), wmac.upper(), fwtype, 'pymesh' if hasattr(os.uname(),'pymesh') else 'pybytes')
+        elif fwtype == 'pygate':
+            request_template = "manifest.json?current_ver={}&sysname={}&ota_slot={}&wmac={}&fwtype={}&current_fwtype={}"
+            req = request_template.format(current_version, sysname, hex(pycom.ota_slot()), wmac.upper(), fwtype, 'pygate' if hasattr(os.uname(),'pygate') else 'pybytes')
         else:
             request_template = "manifest.json?current_ver={}&sysname={}&wmac={}&ota_slot={}"
             req = request_template.format(current_version, sysname, wmac, hex(pycom.ota_slot()))

esp32/frozen/Pybytes/_pybytes_connection.py

@@ -173,7 +173,7 @@ def connect_lte(self, activation_info=False, start_mqtt=True):
             self.__initialise_watchdog()
 
         if lte_cfg is not None:
-            if (os.uname()[0] not in ['FiPy', 'GPy']):
+            if (os.uname().sysname not in ['FiPy', 'GPy']):
                 print("You need a device with FiPy or GPy firmware to connect via LTE") # noqa
                 return False
             try:

esp32/frozen/Pybytes/_pybytes_constants.py

@@ -105,6 +105,10 @@ class constants:
     __DEVICE_TYPE_LOPY_4 = 0x04
     __DEVICE_TYPE_UNKNOWN = 0x05
 
+    __FWTYPE_DEFAULT = 0x00
+    __FWTYPE_PYMESH = 0x01
+    __FWTYPE_PYGATE = 0x02
+
     # {"ssid":"%s", "mac_addr":"%s", "channel":"%s", "power":"%s"}
     __WIFI_NETWORK_FORMAT = ">6sBb"
 

esp32/frozen/Pybytes/_pybytes_library.py

@@ -86,9 +86,18 @@ def pack_info_message(self, releaseVersion=None):
         body.append((release >> 8) & 0xFF)
         body.append(release & 0xFF)
 
-        if releaseVersion is not None:
-            body.append((releaseVersion >> 8) & 0xFF)
-            body.append(releaseVersion & 0xFF)
+        if releaseVersion is None:
+            releaseVersion = 0
+
+        body.append((releaseVersion >> 8) & 0xFF)
+        body.append(releaseVersion & 0xFF)
+
+        if hasattr(os.uname(), 'pymesh'):
+            body.append(constants.__FWTYPE_PYMESH)
+        elif hasattr(os.uname(), 'pygate'):
+            body.append(constants.__FWTYPE_PYGATE)
+        else:
+            body.append(constants.__FWTYPE_DEFAULT)
 
         return self.__pack_message(constants.__TYPE_INFO, body)
 

esp32/frozen/Pybytes/_pybytes_pymesh_config.py

@@ -53,13 +53,6 @@ def pymesh_init(self):
         # initialize Pymesh
         self.__pymesh = Pymesh(self.__pymesh_config, self.pymesh_new_message_cb)
 
-        while not self.__pymesh.is_connected():
-            print(self.__pymesh.status_str())
-            time.sleep(3)
-
-        # send message to the Node having MAC address 5
-        self.__pymesh.send_mess(2, "Hello World")
-        print("Done Pymesh init, forever loop, exit/stop with Ctrl+C multiple times")
         self.__pymesh_br_enabled = False
 
         if self.__pymesh_config.get("br_ena", False):
@@ -69,8 +62,6 @@ def pymesh_init(self):
                     print_debug(99, "Set as border router")
                     self.__pymesh.br_set(PymeshConfig.BR_PRIORITY_NORM, self.pymesh_new_br_message_cb)
 
-                self.__pybytes.send_signal(1, str(self.__pymesh.mac()) + " : " + str(time.time()) + "s, " + str(pycom.get_free_heap()))
-                print_debug(99, "Send to Pyb,", pycom.get_free_heap())
             else:  # not connected anymore to pybytes
                 if self.__pymesh_br_enabled:
                     self.__pymesh_br_enabled = False
@@ -88,8 +79,13 @@ def unpack_pymesh_message(self, signal_number, value):
             pyb_ip = '1:2:3::' + hex(pyb_port)[2:]
             pkt_start = self.__pack_tocken_prefix + self.__pack_tocken_sep + deviceID + self.__pack_tocken_sep
 
-            self.__pymesh.send_mess_external(pyb_ip, pyb_port, pkt_start + monitoringData)
-            self.__pymesh.send_mess_external(pyb_ip, pyb_port, pkt_start + value)
+            # send data to the port equal with signal_number
+            self.__pymesh.send_mess_external(pyb_ip, signal_number, pkt_start + value)
+            
+            time.sleep(3) # shouldn't send too fast to BR
+
+            # hardcode monitoring data to be sent on signal #2
+            self.__pymesh.send_mess_external(pyb_ip, 2, pkt_start + monitoringData)
 
     def pymesh_new_message_cb(self, rcv_ip, rcv_port, rcv_data):
         ''' callback triggered when a new packet arrived '''
@@ -122,9 +118,11 @@ def pymesh_new_br_message_cb(self, rcv_ip, rcv_port, rcv_data, dest_ip, dest_por
             if len(x) > 2:
                 token = x[1]
                 rcv_data = rcv_data[len(self.__pack_tocken_prefix) + len(token) + len(self.__pack_tocken_sep):]
-        pkt = 'BR %d B from %s (%s), to %s ( %d): %s' % (len(rcv_data), token, rcv_ip, dest_ip, dest_port, str(rcv_data))
-        print_debug(99, 'Pymesh node packet: {} '.format(pkt))
-        self.__pybytes.send_node_signal(1, str(rcv_data.decode()).replace("#", ""), token.decode())
+
+                # send data to Pybytes only if it's coded properly
+                pkt = 'BR %d B from %s (%s), to %s ( %d): %s' % (len(rcv_data), token, rcv_ip, dest_ip, dest_port, str(rcv_data))
+                print_debug(99, 'Pymesh node packet: {} '.format(pkt))
+                self.__pybytes.send_node_signal(dest_port & 0xFF, str(rcv_data.decode()).replace("#", ""), token.decode())
         return
 
     def get_config(self, token, silent=False):

esp32/pycom_version.h

@@ -17,7 +17,7 @@
 #define SIGFOX_VERSION_NUMBER                          "1.0.1"
 
 #if (VARIANT == PYBYTES)
-#define PYBYTES_VERSION_NUMBER                         "1.5.0"
+#define PYBYTES_VERSION_NUMBER                         "1.5.2"
 #endif
 
 #ifdef PYGATE_ENABLED