Skip to content

Update IDF to f586f5e #1296

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Apr 7, 2018
Merged

Update IDF to f586f5e #1296

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
db2e679
Update BLE lib
me-no-dev Apr 6, 2018
cdf7d37
Update IDF to f586f5e
me-no-dev Apr 6, 2018
9d796d0
Restructure Bluetooth Serial includes
me-no-dev Apr 6, 2018
c06f683
Update esptool and gen_esp32part
me-no-dev Apr 6, 2018
535a55d
Add partition scheme selection for menuconfig
me-no-dev Apr 6, 2018
75b08d5
Add partition scheme selection for Arduino IDE
me-no-dev Apr 6, 2018
ecd8b0b
Fix BLE example
me-no-dev Apr 6, 2018
09980d4
Second attempt BLE fix
me-no-dev Apr 6, 2018
83d25ca
Add exceptions to PIO
me-no-dev Apr 6, 2018
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Add partition scheme selection for menuconfig
  • Loading branch information
@me-no-dev
me-no-dev committed Apr 6, 2018
commit 535a55dd4ca19d7fa10d10e47367ed8edd7b866b
21 changes: 21 additions & 0 deletions Kconfig → Kconfig.projbuild
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,27 @@ config ARDUHAL_ESP_LOG

endmenu

choice ARDUHAL_PARTITION_SCHEME
bool "Used partition scheme"
default ARDUHAL_PARTITION_SCHEME_DEFAULT
help
Specify which partition scheme to be used.

config ARDUHAL_PARTITION_SCHEME_DEFAULT
bool "Default"
config ARDUHAL_PARTITION_SCHEME_MINIMAL
bool "Minimal (for 2MB FLASH)"
config ARDUHAL_PARTITION_SCHEME_NO_OTA
bool "No OTA (for large apps)"
endchoice

config ARDUHAL_PARTITION_SCHEME
string
default "default" if ARDUHAL_PARTITION_SCHEME_DEFAULT
default "minimal" if ARDUHAL_PARTITION_SCHEME_MINIMAL
default "no_ota" if ARDUHAL_PARTITION_SCHEME_NO_OTA


config AUTOCONNECT_WIFI
bool "Autoconnect WiFi on boot"
default "n"
Expand Down
2 changes: 1 addition & 1 deletion Makefile.projbuild
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ BOOT_APP_BIN_ROOT := $(call dequote,$(COMPONENT_PATH))
BOOT_APP_BIN_PATH := $(call dequote,$(abspath $(BOOT_APP_BIN_ROOT)/$(subst $(quote),,tools/partitions/boot_app0.bin)))

ifndef CONFIG_PARTITION_TABLE_CUSTOM
PARTITION_TABLE_CSV_PATH = $(call dequote,$(abspath $(BOOT_APP_BIN_ROOT)/$(subst $(quote),,tools/partitions/default.csv)))
PARTITION_TABLE_CSV_PATH = $(call dequote,$(abspath $(BOOT_APP_BIN_ROOT)/$(subst $(quote),,tools/partitions/$(CONFIG_ARDUHAL_PARTITION_SCHEME).csv)))
endif

BOOT_APP_BIN_FLASH_CMD = $(ESPTOOLPY_SERIAL) write_flash $(BOOT_APP_BIN_OFFSET) $(BOOT_APP_BIN_PATH)
Expand Down
6 changes: 6 additions & 0 deletions tools/partitions/no_ota.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# Name, Type, SubType, Offset, Size, Flags
nvs, data, nvs, 0x9000, 0x5000,
otadata, data, ota, 0xe000, 0x2000,
app0, app, ota_0, 0x10000, 0x200000,
eeprom, data, 0x99, 0x210000,0x1000,
spiffs, data, spiffs, 0x211000,0x1EF000,