Release xykon (#377)

* Add mDNS support * Update modlte.c Disable the radio with CFUN=0 in lte_reset * Update pycom_version.h Update SW_VERSION_NUMBER to 1.20.1.r3
pycom · Dec 12, 2019 · 58398d3 · 58398d3
1 parent 06dfad0
commit 58398d3
Show file tree

Hide file tree

Showing 10 changed files with 419 additions and 2 deletions.
diff --git a/esp32/Makefile b/esp32/Makefile
@@ -103,7 +103,7 @@ LIBS = -L$(ESP_IDF_COMP_PATH)/esp32/lib -L$(ESP_IDF_COMP_PATH)/esp32/ld -L$(ESP_
        $(ESP_IDF_COMP_PATH)/newlib/lib/libc-psram-workaround.a \
        -lfreertos -ljson -ljsmn -llwip -lnewlib -lvfs -lopenssl -lmbedtls -lwpa_supplicant \
        -lxtensa-debug-module -lbt -lsdmmc -lsoc -lheap -lbootloader_support -lmicro-ecc \
-       -u ld_include_panic_highint_hdl -lsmartconfig_ack -lmesh -lesp_ringbuf -lcoap
+       -u ld_include_panic_highint_hdl -lsmartconfig_ack -lmesh -lesp_ringbuf -lcoap -lmdns
 ifeq ($(BOARD), $(filter $(BOARD), FIPY))
     LIBS += sigfox/modsigfox_fipy.a
 endif

diff --git a/esp32/application.mk b/esp32/application.mk
@@ -77,6 +77,7 @@ APP_INC += -I$(ESP_IDF_COMP_PATH)/coap/libcoap/include/coap
 APP_INC += -I$(ESP_IDF_COMP_PATH)/coap/libcoap/examples
 APP_INC += -I$(ESP_IDF_COMP_PATH)/coap/port/include
 APP_INC += -I$(ESP_IDF_COMP_PATH)/coap/port/include/coap
+APP_INC += -I$(ESP_IDF_COMP_PATH)/mdns/include
 APP_INC += -I../lib/mp-readline
 APP_INC += -I../lib/netutils
 APP_INC += -I../lib/oofatfs
@@ -160,6 +161,7 @@ APP_MODS_SRC_C = $(addprefix mods/,\
 	lwipsocket.c \
 	machtouch.c \
 	modcoap.c \
+	modmdns.c \
 	)
 
 APP_MODS_LORA_SRC_C = $(addprefix mods/,\

diff --git a/esp32/frozen/Pybytes/_pybytes_config.py b/esp32/frozen/Pybytes/_pybytes_config.py
@@ -182,6 +182,10 @@ def __process_cli_activation(self, filename, activation_token):
                             pass
                         return self.__pybytes_config
                 else:
+                    try:
+                        self.__pybytes_cli_activation.close()
+                    except:
+                        pass
                     print('Unable to provision Sigfox! Please try again.')
             return None
 

diff --git a/esp32/get_idf_libs.py b/esp32/get_idf_libs.py
@@ -61,6 +61,7 @@ def main():
         shutil.copy(src + '/xtensa-debug-module/libxtensa-debug-module.a', dsttmpapp)
         shutil.copy(src + '/esp_ringbuf/libesp_ringbuf.a', dsttmpapp)
         shutil.copy(src + '/coap/libcoap.a', dsttmpapp)
+        shutil.copy(src + '/mdns/libmdns.a', dsttmpapp)
     except:
         print("Couldn't Copy IDF libs defaulting to Local Lib Folders!")
         traceback.print_exc()

diff --git a/esp32/lib/libmdns.a b/esp32/lib/libmdns.a
diff --git a/esp32/mods/modlte.c b/esp32/mods/modlte.c
@@ -1191,6 +1191,11 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(lte_ue_coverage_obj, lte_ue_coverage);
 STATIC mp_obj_t lte_reset(mp_obj_t self_in) {
     lte_check_init();
     lte_disconnect(self_in);
+    if (!lte_push_at_command("AT+CFUN=0", LTE_RX_TIMEOUT_MAX_MS)) {
+        mp_hal_delay_ms(LTE_RX_TIMEOUT_MIN_MS);
+        lte_push_at_command("AT+CFUN=0", LTE_RX_TIMEOUT_MAX_MS);
+    }
+    mp_hal_delay_ms(LTE_RX_TIMEOUT_MIN_MS);
     lte_push_at_command("AT^RESET", LTE_RX_TIMEOUT_MAX_MS);
     lteppp_set_state(E_LTE_IDLE);
     mp_hal_delay_ms(LTE_RX_TIMEOUT_MIN_MS);