pycom
diff --git a/‎esp32/application.mk
Lines changed: 21 additions & 9 deletions b/‎esp32/application.mk
Lines changed: 21 additions & 9 deletions
diff --git a/‎esp32/bootloader/lib/libbootloader_support.a
0 Bytes b/‎esp32/bootloader/lib/libbootloader_support.a
0 Bytes
diff --git a/‎esp32/bootloader/lib/liblog.a
0 Bytes b/‎esp32/bootloader/lib/liblog.a
0 Bytes
diff --git a/‎esp32/bootloader/lib/libmicro-ecc.a
0 Bytes b/‎esp32/bootloader/lib/libmicro-ecc.a
0 Bytes
diff --git a/‎esp32/bootloader/lib/libsoc.a
0 Bytes b/‎esp32/bootloader/lib/libsoc.a
0 Bytes
diff --git a/‎esp32/bootloader/lib/libspi_flash.a
0 Bytes b/‎esp32/bootloader/lib/libspi_flash.a
0 Bytes
diff --git a/‎esp32/frozen/Common/MQTTMsgHandler.py
Lines changed: 4 additions & 1 deletion b/‎esp32/frozen/Common/MQTTMsgHandler.py
Lines changed: 4 additions & 1 deletion
diff --git a/‎esp32/frozen/Pybytes/_main.py
Lines changed: 3 additions & 4 deletions b/‎esp32/frozen/Pybytes/_main.py
Lines changed: 3 additions & 4 deletions
diff --git a/‎esp32/frozen/Pybytes/_pybytes.py
Lines changed: 1 addition & 1 deletion b/‎esp32/frozen/Pybytes/_pybytes.py
Lines changed: 1 addition & 1 deletion
diff --git a/‎esp32/frozen/Pybytes/_pybytes_connection.py
Lines changed: 5 additions & 5 deletions b/‎esp32/frozen/Pybytes/_pybytes_connection.py
Lines changed: 5 additions & 5 deletions
diff --git a/‎esp32/hal/esp32_mphal.c
Lines changed: 5 additions & 0 deletions b/‎esp32/hal/esp32_mphal.c
Lines changed: 5 additions & 0 deletions
diff --git a/‎esp32/lib/libbootloader_support.a
0 Bytes b/‎esp32/lib/libbootloader_support.a
0 Bytes
diff --git a/‎esp32/lib/libbt.a
0 Bytes b/‎esp32/lib/libbt.a
0 Bytes
diff --git a/‎esp32/lib/libcxx.a
0 Bytes b/‎esp32/lib/libcxx.a
0 Bytes
diff --git a/‎esp32/lib/libdriver.a
0 Bytes b/‎esp32/lib/libdriver.a
0 Bytes
diff --git a/‎esp32/lib/libesp32.a
-12 Bytes b/‎esp32/lib/libesp32.a
-12 Bytes
diff --git a/‎esp32/lib/libesp_adc_cal.a
0 Bytes b/‎esp32/lib/libesp_adc_cal.a
0 Bytes
diff --git a/‎esp32/lib/libexpat.a
0 Bytes b/‎esp32/lib/libexpat.a
0 Bytes
diff --git a/‎esp32/lib/libfreertos.a
0 Bytes b/‎esp32/lib/libfreertos.a
0 Bytes
diff --git a/‎esp32/lib/libheap.a
0 Bytes b/‎esp32/lib/libheap.a
0 Bytes
diff --git a/‎esp32/lib/libjsmn.a
0 Bytes b/‎esp32/lib/libjsmn.a
0 Bytes
diff --git a/‎esp32/lib/libjson.a
0 Bytes b/‎esp32/lib/libjson.a
0 Bytes
diff --git a/‎esp32/lib/liblog.a
0 Bytes b/‎esp32/lib/liblog.a
0 Bytes
diff --git a/‎esp32/lib/liblwip.a
0 Bytes b/‎esp32/lib/liblwip.a
0 Bytes
diff --git a/‎esp32/lib/libmbedtls.a
0 Bytes b/‎esp32/lib/libmbedtls.a
0 Bytes
diff --git a/‎esp32/lib/libmicro-ecc.a
0 Bytes b/‎esp32/lib/libmicro-ecc.a
0 Bytes
diff --git a/‎esp32/lib/libnewlib.a
0 Bytes b/‎esp32/lib/libnewlib.a
0 Bytes
diff --git a/‎esp32/lib/libnghttp.a
0 Bytes b/‎esp32/lib/libnghttp.a
0 Bytes
diff --git a/‎esp32/lib/libnvs_flash.a
0 Bytes b/‎esp32/lib/libnvs_flash.a
0 Bytes
diff --git a/‎esp32/lib/libopenssl.a
0 Bytes b/‎esp32/lib/libopenssl.a
0 Bytes
diff --git a/‎esp32/lib/libopenthread.a
898 KB b/‎esp32/lib/libopenthread.a
898 KB
diff --git a/‎esp32/lib/libpthread.a
0 Bytes b/‎esp32/lib/libpthread.a
0 Bytes
diff --git a/‎esp32/lib/libsdmmc.a
0 Bytes b/‎esp32/lib/libsdmmc.a
0 Bytes
diff --git a/‎esp32/lib/libsmartconfig_ack.a
0 Bytes b/‎esp32/lib/libsmartconfig_ack.a
0 Bytes
diff --git a/‎esp32/lib/libsoc.a
0 Bytes b/‎esp32/lib/libsoc.a
0 Bytes
diff --git a/‎esp32/lib/libspi_flash.a
0 Bytes b/‎esp32/lib/libspi_flash.a
0 Bytes
diff --git a/‎esp32/lib/libtcpip_adapter.a
0 Bytes b/‎esp32/lib/libtcpip_adapter.a
0 Bytes
diff --git a/‎esp32/lib/libvfs.a
0 Bytes b/‎esp32/lib/libvfs.a
0 Bytes
diff --git a/‎esp32/lib/libwpa_supplicant.a
0 Bytes b/‎esp32/lib/libwpa_supplicant.a
0 Bytes
diff --git a/‎esp32/lib/libxtensa-debug-module.a
0 Bytes b/‎esp32/lib/libxtensa-debug-module.a
0 Bytes
diff --git a/‎esp32/lora/ot-log.c
Lines changed: 1 addition & 1 deletion b/‎esp32/lora/ot-log.c
Lines changed: 1 addition & 1 deletion
@@ -192,11 +192,17 @@ APP_LORA_SRC_C = $(addprefix lora/,\
 	sx1276-board.c \
 	sx1272-board.c \
 	board.c \
+	)
+
+APP_LORA_OPENTHREAD_SRC_C = $(addprefix lora/,\
 	otplat_alarm.c \
 	otplat_radio.c \
 	ot-settings.c \
 	ot-log.c \
-	ot-task.c \
+	)
+
+APP_MOD_MESH_SRC_C = $(addprefix mods/,\
+	modmesh.c \
 	)
 
 APP_LIB_LORA_SRC_C = $(addprefix lib/lora/,\
@@ -305,6 +311,13 @@ ifeq ($(BOARD),$(filter $(BOARD), FIPY GPY))
 OBJ += $(addprefix $(BUILD)/, $(APP_LTE_SRC_C:.c=.o) $(APP_MODS_LTE_SRC_C:.c=.o))
 endif
 
+# add OPENTHREAD code only if flag enabled and for LOPY, LOPY4 and FIPY
+ifeq ($(OPENTHREAD), on)
+ifeq ($(BOARD), $(filter $(BOARD), LOPY LOPY4 FIPY))
+OBJ += $(addprefix $(BUILD)/, $(APP_LORA_OPENTHREAD_SRC_C:.c=.o) $(APP_MOD_MESH_SRC_C:.c=.o))
+endif
+endif # ifeq ($(OPENTHREAD), on)
+
 OBJ += $(addprefix $(BUILD)/, $(APP_MAIN_SRC_C:.c=.o) $(APP_HAL_SRC_C:.c=.o) $(APP_LIB_SRC_C:.c=.o))
 OBJ += $(addprefix $(BUILD)/, $(APP_MODS_SRC_C:.c=.o) $(APP_STM_SRC_C:.c=.o))
 OBJ += $(addprefix $(BUILD)/, $(APP_FATFS_SRC_C:.c=.o) $(APP_LITTLEFS_SRC_C:.c=.o) $(APP_UTIL_SRC_C:.c=.o) $(APP_TELNET_SRC_C:.c=.o))
@@ -325,6 +338,12 @@ ifeq ($(BOARD),$(filter $(BOARD), FIPY GPY))
 SRC_QSTR += $(APP_MODS_LTE_SRC_C)
 endif
 
+ifeq ($(OPENTHREAD), on)
+ifeq ($(BOARD), $(filter $(BOARD), LOPY LOPY4 FIPY))
+SRC_QSTR += $(APP_MOD_MESH_SRC_C)
+endif
+endif # ifeq ($(OPENTHREAD), on)
+
 # Append any auto-generated sources that are needed by sources listed in
 # SRC_QSTR
 SRC_QSTR_AUTO_DEPS +=
@@ -580,20 +599,14 @@ ifeq ($(SECURE), on)
 	$(ECHO) $(SEPARATOR)
 endif #ifeq ($(SECURE), on)
 endif #ifeq ($(TARGET), $(filter $(TARGET), boot boot_app))
-ifeq ($(TARGET), $(filter $(TARGET), app boot_app))
 
 
+ifeq ($(TARGET), $(filter $(TARGET), app boot_app))
 
 $(BUILD)/application.a: $(OBJ)
 	$(ECHO) "AR $@"
 	$
F987
(Q) rm -f $@
 	$(Q) $(AR) cru $@ $^
-ifeq ($(BOARD), $(filter $(BOARD), SIPY FIPY LOPY4))
-$(BUILD)/application.elf: $(BUILD)/application.a $(BUILD)/esp32_out.ld
-	$(ECHO) "LINK $@"
-	$(Q) $(CC) $(APP_LDFLAGS) $(APP_LIBS) -o $@
-	$(Q) $(SIZE) $@
-else
 $(BUILD)/application.elf: $(BUILD)/application.a $(BUILD)/esp32_out.ld $(SECURE_BOOT_VERIFICATION_KEY)
 ifeq ($(COPY_IDF_LIB), 1)
 	$(ECHO) "COPY IDF LIBRARIES $@"
@@ -618,7 +631,6 @@ endif #ifeq ($(SECURE), on)
 	$(ECHO) "LINK $@"
 	$(Q) $(CC) $(APP_LDFLAGS) $(APP_LIBS) -o $@
 	$(SIZE) $@
-endif #ifeq ($(BOARD), $(filter $(BOARD), SIPY FIPY LOPY4))
 
 $(APP_BIN): $(BUILD)/application.elf $(PART_BIN) $(ORIG_ENCRYPT_KEY)
 	$(ECHO) "IMAGE $@"
 
@@ -222,7 +222,10 @@ def _send_packet(self, packet):
         try:
             if self._sock:
                 written = self._sock.write(packet)
-                print('Packet sent. (Length: %d)' % written)
+                if(written == None):
+                    written = -1
+                else:
+                    print('Packet sent. (Length: %d)' % written)
         except socket.error as err:
             print('Socket send error {0}'.format(err))
 
@@ -67,12 +67,11 @@
 
         # Please put your USER code below this line
 
-        # SEND VIRTUAL VALUE
+        # SEND SIGNAL
         # 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_signal(pin, value)
+        # pybytes.send_signal(signalNumber, value)
 
-        # SEND SENSOR DATA THROUGH VIRTUAL PINS
+        # SEND SENSOR DATA THROUGH SIGNALS
         # # If you use a Pysense, some libraries are necessary to access its sensors
         # # you can find them here: https://github.com/pycom/pycom-libraries
         #
 
@@ -102,7 +102,7 @@ def send_signal(self, pin, value):
 
     def send_virtual_pin_value(self, 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])
