8000 Merge remote-tracking branch 'Dev/master' into release-candidate · afcarl/pycom-micropython-sigfox@0a38f88 · GitHub
[go: up one dir, main page]
Skip to content

Commit 0a38f88

Browse files
author
iwahdan88
committed
Merge remote-tracking branch 'Dev/master' into release-candidate
2 parents 350eac8 + 24e2a80 commit 0a38f88

26 files changed

+4866
-2117
lines changed

‎esp32/Makefile

Lines changed: 9 additions & 0 deletions
< 8000 /tr>
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@ RELEASE_DIR ?= build/
3636

3737
COPY_IDF_LIB ?= 0
3838

39+
LTE_LOG_BUFF ?= 0
40+
3941
# by default openthread over LoRa is enabled
4042
OPENTHREAD ?= on
4143

@@ -119,6 +121,13 @@ ifeq ($(OPENTHREAD), on)
119121
CFLAGS += -DLORA_OPENTHREAD_ENABLED
120122
endif
121123

124+
# Enable or Disable LTE_LOG_BUFF
125+
ifeq ($(BOARD), $(filter $(BOARD), GPY FIPY))
126+
ifeq ($(LTE_DEBUG_BUFF),1)
127+
CFLAGS += -DLTE_DEBUG_BUFF
128+
endif #ifeq ($(LTE_LOG_BUFF),1)
129+
endif #ifeq ($(BOARD), $(filter $(BOARD), GPY FIPY))
130+
122131
B_LIBS = -Lbootloader/lib -Lbootloader -L$(BUILD)/bootloader -L$(ESP_IDF_COMP_PATH)/esp32/ld \
123132
-L$(ESP_IDF_COMP_PATH)/esp32/lib -llog -lcore -lbootloader_support \
124133
-lspi_flash -lsoc -lmicro-ecc -lgcc -lstdc++ -lgcov

‎esp32/application.mk

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ APP_INC += -I$(BUILD)/genhdr
2525
APP_INC += -I$(ESP_IDF_COMP_PATH)/bootloader_support/include
2626
APP_INC += -I$(ESP_IDF_COMP_PATH)/bootloader_support/include_priv
2727
APP_INC += -I$(ESP_IDF_COMP_PATH)/mbedtls/mbedtls/include
28+
APP_INC += -I$(ESP_IDF_COMP_PATH)/mbedtls/mbedtls/include/mbedtls
2829
APP_INC += -I$(ESP_IDF_COMP_PATH)/mbedtls/port/include
2930
APP_INC += -I$(ESP_IDF_COMP_PATH)/driver/include
3031
APP_INC += -I$(ESP_IDF_COMP_PATH)/driver/include/driver
@@ -147,6 +148,7 @@ APP_MODS_SRC_C = $(addprefix mods/,\
147148
machwdt.c \
148149
machrmt.c \
149150
lwipsocket.c \
151+
machtouch.c \
150152
)
151153

152154
APP_MODS_LORA_SRC_C = $(addprefix mods/,\

0 commit comments

Comments
 (0)
0