@@ -25,7 +25,6 @@ APP_INC += -I$(BUILD)/genhdr
2525APP_INC += -I$(ESP_IDF_COMP_PATH ) /bootloader_support/include
2626APP_INC += -I$(ESP_IDF_COMP_PATH ) /bootloader_support/include_priv
2727APP_INC += -I$(ESP_IDF_COMP_PATH ) /mbedtls/mbedtls/include
28- APP_INC += -I$(ESP_IDF_COMP_PATH ) /mbedtls/mbedtls/include/mbedtls
2928APP_INC += -I$(ESP_IDF_COMP_PATH ) /mbedtls/port/include
3029APP_INC += -I$(ESP_IDF_COMP_PATH ) /driver/include
3130APP_INC += -I$(ESP_IDF_COMP_PATH ) /driver/include/driver
@@ -41,6 +40,7 @@ APP_INC += -I$(ESP_IDF_COMP_PATH)/json/include
4140APP_INC += -I$(ESP_IDF_COMP_PATH ) /expat/include
4241APP_INC += -I$(ESP_IDF_COMP_PATH ) /lwip/include/lwip
4342APP_INC += -I$(ESP_IDF_COMP_PATH ) /lwip/include/lwip/port
43+ APP_INC += -I$(ESP_IDF_COMP_PATH ) /lwip/include/lwip/posix
4444APP_INC += -I$(ESP_IDF_COMP_PATH ) /newlib/include
4545APP_INC += -I$(ESP_IDF_COMP_PATH ) /newlib/platform_include
4646APP_INC += -I$(ESP_IDF_COMP_PATH ) /nvs_flash/include
@@ -67,6 +67,10 @@ APP_INC += -I$(ESP_IDF_COMP_PATH)/bt/bluedroid/hci/include
6767APP_INC += -I$(ESP_IDF_COMP_PATH ) /bt/bluedroid/gki/include
6868APP_INC += -I$(ESP_IDF_COMP_PATH ) /bt/bluedroid/api/include
6969APP_INC += -I$(ESP_IDF_COMP_PATH ) /bt/bluedroid/btc/include
70+ APP_INC += -I$(ESP_IDF_COMP_PATH ) /coap/libcoap/include/coap
71+ APP_INC += -I$(ESP_IDF_COMP_PATH ) /coap/libcoap/examples
72+ APP_INC += -I$(ESP_IDF_COMP_PATH ) /coap/port/include
73+ APP_INC += -I$(ESP_IDF_COMP_PATH ) /coap/port/include/coap
7074APP_INC += -I../lib/mp-readline
7175APP_INC += -I../lib/netutils
7276APP_INC += -I../lib/oofatfs
@@ -149,6 +153,7 @@ APP_MODS_SRC_C = $(addprefix mods/,\
149153 machrmt.c \
150154 lwipsocket.c \
151155 machtouch.c \
156+ modcoap.c \
152157 )
153158
154159APP_MODS_LORA_SRC_C = $(addprefix mods/,\
@@ -358,7 +363,7 @@ BOOT_LDFLAGS = $(LDFLAGS) -T esp32.bootloader.ld -T esp32.rom.ld -T esp32.periph
358363APP_LDFLAGS += $(LDFLAGS ) -T esp32_out.ld -T esp32.common.ld -T esp32.rom.ld -T esp32.peripherals.ld
359364
360365# add the application specific CFLAGS
361- CFLAGS += $(APP_INC ) -DMICROPY_NLR_SETJMP=1 -DMBEDTLS_CONFIG_FILE='"mbedtls/esp_config.h"' -DHAVE_CONFIG_H -DESP_PLATFORM -DFFCONF_H=\"lib/oofatfs/ffconf.h\"
366+ CFLAGS += $(APP_INC ) -DMICROPY_NLR_SETJMP=1 -DMBEDTLS_CONFIG_FILE='"mbedtls/esp_config.h"' -DHAVE_CONFIG_H -DESP_PLATFORM -DFFCONF_H=\"lib/oofatfs/ffconf.h\" -DWITH_POSIX
362367CFLAGS_SIGFOX += $(APP_INC ) -DMICROPY_NLR_SETJMP=1 -DMBEDTLS_CONFIG_FILE='"mbedtls/esp_config.h"' -DHAVE_CONFIG_H -DESP_PLATFORM
363368CFLAGS += -DREGION_AS923 -DREGION_AU915 -DREGION_EU868 -DREGION_US915 -DREGION_CN470 -DREGION_IN865 -DBASE=0 -DPYBYTES=1
364369# Specify if this is base or Pybytes Firmware
371376 $(error Invalid Variant specified)
372377 endif
373378endif
374- # Give the possibility to use LittleFs on /flash, otherwise FatFs is used
379+ # Give the possibility to use LittleFs on /flash, otherwise FatFs is used
375380FS ?= ""
376381ifeq ($(FS ) , LFS)
377382 CFLAGS += -DFS_USE_LITTLEFS
@@ -439,12 +444,17 @@ ifeq ($(BOARD), FIPY)
439444 $(BUILD ) /lora/spi-board.o : CFLAGS = $(CFLAGS_SIGFOX )
440445endif
441446
442- APP_IMG = $(BUILD ) /appimg.bin
443- PART_CSV = lib/partitions.csv
444447PART_BIN = $(BUILD ) /lib/partitions.bin
445448PART_BIN_ENCRYPT = $(PART_BIN ) _enc
446449APP_BIN_ENCRYPT = $(APP_BIN ) _enc_0x10000
450+ APP_IMG = $(BUILD ) /appimg.bin
451+ ifeq ($(BOARD ) , $(filter $(BOARD ) , FIPY GPY LOPY4) )
452+ PART_CSV = lib/partitions_8MB.csv
453+ APP_BIN_ENCRYPT_2 = $(APP_BIN ) _enc_0x210000
454+ else
455+ PART_CSV = lib/partitions_4MB.csv
447456APP_BIN_ENCRYPT_2 = $(APP_BIN ) _enc_0x1C0000
457+ endif
448458
449459ESPPORT ?= /dev/ttyUSB0
450460ESPBAUD ?= 921600
@@ -476,7 +486,11 @@ SIGN_BINARY = $(ESPSECUREPY) sign_data --keyfile $(SECURE_KEY)
476486# $(ENCRYPT_BINARY) $(ENCRYPT_0x10000) -o image_encrypt.bin image.bin
477487ENCRYPT_BINARY = $(ESPSECUREPY ) encrypt_flash_data --keyfile $(ENCRYPT_KEY )
478488ENCRYPT_0x10000 = --address 0x10000
479- ENCRYPT_0x1C0000 = --address 0x1C0000
489+ ifeq ($(BOARD ) , $(filter $(BOARD ) , FIPY GPY LOPY4) )
490+ ENCRYPT_APP_PART_2 = --address 0x210000
491+ else
492+ ENCRYPT_APP_PART_2 = --address 0x1C0000
493+ endif
480494
481495GEN_ESP32PART := $(PYTHON ) $(ESP_IDF_COMP_PATH ) /partition_table/gen_esp32part.py -q
482496
@@ -644,9 +658,13 @@ ifeq ($(SECURE), on)
644658 $(ECHO) "Signing $@"
645659 $(Q) $(SIGN_BINARY) $@
646660 $(ECHO) $(SEPARATOR)
661+ ifeq ($(BOARD ) , $(filter $(BOARD ) , FIPY GPY LOPY4) )
662+ $(ECHO) "Encrypt image into $(APP_BIN_ENCRYPT) (0x10000 offset) and $(APP_BIN_ENCRYPT_2) (0x210000 offset)"
663+ else
647664 $(ECHO) "Encrypt image into $(APP_BIN_ENCRYPT) (0x10000 offset) and $(APP_BIN_ENCRYPT_2) (0x1C0000 offset)"
665+ endif
648666 $(Q) $(ENCRYPT_BINARY) $(ENCRYPT_0x10000) -o $(APP_BIN_ENCRYPT) $@
649- $(Q) $(ENCRYPT_BINARY) $(ENCRYPT_0x1C0000 ) -o $(APP_BIN_ENCRYPT_2) $@
667+ $(Q) $(ENCRYPT_BINARY) $(ENCRYPT_APP_PART_2 ) -o $(APP_BIN_ENCRYPT_2) $@
650668 $(ECHO) "Overwrite $(APP_BIN) with $(APP_BIN_ENCRYPT)"
651669 $(CP) -f $(APP_BIN_ENCRYPT) $(APP_BIN)
652670 $(ECHO) $(SEPARATOR)
@@ -677,6 +695,8 @@ $(BUILD)/esp32_out.ld: $(ESP_IDF_COMP_PATH)/esp32/ld/esp32.ld sdkconfig.h
677695endif # ifeq ($(TARGET), $(filter $(TARGET), app boot_app))
678696
679697release : $(APP_BIN ) $(BOOT_BIN )
698+ $(ECHO ) " checking size of image"
699+ $(Q ) bash tools/size_check.sh $(BOARD ) $(BTYPE ) $(VARIANT )
680700 $(Q ) tools/makepkg.sh $(BOARD ) $(RELEASE_DIR ) $(BUILD )
681701
682702flash : $(APP_BIN ) $(BOOT_BIN )
0 commit comments