pycom · peter-pycom · Oct 27, 2021 · Nov 23, 2020 · Nov 23, 2020 · Nov 23, 2020
diff --git a/drivers/sx127x/sx1272/sx1272.c b/drivers/sx127x/sx1272/sx1272.c
@@ -1,7 +1,7 @@
 /*
  * This file is derived from the MicroPython project, http://micropython.org/
  *
- * Copyright (c) 2020, Pycom Limited and its licensors.
+ * Copyright (c) 2021, Pycom Limited and its licensors.
  *
  * This software is licensed under the GNU GPL version 3 or any later version,
  * with permitted additional terms. For more information see the Pycom Licence

diff --git a/drivers/sx127x/sx1276/sx1276.c b/drivers/sx127x/sx1276/sx1276.c
@@ -1,7 +1,7 @@
 /*
  * This file is derived from the MicroPython project, http://micropython.org/
  *
- * Copyright (c) 2020, Pycom Limited and its licensors.
+ * Copyright (c) 2021, Pycom Limited and its licensors.
  *
  * This software is licensed under the GNU GPL version 3 or any later version,
  * with permitted additional terms. For more information see the Pycom Licence

diff --git a/drivers/sx1308/sx1308-config.h b/drivers/sx1308/sx1308-config.h
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (c) 2020, Pycom Limited.
+ * Copyright (c) 2021, Pycom Limited.
  *
  * This software is licensed under the GNU GPL version 3 or any
  * later version, with permitted additional terms. For more information

diff --git a/drivers/sx1308/sx1308-spi.c b/drivers/sx1308/sx1308-spi.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Pycom Limited.
+ * Copyright (c) 2021, Pycom Limited.
  *
  * This software is licensed under the GNU GPL version 3 or any
  * later version, with permitted additional terms. For more information
@@ -9,7 +9,7 @@
 /*
  * This file is derived from the MicroPython project, http://micropython.org/
  *
- * Copyright (c) 2018, Pycom Limited and its licensors.
+ * Copyright (c) 2021, Pycom Limited and its licensors.
  *
  * This software is licensed under the GNU GPL version 3 or any later version,
  * with permitted additional terms. For more information see the Pycom Licence

diff --git a/drivers/sx1308/sx1308-spi.h b/drivers/sx1308/sx1308-spi.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Pycom Limited.
+ * Copyright (c) 2021, Pycom Limited.
  *
  * This software is licensed under the GNU GPL version 3 or any
  * later version, with permitted additional terms. For more information
@@ -9,7 +9,7 @@
 /*
  * This file is derived from the MicroPython project, http://micropython.org/
  *
- * Copyright (c) 2018, Pycom Limited and its licensors.
+ * Copyright (c) 2021, Pycom Limited and its licensors.
  *
  * This software is licensed under the GNU GPL version 3 or any later version,
  * with permitted additional terms. For more information see the Pycom Licence

diff --git a/drivers/sx1308/sx1308.c b/drivers/sx1308/sx1308.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Pycom Limited.
+ * Copyright (c) 2021, Pycom Limited.
  *
  * This software is licensed under the GNU GPL version 3 or any
  * later version, with permitted additional terms. For more information

diff --git a/drivers/sx1308/sx1308.h b/drivers/sx1308/sx1308.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Pycom Limited.
+ * Copyright (c) 2021, Pycom Limited.
  *
  * This software is licensed under the GNU GPL version 3 or any
  * later version, with permitted additional terms. For more information
@@ -9,7 +9,7 @@
 /*
  * This file is derived from the MicroPython project, http://micropython.org/
  *
- * Copyright (c) 2018, Pycom Limited and its licensors.
+ * Copyright (c) 2021, Pycom Limited and its licensors.
  *
  * This software is licensed under the GNU GPL version 3 or any later version,
  * with permitted additional terms. For more information see the Pycom Licence

diff --git a/esp32/Makefile b/esp32/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright © 2020, Pycom Limited.
+# Copyright © 2021, Pycom Limited.
 #
 # This software is licensed under the GNU GPL version 3 or any
 # later version, with permitted additional terms. For more information

diff --git a/esp32/app_sys_evt.h b/esp32/app_sys_evt.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, Pycom Limited.
+ * Copyright (c) 2021, Pycom Limited.
  *
  * This software is licensed under the GNU GPL version 3 or any
  * later version, with permitted additional terms. For more information

diff --git a/esp32/application.mk b/esp32/application.mk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2020, Pycom Limited.
+# Copyright (c) 2021, Pycom Limited.
 #
 # This software is licensed under the GNU GPL version 3 or any
 # later version, with permitted additional terms. For more information

diff --git a/esp32/boards/FIPY/mpconfigboard.h b/esp32/boards/FIPY/mpconfigboard.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Pycom Limited.
+ * Copyright (c) 2021, Pycom Limited.
  *
  * This software is licensed under the GNU GPL version 3 or any
  * later version, with permitted additional terms. For more information

diff --git a/esp32/boards/GPY/mpconfigboard.h b/esp32/boards/GPY/mpconfigboard.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Pycom Limited.
+ * Copyright (c) 2021, Pycom Limited.
  *
  * This software is licensed under the GNU GPL version 3 or any
  * later version, with permitted additional terms. For more information

diff --git a/esp32/boards/LOPY/mpconfigboard.h b/esp32/boards/LOPY/mpconfigboard.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Pycom Limited.
+ * Copyright (c) 2021, Pycom Limited.
  *
  * This software is licensed under the GNU GPL version 3 or any
  * later version, with permitted additional terms. For more information

diff --git a/esp32/boards/LOPY4/mpconfigboard.h b/esp32/boards/LOPY4/mpconfigboard.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Pycom Limited.
+ * Copyright (c) 2021, Pycom Limited.
  *
  * This software is licensed under the GNU GPL version 3 or any
  * later version, with permitted additional terms. For more information

diff --git a/esp32/boards/SIPY/mpconfigboard.h b/esp32/boards/SIPY/mpconfigboard.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Pycom Limited.
+ * Copyright (c) 2021, Pycom Limited.
  *
  * This software is li
10000
censed under the GNU GPL version 3 or any
  * later version, with permitted additional terms. For more information

diff --git a/esp32/boards/WIPY/mpconfigboard.h b/esp32/boards/WIPY/mpconfigboard.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Pycom Limited.
+ * Copyright (c) 2021, Pycom Limited.
  *
  * This software is licensed under the GNU GPL version 3 or any
  * later version, with permitted additional terms. For more information

diff --git a/esp32/boards/esp32_prefix.c b/esp32/boards/esp32_prefix.c
@@ -1,7 +1,7 @@
 /*
  * This file is derived from the MicroPython project, http://micropython.org/
  *
- * Copyright (c) 2020, Pycom Limited and its licensors.
+ * Copyright (c) 2021, Pycom Limited and its licensors.
  *
  * This software is licensed under the GNU GPL version 3 or any later version,
  * with permitted additional terms. For more information see the Pycom Licence

diff --git a/esp32/boards/make-pins.py b/esp32/boards/make-pins.py
@@ -2,7 +2,7 @@
 
 # This file is derived from the MicroPython project, http://micropython.org/
 #
-# Copyright (c) 2020, Pycom Limited and its licensors.
+# Copyright (c) 2021, Pycom Limited and its licensors.
 #
 # This software is licensed under the GNU GPL version 3 or any later version,
 # with permitted additional terms. For more information see the Pycom Licence

diff --git a/esp32/bootloader/bootmgr.c b/esp32/bootloader/bootmgr.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Pycom Limited.
+ * Copyright (c) 2021, Pycom Limited.
  *
  * This software is licensed under the GNU GPL version 3 or any
  * later version, with permitted additional terms. For more information

diff --git a/esp32/bootloader/bootmgr.h b/esp32/bootloader/bootmgr.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Pycom Limited.
+ * Copyright (c) 2021, Pycom Limited.
  *
  * This software is licensed under the GNU GPL version 3 or any
  * later version, with permitted additional terms. For more information

diff --git a/esp32/bootloader/mperror.c b/esp32/bootloader/mperror.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Pycom Limited.
+ * Copyright (c) 2021, Pycom Limited.
  *
  * This software is licensed under the GNU GPL version 3 or any
  * later version, with permitted additional terms. For more information

diff --git a/esp32/fatfs/src/drivers/sd_diskio.c b/esp32/fatfs/src/drivers/sd_diskio.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Pycom Limited.
+ * Copyright (c) 2021, Pycom Limited.
  *
  * This software is licensed under the GNU GPL version 3 or any
  * later version, with permitted additional terms. For more information

diff --git a/esp32/fatfs/src/drivers/sd_diskio.h b/esp32/fatfs/src/drivers/sd_diskio.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Pycom Limited.
+ * Copyright (c) 2021, Pycom Limited.
  *
  * This software is licensed under the GNU GPL version 3 or any
  * later version, with permitted additional terms. For more information

diff --git a/esp32/frozen/LTE/sqnsbrz.py b/esp32/frozen/LTE/sqnsbrz.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2020, Pycom Limited.
+# Copyright (c) 2021, Pycom Limited.
 #
 # This software is licensed under the GNU GPL version 3 or any
 # later version, with permitted additional terms. For more information

diff --git a/esp32/frozen/LTE/sqnsupgrade.py b/esp32/frozen/LTE/sqnsupgrade.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 VERSION = "1.2.6"
 
-# Copyright (c) 2020, Pycom Limited.
+# Copyright (c) 2021, Pycom Limited.
 #
 # This software is licensed under the GNU GPL version 3 or any
 # later version, with permitted additional terms. For more information

diff --git a/esp32/frozen/Pybytes/_OTA.py b/esp32/frozen/Pybytes/_OTA.py
@@ -1,5 +1,5 @@
 '''
-Copyright (c) 2020, Pycom Limited.
+Copyright (c) 2021, Pycom Limited.
 This software is licensed under the GNU GPL version 3 or any
 later version, with permitted additional terms. For more information
 see the Pycom Licence v1.0 document supplied with this file, or
@@ -63,10 +63,12 @@ def get_update_manifest(self, fwtype=None, token=None):
         wmac = hexlify(machine.unique_id()).decode('ascii')
         if fwtype == 'pymesh':
             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')
+            current_fwtype = 'pymesh' if hasattr(os.uname(), 'pymesh') else 'pybytes'
+            req = request_template.format(current_version, sysname, token, hex(pycom.ota_slot()), wmac.upper(), fwtype, current_fwtype)
         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')
+            current_fwtype = 'pygate' if hasattr(os.uname(), 'pygate') else 'pybytes'
+            req = request_template.format(current_version, sysname, hex(pycom.ota_slot()), wmac.upper(), fwtype, current_fwtype)
         else:
             request_template = "manifest.json?current_ver={}&sysname={}&wmac={}&ota_slot={}"
             req = request_template.format(current_version, sysname, wmac, hex(pycom.ota_slot()))

diff --git a/esp32/frozen/Pybytes/_coap.py b/esp32/frozen/Pybytes/_coap.py
@@ -1,5 +1,5 @@
 '''
-Copyright (c) 2020, Pycom Limited.
+Copyright (c) 2021, Pycom Limited.
 This software is licensed under the GNU GPL version 3 or any
 later version, with permitted additional terms. For more information
 see the Pycom Licence v1.0 document supplied with this file, or

diff --git a/esp32/frozen/Pybytes/_flash_control_OTA.py b/esp32/frozen/Pybytes/_flash_control_OTA.py
@@ -1,5 +1,5 @@
 '''
-Copyright (c) 2020, Pycom Limited.
+Copyright (c) 2021, Pycom Limited.
 This software is licensed under the GNU GPL version 3 or any
 later version, with permitted additional terms. For more information
 see the Pycom Licence v1.0 document supplied with this file, or
@@ -17,10 +17,20 @@ class FCOTA:
     def __init__(self):
         pass
 
+    def is_folder(self, name):
+        try:
+            os.listdir(name)
+            return True
+        except:
+            return False
+
+    def is_file(self, name):
+        return not self.is_folder(name)
+
     def update_file_content(self, path, newContent):
         print_debug(2, 'Updating file [{}]'.format(path))
 
-        if '.' in path:
+        if self.is_file(path):
             listfDir = path.split('/')
             currentPath = '/'
             for value in listfDir:
@@ -34,7 +44,7 @@ def update_file_content(self, path, newContent):
                 # check if dir exists
                 if value not in parentList:
                     # create dir
-                    if '.' in currentPath:
+                    if self.is_file(currentPath):
                         continue
                     os.mkdir(currentPath)
 
@@ -52,7 +62,7 @@ def update_file_content(self, path, newContent):
     def delete_file(self, path):
         print_debug(2, 'FCOTA deleting file [{}]'.format(path))
         try:
-            if ('.' in path):
+            if self.is_file(path):
                 os.remove(path)
             else:
                 targetedFiles = []
@@ -67,7 +77,7 @@ def delete_file(self, path):
                     while maxDepth >= 0:
                         for elem in targetedFiles:
                             if elem.count('/') == maxDepth:
-                                if '.' in elem:
+                                if self.is_file(elem):
                                     os.remove(elem)
                                 else:
                                     os.rmdir(elem)
@@ -87,7 +97,7 @@ def convert_bytes(self, num):
 
     def get_file_size(self, path):
         print_debug(2, 'FCOTA getting file infos [{}]'.format(path))
-        if '.' in path:
+        if self.is_file(path):
             fileInfo = os.stat(path)
             print_debug(2, 'printing fileInfo tupple: ' + str(fileInfo))
             return self.convert_bytes(fileInfo[6])
@@ -96,7 +106,7 @@ def get_file_size(self, path):
     def get_file_content(self, path):
         print_debug(2, 'FCOTA reading file [{}]'.format(path))
 
-        if '.' in path:
+        if self.is_file(path):
             f = open(path, 'r')
             content = f.read()
             f.close()
@@ -113,7 +123,7 @@ def get_flash_hierarchy(self):
         hierarchy = os.listdir()
         folders = []
         for elem in hierarchy:
-            if '.' not in elem:
+            if self.is_folder(elem):
                 folders.append(elem)
 
         while len(folders) > 0:
@@ -130,7 +140,7 @@ def get_flash_hierarchy(self):
                         path = folders[i] + '/' + subFolders[j]
                         hierarchy.append(path)
 
-                        if '.' not in path:
+                        if self.is_folder(path):
                             foldersToCheck.append(path)
 
                         j += 1

diff --git a/esp32/frozen/Pybytes/_main_pybytes.py b/esp32/frozen/Pybytes/_main_pybytes.py
@@ -1,6 +1,6 @@
    
 '''
-Copyright (c) 2020, Pycom Limited.
+Copyright (c) 2021, Pycom Limited.
 This software is licensed under the GNU GPL version 3 or any
 later version, with permitted additional terms. For more information
 see the Pycom Licence v1.0 document supplied with this file, or
@@ -96,4 +96,4 @@
     # def custom_print(params):
     #     print("Custom method called")
     #     return [255, 20]
-    # pybytes.add_custom_method(0, custom_print)
+    # pybytes.add_custom_method(0, custom_print)
diff --git a/esp32/frozen/Pybytes/_mqtt.py b/esp32/frozen/Pybytes/_mqtt.py
@@ -1,5 +1,5 @@
 '''
-Copyright (c) 2020, Pycom Limited.
+Copyright (c) 2021, Pycom Limited.
 This software is licensed under the GNU GPL version 3 or any
 later version, with permitted additional terms. For more information
 see the Pycom Licence v1.0 document supplied with this file, or

diff --git a/esp32/frozen/Pybytes/_mqtt_core.py b/esp32/frozen/Pybytes/_mqtt_core.py
@@ -2,7 +2,7 @@
 umqtt is a simple MQTT client for MicroPython.
 Original code: https://github.com/micropython/micropython-lib/tree/master/umqtt.simple
 
-Copyright (c) 2020, Pycom Limited.
+Copyright (c) 2021, Pycom Limited.
 This software is licensed under the GNU GPL version 3 or any
 later version, with permitted additional terms. For more information
 see the Pycom Licence v1.0 document supplied with this file, or

diff --git a/esp32/frozen/Pybytes/_msg_handl.py b/esp32/frozen/Pybytes/_msg_handl.py
@@ -1,5 +1,5 @@
 '''
-Copyright (c) 2020, Pycom Limited.
+Copyright (c) 2021, Pycom Limited.
 This software is licensed under the GNU GPL version 3 or any
 later version, with permitted additional terms. For more information
 see the Pycom Licence v1.0 document supplied with this file, or
@@ -31,6 +31,7 @@ def __init__(
             receive_timeout=3000,
             reconnectMethod=None
     ):
+        print_debug(5, 'starting new MsgHandler')
         self._host = ""
         self._port = -1
         self._sock = None
@@ -152,7 +153,8 @@ def _receive_packet(self):
         try:
             self._sock.setblocking(False)
             msg_type = self._sock.recv(1)
-        except socket.error:
+        except socket.error as err:
+            print_debug(2, '_receive_packet() socket error: {}'.format(err))
             self.disconnect()
             self.reconnectMethod()
             return False
@@ -213,7 +215,7 @@ def _send_packet(self, packet):
                 else:
                     print_debug(2, 'Packet sent. (Length: %d)' % written)
         except socket.error as err:
-            print_debug(2, 'Socket send error {0}'.format(err))
+            print_debug(2, '_send_packet() socket error {0}'.format(err))
             return False
 
         return True if len(packet) == written else False