Merge remote-tracking branch 'Dev/master' into release-candidate

Author: iwahdan88

esp32/Makefile

@@ -36,6 +36,8 @@ RELEASE_DIR ?= build/
 
 COPY_IDF_LIB ?= 0
 
+LTE_LOG_BUFF ?= 0
+
 # by default openthread over LoRa is enabled
 OPENTHREAD ?= on
 
@@ -119,6 +121,13 @@ ifeq ($(OPENTHREAD), on)
     CFLAGS += -DLORA_OPENTHREAD_ENABLED
 endif
 
+# Enable or Disable LTE_LOG_BUFF
+ifeq ($(BOARD), $(filter $(BOARD), GPY FIPY))
+ifeq ($(LTE_DEBUG_BUFF),1)
+	CFLAGS += -DLTE_DEBUG_BUFF
+endif #ifeq ($(LTE_LOG_BUFF),1)
+endif #ifeq ($(BOARD), $(filter $(BOARD), GPY FIPY))
+
 B_LIBS = -Lbootloader/lib -Lbootloader -L$(BUILD)/bootloader -L$(ESP_IDF_COMP_PATH)/esp32/ld \
          -L$(ESP_IDF_COMP_PATH)/esp32/lib -llog -lcore -lbootloader_support \
          -lspi_flash -lsoc -lmicro-ecc -lgcc -lstdc++ -lgcov

esp32/application.mk

@@ -25,6 +25,7 @@ APP_INC += -I$(BUILD)/genhdr
 APP_INC += -I$(ESP_IDF_COMP_PATH)/bootloader_support/include
 APP_INC += -I$(ESP_IDF_COMP_PATH)/bootloader_support/include_priv
 APP_INC += -I$(ESP_IDF_COMP_PATH)/mbedtls/mbedtls/include
+APP_INC += -I$(ESP_IDF_COMP_PATH)/mbedtls/mbedtls/include/mbedtls
 APP_INC += -I$(ESP_IDF_COMP_PATH)/mbedtls/port/include
 APP_INC += -I$(ESP_IDF_COMP_PATH)/driver/include
 APP_INC += -I$(ESP_IDF_COMP_PATH)/driver/include/driver
@@ -147,6 +148,7 @@ APP_MODS_SRC_C = $(addprefix mods/,\
 	machwdt.c \
 	machrmt.c \
 	lwipsocket.c \
+	machtouch.c \
 	)
 
 APP_MODS_LORA_SRC_C = $(addprefix mods/,\