Merge pull request #441 from pycom/release_rc7_again

Release rc7 again

Author: Xykon

esp32/Makefile

@@ -14,7 +14,7 @@ ifeq ($(wildcard boards/$(BOARD)/.),)
     $(error Invalid BOARD specified)
 endif
 
-IDF_VERSION=3.3.1
+IDF_HASH=d072c55
 
 TARGET ?= boot_app
 

esp32/application.mk

@@ -186,6 +186,7 @@ APP_UTIL_SRC_C = $(addprefix util/,\
 	timeutils.c \
 	esp32chipinfo.c \
 	pycom_general_util.c \
+	str_utils.c \
 	)
 
 APP_FATFS_SRC_C = $(addprefix fatfs/src/,\
@@ -819,7 +820,7 @@ $(OBJ): | $(GEN_PINS_HDR)
 
 # Check Dependencies (IDF version, Frozen code and IDF LIBS)
 CHECK_DEP:
-	$(Q) bash tools/idfVerCheck.sh $(IDF_PATH) "$(IDF_VERSION)"
+	$(Q) bash tools/idfVerCheck.sh $(IDF_PATH) "$(IDF_HASH)"
 	$(Q) bash tools/mpy-build-check.sh $(BOARD) $(BTYPE) $(VARIANT)
 	$(Q) $(PYTHON) check_secure_boot.py --SECURE $(SECURE)
 ifeq ($(COPY_IDF_LIB), 1)

esp32/frozen/Pybytes/_OTA.py

@@ -57,20 +57,24 @@ def update_device_network_config(self, fcota, config):
     def get_current_version(self):
         return os.uname().release
 
-    def get_update_manifest(self):
+    def get_update_manifest(self, fwtype=None, token=None):
         current_version = self.get_current_version()
         sysname = os.uname().sysname
         wmac = hexlify(machine.unique_id()).decode('ascii')
-        request_template = "manifest.json?current_ver={}&sysname={}&wmac={}&ota_slot={}"
-        req = request_template.format(current_version, sysname, wmac, hex(pycom.ota_slot()))
+        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)
+        else:
+            request_template = "manifest.json?current_ver={}&sysname={}&wmac={}&ota_slot={}"
+            req = request_template.format(current_version, sysname, wmac, hex(pycom.ota_slot()))
         manifest_data = self.get_data(req).decode()
         manifest = ujson.loads(manifest_data)
         gc.collect()
         return manifest
 
-    def update(self, customManifest=None):
+    def update(self, customManifest=None, fwtype=None, token=None):
         try:
-            manifest = self.get_update_manifest() if not customManifest else customManifest
+            manifest = self.get_update_manifest(fwtype, token) if not customManifest else customManifest
         except Exception as e:
             print('Error reading the manifest, aborting: {}'.format(e))
             return 0
@@ -240,7 +244,6 @@ def get_data(self, req, dest_path=None, hash=False, firmware=False):
                 fp = open(dest_path, 'wb')
 
             if firmware:
-                print('start')
                 pycom.ota_start()
 
             h = uhashlib.sha1()

esp32/frozen/Pybytes/_coap.py

@@ -0,0 +1,36 @@
+'''
+Copyright (c) 2020, 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
+available at https://www.pycom.io/opensource/licensing
+'''
+
+from network import WLAN
+from network import Coap
+# import uselect
+# import _thread
+# import machine
+
+
+class COAPClient():
+    def __init__(self, target_server, port):
+        self.__coap_server = target_server
+        self.__coap_server_port = port
+
+        wlan = WLAN(mode=WLAN.STA)
+        self.__device_ip = wlan.ifconfig()[0]
+
+        Coap.init(str(wlan.ifconfig()[0]), service_discovery=False)
+
+    def send_coap_message(self, message, method, uri_path, token, include_options=True):
+        message_id = Coap.send_request(
+            self.__coap_server,
+            method,
+            uri_port=int(self.__coap_server_port),
+            uri_path=uri_path,
+            payload=message,
+            token=token,
+            include_options=include_options
+        )
+        return message_id

esp32/frozen/Pybytes/_periodical_pin.py

@@ -0,0 +1,20 @@
+'''
+Copyright (c) 2020, 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
+available at https://www.pycom.io/opensource/licensing
+'''
+
+
+class PeriodicalPin:
+
+    TYPE_DIGITAL = 0
+    TYPE_ANALOG = 1
+    TYPE_VIRTUAL = 2
+
+    def __init__(self, persistent, pin_number, message_type, message, pin_type):
+        self.pin_number = pin_number
+        self.message_type = message_type
+        self.message = message
+        self.pin_type = pin_type