esp32: Updated Pypytes scripts

esp32/frozen/Pybytes/_flash_control_OTA.py

@@ -1,25 +1,29 @@
 import os
+try:
+    from pybytes_debug import print_debug
+except:
+    from _pybytes_debug import print_debug
 
 class FCOTA:
     def __init__(self):
         pass
 
     def update_file_content(self, path, newContent):
-        print('Updating file [{}]'.format(path))
+        print_debug(2, 'Updating file [{}]'.format(path))
 
         if '.' in path:
             f = open(path, 'w')
             f.write(newContent)
             f.close()
-            print('File updated')
+            print_debug(2, 'File updated')
             return True
         else:
-            print('Cannot write into a folder')
+            print_debug(2, 'Cannot write into a folder')
 
         return False
 
     def delete_file(self, path):
-        print('FCOTA deleting file [{}]'.format(path))
+        print_debug(2, 'FCOTA deleting file [{}]'.format(path))
         try:
             if ('.' in path):
                 os.remove(path)
@@ -42,10 +46,10 @@ def delete_file(self, path):
                                     os.rmdir(elem)
                         maxDepth -= 1
                 else:
-                    print('targetedFiles empty, no file to delete')
+                    print_debug(2, 'targetedFiles empty, no file to delete')
             return True
         except Exception as ex:
-            print('FCOTA file deletion failed: {}'.format(ex))
+            print_debug(2, 'FCOTA file deletion failed: {}'.format(ex))
             return False
 
     def convert_bytes(self, num):
@@ -55,15 +59,15 @@ def convert_bytes(self, num):
             num /= 1024.0
 
     def get_file_size(self, path):
-        print('FCOTA getting file infos [{}]'.format(path))
+        print_debug(2, 'FCOTA getting file infos [{}]'.format(path))
         if '.' in path:
             fileInfo = os.stat(path)
-            print (fileInfo)
+            print_debug(2, 'printing fileInfo tupple: ' + str(fileInfo))
             return self.convert_bytes(fileInfo[6])
         return 'Unknown'
 
     def get_file_content(self, path):
-        print('FCOTA reading file [{}]'.format(path))
+        print_debug(2, 'FCOTA reading file [{}]'.format(path))
 
         if '.' in path:
             f = open(path, 'r')
@@ -72,8 +76,8 @@ def get_file_content(self, path):
         else:
             content = 'folder: {}'.format(path)
 
-        # print('encoding content')
-        # print(hexlify(content))
+        # print_debug(2, 'encoding content')
+        # print_debug(2, hexlify(content))
         # content = hexlify(content)
 
         return content

esp32/frozen/Pybytes/_main.py

@@ -70,7 +70,7 @@
         # SEND VIRTUAL VALUE
         # You can currently send Strings, Int32, Float32 and Tuples to pybytes using this method.
         # Soon you will be able to send Coordinates, Longs, Unsigned numerical types, and more.
-        # pybytes.send_virtual_pin_value(False, pin, value)
+        # pybytes.send_signal(pin, value)
 
         # SEND SENSOR DATA THROUGH VIRTUAL PINS
         # # If you use a Pysense, some libraries are necessary to access its sensors
@@ -90,9 +90,9 @@
         # # Define your thread's behaviour, here it's a loop sending sensors data every 10 seconds
         # def send_env_data():
         #     while (pybytes):
-        #         pybytes.send_virtual_pin_value(False, 1, si.humidity())
-        #         pybytes.send_virtual_pin_value(False, 2, si.temperature())
-        #         pybytes.send_virtual_pin_value(False, 3, ltr.light());
+        #         pybytes.send_signal(1, si.humidity())
+        #         pybytes.send_signal(2, si.temperature())
+        #         pybytes.send_signal(3, ltr.light());
         #         sleep(10)
         #
         # # Start your thread

esp32/frozen/Pybytes/_pybytes.py

@@ -21,7 +21,6 @@ class __PERIODICAL_PIN:
     TYPE_VIRTUAL = 2
 
     def __init__(self, persistent, pin_number, message_type, message, pin_type):
-        self.persistent = persistent
         self.pin_number = pin_number
         self.message_type = message_type
         self.message = message
@@ -72,13 +71,13 @@ def connect_lora_otta(self, timeout=15, nanogateway=False):
         return self.__pybytes_connection.connect_lora_otta(timeout, nanogateway)
 
     def connect_sigfox(self):
-        self.__pybytes_connection.connect_sigfox()
+        return self.__pybytes_connection.connect_sigfox()
 
     def disconnect(self):
         self.__pybytes_connection.disconnect()
 
     def send_custom_message(self, persistent, message_type, message):
-        self.__pybytes_connection.__pybytes_protocol.send_user_message(persistent, message_type, message)
+        self.__pybytes_connection.__pybytes_protocol.send_user_message(message_type, message)
 
     def set_custom_message_callback(self, callback):
         self.__custom_message_callback = callback