+        self.send_signal(pin, value)
 
     def __periodical_pin_callback(self, periodical_pin):
          if (periodical_pin.pin_type == __PERIODICAL_PIN.TYPE_DIGITAL):
 
@@ -122,15 +122,15 @@ def connect_lte(self, reconnect=True, check_interval=0.5):
             try:
                 from network import LTE
                 time.sleep(3)
-                print_debug(1, 'LTE init(carrier={})'.format(lte_cfg.get('carrier')))
+                print_debug(1, 'LTE init(carrier={}, cid={})'.format(lte_cfg.get('carrier'), lte_cfg.get('cid', 1)))
                 self.lte = LTE(carrier=lte_cfg.get('carrier'))         # instantiate the LTE object
-                print_debug(1, 'LTE attach(band={}, apn={})'.format(lte_cfg.get('band'), lte_cfg.get('apn')))
-                self.lte.attach(band=lte_cfg.get('band'), apn=lte_cfg.get('apn'))        # attach the cellular modem to a base station
+                print_debug(1, 'LTE attach(band={}, apn={}, type={})'.format(lte_cfg.get('band'), lte_cfg.get('apn'), lte_cfg.get('type')))
+                self.lte.attach(band=lte_cfg.get('band'), apn=lte_cfg.get('apn'), type=lte_cfg.get('type'))        # attach the cellular modem to a base station
                 while not self.lte.isattached():
                     time.sleep(0.25)
                 time.sleep(1)
