Merge branch 'master' into pybytes-master

Author: Xykon

esp32/Makefile

@@ -22,6 +22,7 @@ OEM ?= 0
 BTYPE ?= release
 
 BUILD = build/$(BOARD)/$(BTYPE)
+LTE_LOG_BUFF ?= 0
 
 # by default Secure Boot and Flash Encryption are disabled
 SECURE ?= off
@@ -94,6 +95,19 @@ endif
 ifeq ($(BOARD), $(filter $(BOARD), SIPY))
     LIBS += sigfox/modsigfox_sipy.a
 endif
+# Enable or Disable LTE_LOG_BUFF
+ifeq ($(BOARD), $(filter $(BOARD), GPY FIPY))
+ifeq ($(LTE_LOG_BUFF),1)
+	CFLAGS += -DLTE_LOG
+endif #ifeq ($(LTE_LOG_BUFF),1)
+endif #ifeq ($(BOARD), $(filter $(BOARD), GPY FIPY))
+
+# 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 \

esp32/application.mk

@@ -140,6 +140,7 @@ APP_MODS_SRC_C = $(addprefix mods/,\
 	machwdt.c \
 	machrmt.c \
 	lwipsocket.c \
+	machtouch.c \
 	)
 
 APP_MODS_LORA_SRC_C = $(addprefix mods/,\