@@ -93,24 +92,33 @@ def send_scan_info_message(self):
         self.__pybytes_connection.__pybytes_protocol.send_scan_info_message(None)
 
     def send_digital_pin_value(self, persistent, pin_number, pull_mode):
-        self.__pybytes_connection.__pybytes_protocol.send_pybytes_digital_value(persistent, pin_number, pull_mode)
+        self.__pybytes_connection.__pybytes_protocol.send_pybytes_digital_value(pin_number, pull_mode)
 
     def send_analog_pin_value(self, persistent, pin):
-        self.__pybytes_connection.__pybytes_protocol.send_pybytes_analog_value(persistent, pin)
+        self.__pybytes_connection.__pybytes_protocol.send_pybytes_analog_value(pin)
+
+    def send_signal(self, pin, value):
+        self.__pybytes_connection.__pybytes_protocol.send_pybytes_custom_method_values(pin, [value])
 
     def send_virtual_pin_value(self, persistent, pin, value):
-        self.__pybytes_connection.__pybytes_protocol.send_pybytes_custom_method_values(persistent, pin, [value])
+        print("This function is deprecated and will be removed in the future. Use send_signal(signalNumber, value)")
+        self.send_signal(pin, [value])
+
+    def __periodical_pin_callback(self, periodical_pin):
+         if (periodical_pin.pin_type == __PERIODICAL_PIN.TYPE_DIGITAL):
+            self.send_digital_pin_value(periodical_pin.persistent, periodical_pin.pin_number, None)
+         elif (periodical_pin.pin_type == __PERIODICAL_PIN.TYPE_ANALOG):
+             self.send_analog_pin_value(periodical_pin.persistent, periodical_pin.pin_number)
 
     def register_periodical_digital_pin_publish(self, persistent, pin_number, pull_mode, period):