-                print_debug(1, 'LTE connect(cid={})'.format(lte_cfg.get('cid',1)))
-                self.lte.connect(cid=lte_cfg.get('cid',1))       # start a data session and obtain an IP address
+                print_debug(1, 'LTE connect()')
+                self.lte.connect()       # start a data session and obtain an IP address
                 print_debug(1, 'LTE is_connected()')
                 while not self.lte.isconnected():
                     time.sleep(0.25)
 
@@ -34,6 +34,8 @@
 #include "modmachine.h"
 #include "updater.h"
 #include "bootloader.h"
+#include "modwlan.h"
+#include "modbt.h"
 
 #include "freertos/FreeRTOS.h"
 #include "freertos/task.h"
@@ -190,6 +192,9 @@ void mp_hal_delay_ms(uint32_t delay) {
 void mp_hal_reset_safe_and_boot(bool reset) {
     boot_info_t boot_info;
     uint32_t boot_info_offset;
+    /* Disable Wifi/BT to avoid cache region being accessed since it will be disabled when updating Safe boot flag in flash */
+    wlan_deinit(NULL);
+    bt_deinit(NULL);
     if (updater_read_boot_info (&boot_info, &boot_info_offset)) {
         boot_info.safeboot = SAFE_BOOT_SW;
         updater_write_boot_info (&boot_info, boot_info_offset);
 
@@ -14,7 +14,6 @@
 #include "ot-log.h"
 
 #include "pycom_config.h"
-#include <openthread/types.h>
 #include <openthread/config.h>
 #include <openthread/platform/alarm-milli.h>
 #include <openthread/platform/uart.h>
@@ -73,6 +72,7 @@ void otPlatLogBufHex(const uint8_t *aBuf, uint16_t aBufLength) {
     for (int i = 0; i < aBufLength; i++) {
         length += sprintf(&logString[length], "%x ", aBuf[i]);
     }
+    logString[length++] = '\n';
 }
 
 void otPlatLogFlush(void) {
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,6 @@`
`14`	`14`	`#include "ot-log.h"`
`15`	`15`
`16`	`16`	`#include "pycom_config.h"`
`17`		`-#include <openthread/types.h>`
`18`	`17`	`#include <openthread/config.h>`
`19`	`18`	`#include <openthread/platform/alarm-milli.h>`
`20`	`19`	`#include <openthread/platform/uart.h>`
`@@ -73,6 +72,7 @@ void otPlatLogBufHex(const uint8_t *aBuf, uint16_t aBufLength) {`
`73`	`72`	`for (int i = 0; i < aBufLength; i++) {`
`74`	`73`	`length += sprintf(&logString[length], "%x ", aBuf[i]);`
`75`	`74`	`}`
	`75`	`+ logString[length++] = '\n';`
`76`	`76`	`}`
`77`	`77`
`78`	`78`	`void otPlatLogFlush(void) {`