-        self.send_digital_pin_value(persistent, pin_number, pull_mode)
-        periodical_pin = __PERIODICAL_PIN(persistent, pin_number, None, None,
+        self.send_digital_pin_value(pin_number, pull_mode)
+        periodical_pin = __PERIODICAL_PIN(pin_number, None, None,
                                           __PERIODICAL_PIN.TYPE_DIGITAL)
         Timer.Alarm(self.__periodical_pin_callback, period, arg=periodical_pin, periodic=True)
 
-    def register_periodical_analog_pin_publish(self, persistent, pin_number, period):
-        self.send_analog_pin_value(persistent, pin_number)
-        periodical_pin = __PERIODICAL_PIN(persistent, pin_number, None, None,
-                                          __PERIODICAL_PIN.TYPE_ANALOG)
+    def register_periodical_analog_pin_publish(self, pin_number, period):
+        self.send_analog_pin_value(pin_number)
+        periodical_pin = __PERIODICAL_PIN(pin_number, None, None, __PERIODICAL_PIN.TYPE_ANALOG)
         Timer.Alarm(self.__periodical_pin_callback, period, arg=periodical_pin, periodic=True)
 
     def add_custom_method(self, method_id, method):
@@ -126,12 +134,6 @@ def send_battery_level(self, battery_level):
     def send_custom_location(self, pin, x, y):
         self.__pybytes_connection.__pybytes_protocol.send_custom_location(pin, x, y)
 
-    def __periodical_pin_callback(self, periodical_pin):
-        if (periodical_pin.pin_type == __PERIODICAL_PIN.TYPE_DIGITAL):
-            self.send_digital_pin_value(periodical_pin.persistent, periodical_pin.pin_number, None)
-        elif (periodical_pin.pin_type == __PERIODICAL_PIN.TYPE_ANALOG):
-            self.send_analog_pin_value(periodical_pin.persistent, periodical_pin.pin_number)
-
     def __recv_message(self, message):
         if self.__custom_message_callback is not None:
             self.__custom_message_callback(message)

esp32/frozen/Pybytes/_pybytes_ca.py

@@ -1,42 +1,4 @@
 PYBYTES_CA = """-----BEGIN CERTIFICATE-----
-MIIGnTCCBYWgAwIBAgISA3b4lLk2NubwPvU+nkbtPlWpMA0GCSqGSIb3DQEBCwUA
-MEoxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MSMwIQYDVQQD
-ExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYMzAeFw0xODA1MDcxNTA0MDhaFw0x
-ODA4MDUxNTA0MDhaMCMxITAfBgNVBAMTGHB5Ynl0ZXMtc3RhZ2luZy5weWNvbS5p
-bzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMCDieKlQiREjtCCSfix
-41Jt5sSRDLkueZuV7Z4Hq1dqp+bU6ZMQdNkWoteHO2ZTt9LmsiWbE+FRIt9PsOcM
-M4v4biauJ4chTg3SBcaAA6VdX6pY3ETUCH/Sz7CXlBenVjnVGHUsyVdJF185I95i
-In+96WwePLXr+tcaI0lxkff9WFUXl0kMQ1G/xwiL7bjjYsBPDm/kJtvSEOd6AlTQ
-iTuHeK5V9QHs31gOPQxhxEBTUJE5Jm8w7u10WxAvTQzgliZJDDsOYvjg4hyoy4yK
-ZDEK8LJ8rgb6wIY1TdqQip2bNgv6DLhSNz5i33DgjhXRYEXiQkvtJbtYF1umx581
-JckCAwEAAaOCA6IwggOeMA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEF
-BQcDAQYIKwYBBQUHAwIwDAYDVR0TAQH/BAIwADAdBgNVHQ4EFgQUmpYy+thsOVlN
-H5LbIaHCiJ445MIwHwYDVR0jBBgwFoAUqEpqYwR93brm0Tm3pkVl7/Oo7KEwbwYI
-KwYBBQUHAQEEYzBhMC4GCCsGAQUFBzABhiJodHRwOi8vb2NzcC5pbnQteDMubGV0
-c2VuY3J5cHQub3JnMC8GCCsGAQUFBzAChiNodHRwOi8vY2VydC5pbnQteDMubGV0
-c2VuY3J5cHQub3JnLzCBpAYDVR0RBIGcMIGZghxhcGkucHlieXRlcy1zdGFnaW5n
-LnB5Y29tLmlvgh1tcXR0LnB5Ynl0ZXMtc3RhZ2luZy5weWNvbS5pb4IfcHlhdXRo
-LnB5Ynl0ZXMtc3RhZ2luZy5weWNvbS5pb4IfcHliaWxsLnB5Ynl0ZXMtc3RhZ2lu
-Zy5weWNvbS5pb4IYcHlieXRlcy1zdGFnaW5nLnB5Y29tLmlvMIH+BgNVHSAEgfYw
-gfMwCAYGZ4EMAQIBMIHmBgsrBgEEAYLfEwEBATCB1jAmBggrBgEFBQcCARYaaHR0
-cDovL2Nwcy5sZXRzZW5jcnlwdC5vcmcwgasGCCsGAQUFBwICMIGeDIGbVGhpcyBD
-ZXJ0aWZpY2F0ZSBtYXkgb25seSBiZSByZWxpZWQgdXBvbiBieSBSZWx5aW5nIFBh
-cnRpZXMgYW5kIG9ubHkgaW4gYWNjb3JkYW5jZSB3aXRoIHRoZSBDZXJ0aWZpY2F0
-ZSBQb2xpY3kgZm91bmQgYXQgaHR0cHM6Ly9sZXRzZW5jcnlwdC5vcmcvcmVwb3Np
-dG9yeS8wggEEBgorBgEEAdZ5AgQCBIH1BIHyAPAAdgDbdK/uyynssf7KPnFtLOW5
-qrs294Rxg8ddnU83th+/ZAAAAWM7WIwtAAAEAwBHMEUCIFO9bdPIus2/A+bhyCYJ
-cff90BleBnbnAnfKejQRzw1hAiEAnRdZTFldte+TyLHOYElw4gFpAyPub4AO23S2
-HL3y3TMAdgApPFGWVMg5ZbqqUPxYB9S3b79Yeily3KTDDPTlRUf0eAAAAWM7WIw6
-AAAEAwBHMEUCIQDvU06t24rrMpfoIF/xCSG5rApExjlsuMA8kAmM2RFsfAIgKckY
-46YiHt15bWJc5SBiwLLXsuffSgQTJrCbGggekFEwDQYJKoZIhvcNAQELBQADggEB
-ABgGRT2VTT2KuyCEn8T0MpBKlpDoSvzneMPjxevAfRvqVUIteyc3u/0yXhmnuWJo
-SKFic6r9wX1tGlN6aGNGx4qp7Dtgc0NPQ84w6h/oVZPUyVS0bOu5/xHm3zLYWWHZ
-3N0cVos2ga1f4lyTr6kaOTsrI9bx0HUP9KWFPgl1vV8HrdTljT/IKkvY3s4X60vS
-0Tf5MyJOvAxuwEoJkNWke2GgVEpA17p/ZClQMMH3Vxy9NX/7m6L6rPqRSqe8ewmB
-nXny+jHmL2ii8xcPfU14Gn59FtFxngc1+mPjlHHqRdUFgZ9T40kKMMIBrvGohAtp
-PV/QhEH4ec1uPntPUgfZz7E=
------END CERTIFICATE-----
------BEGIN CERTIFICATE-----
 MIIEkjCCA3qgAwIBAgIQCgFBQgAAAVOFc2oLheynCDANBgkqhkiG9w0BAQsFADA/
 MSQwIgYDVQQKExtEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdCBDby4xFzAVBgNVBAMT
 DkRTVCBSb290IENBIFgzMB4XDTE2MDMxNzE2NDA0NloXDTIxMDMxNzE2NDA0Nlow
@@ -83,4 +45,5 @@
 JDGFoqgCWjBH4d1QB7wCCZAA62RjYJsWvIjJEubSfZGL+T0yjWW06XyxV3bqxbYo
 Ob8VZRzI9neWagqNdwvYkQsEjgfbKbYK7p2CNTUQ
 -----END CERTIFICATE-----
+
 """

esp32/frozen/Pybytes/_pybytes_connection.py

@@ -275,25 +275,27 @@ def connect_sigfox(self):
         except:
             print("This device does not support Sigfox connections")
             return
-        sigfox_config = self.__conf.get('sigfox')
-        if sigfox_config is not None and sigfox_config.get('RCZ') is not None:
-            try:
-                sf_rcz = int(sigfox_config.get('RCZ',0)) - 1
-                if sf_rcz >= 1 and sf_rcz <= 4:
-                    sigfox = Sigfox(mode=Sigfox.SIGFOX, rcz=sf_rcz)
-                    self.__sigfox_socket = socket.socket(socket.AF_SIGFOX, socket.SOCK_RAW)
-                    self.__sigfox_socket.setblocking(True)
-                    self.__sigfox_socket.setsockopt(socket.SOL_SIGFOX, socket.SO_RX, False)
-                    self.__pybytes_library.set_network_type(constants.__NETWORK_TYPE_SIGFOX)
-                    self.__network_type = constants.__NETWORK_TYPE_SIGFOX
-                    self.__connection_status = constants.__CONNECTION_STATUS_CONNECTED_SIGFOX
-                    print("Connected using Sigfox. Only upload stream is supported")
-                else:
-                    print('Invalid Sigfox RCZ specified in config!')
-            except Exception as e:
-                print('Exception in connect_sigfox: {}'.format(e))
-        else:
-            print('Invalid Sigfox RCZ specified in config!')
+        sigfox_config = self.__conf.get('sigfox', {})
+        if sigfox_config is None or sigfox_config.get('RCZ') is None:
+            print(constants.__SIGFOX_WARNING)
+        try:
+            sf_rcz = int(sigfox_config.get('RCZ', 1)) - 1
+            if sf_rcz >= 0 and sf_rcz <= 3:
+                sigfox = Sigfox(mode=Sigfox.SIGFOX, rcz=sf_rcz)
+                self.__sigfox_socket = socket.socket(socket.AF_SIGFOX, socket.SOCK_RAW)
+                self.__sigfox_socket.setblocking(True)
+                self.__sigfox_socket.setsockopt(socket.SOL_SIGFOX, socket.SO_RX, False)
+                self.__network_type = constants.__NETWORK_TYPE_SIGFOX
+                self.__connection_status = constants.__CONNECTION_STATUS_CONNECTED_SIGFOX
+                self.__pybytes_protocol.start_Sigfox(self)
+                print("Connected using Sigfox. Only upload stream is supported")
+                return True
+            else:
+                print('Invalid Sigfox RCZ specified in config!')
+                return False
+        except Exception as e:
+            print('Exception in connect_sigfox: {}'.format(e))
+            return False
 
     # COMMON
     def disconnect(self):

esp32/frozen/Pybytes/_pybytes_constants.py

@@ -5,6 +5,11 @@ class constants:
     __NETWORK_TYPE_SIGFOX = 2
     __NETWORK_TYPE_LTE = 3
 
+    __INTEGER = 0
+    __FLOAT = 1
+    __TUPLE = 2
+    __STRING = 3
+
     __CONNECTION_STATUS_DISCONNECTED = 0
     __CONNECTION_STATUS_CONNECTED_MQTT_WIFI = 1
     __CONNECTION_STATUS_CONNECTED_MQTT_LTE = 2
@@ -53,7 +58,10 @@ class constants:
 
     __WIFI_NETWORK_FORMAT = ">6sBb"  # {"ssid":"%s", "mac_addr":"%s", "channel":"%s", "power":"%s"}
 
-    __USER_SYSTEM_MASK = 0x80
-    __PERSISTENT_MASK = 0x40
+    # __USER_SYSTEM_MASK = 0x80
     __NETWORK_TYPE_MASK = 0x30
     __TYPE_MASK = 0xF
+
+    __SIGFOX_WARNING = """WARNING! Your sigfox radio configuration (RC) is currently using the default (1)
+You can set your RC with command (ex: RC 3): pybytes.set_config('sigfox', {'RCZ': 3})
+See all available zone options for RC at https://support.sigfox.com/docs/radio-configuration """