jacob.eva/arduino-esp32
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

New partitions (#192)

Browse Source 
* Add new partition scheme

* Init NVS early, so it can be used without BT or WiFi
This commit is contained in:
Me No Dev 2017-02-10 14:11:24 +02:00 committed by GitHub
parent 1f0df1ef97
commit fb8fe671d6
7 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cores/esp32/esp32-hal-misc.c
View File

@ -28,7 +28,6 @@ void arduino_phy_init()
if(initialized){ if(initialized){
return; return;
} }
nvs_flash_init();
esp_phy_calibration_mode_t calibration_mode = PHY_RF_CAL_PARTIAL; esp_phy_calibration_mode_t calibration_mode = PHY_RF_CAL_PARTIAL;
if (rtc_get_reset_reason(0) == DEEPSLEEP_RESET) { if (rtc_get_reset_reason(0) == DEEPSLEEP_RESET) {
calibration_mode = PHY_RF_CAL_NONE; calibration_mode = PHY_RF_CAL_NONE;
@ -106,6 +105,7 @@ void initWiFi() __attribute__((weak));
void initWiFi() {} void initWiFi() {}
void initArduino(){ void initArduino(){
nvs_flash_init();
init(); init();
initVariant(); initVariant();
initWiFi(); initWiFi();

4
libraries/WiFi/src/WiFiAP.cpp
View File

@ -253,7 +253,7 @@ const char * WiFiAPClass::softAPgetHostname()
*/ */
bool WiFiAPClass::softAPsetHostname(const char * hostname) bool WiFiAPClass::softAPsetHostname(const char * hostname)
{ {
return tcpip_adapter_set_hostname(TCPIP_ADAPTER_IF_AP, hostname) == 0; return tcpip_adapter_set_hostname(TCPIP_ADAPTER_IF_AP, hostname) == ESP_OK;
} }
/** /**
@ -262,7 +262,7 @@ bool WiFiAPClass::softAPsetHostname(const char * hostname)
*/ */
bool WiFiAPClass::softAPenableIpV6() bool WiFiAPClass::softAPenableIpV6()
{ {
return tcpip_adapter_create_ip6_linklocal(TCPIP_ADAPTER_IF_AP) == 0; return tcpip_adapter_create_ip6_linklocal(TCPIP_ADAPTER_IF_AP) == ESP_OK;
} }
/** /**

2
platform.txt
View File

@ -87,4 +87,4 @@ recipe.size.regex.data=^(?:\.dram0\.data|\.dram0\.bss)\s+([0-9]+).*
tools.esptool.upload.protocol=esp32 tools.esptool.upload.protocol=esp32
tools.esptool.upload.params.verbose= tools.esptool.upload.params.verbose=
tools.esptool.upload.params.quiet= tools.esptool.upload.params.quiet=
tools.esptool.upload.pattern={cmd} --chip esp32 --port "{serial.port}" --baud {upload.speed} --before default_reset --after hard_reset write_flash -z --flash_freq {build.flash_freq} --flash_mode {build.flash_mode} --flash_size {build.flash_size} 0x1000 "{runtime.platform.path}/tools/sdk/bin/bootloader.bin" 0x8000 "{build.path}/{build.project_name}.partitions.bin" 0x10000 "{build.path}/{build.project_name}.bin" tools.esptool.upload.pattern={cmd} --chip esp32 --port "{serial.port}" --baud {upload.speed} --before default_reset --after hard_reset write_flash -z --flash_freq {build.flash_freq} --flash_mode {build.flash_mode} --flash_size {build.flash_size} 0x1000 "{runtime.platform.path}/tools/sdk/bin/bootloader.bin" 0x8000 "{build.path}/{build.project_name}.partitions.bin" 0xe000 "{runtime.platform.path}/tools/partitions/boot_app0.bin" 0x10000 "{build.path}/{build.project_name}.bin"

BIN
tools/partitions/boot_app0.bin Normal file
View File

Binary file not shown.

BIN
tools/partitions/default.bin Normal file
View File

Binary file not shown.

8
tools/partitions/default.csv
View File

@ -1,4 +1,6 @@
# Name, Type, SubType, Offset, Size, Flags # Name, Type, SubType, Offset, Size, Flags
nvs, data, nvs, 0x9000, 0x6000, nvs, data, nvs, 0x9000, 0x5000
phy_init, data, phy, 0xf000, 0x1000, otadata, data, ota, 0xe000, 0x2000
factory, app, factory, 0x10000, 1M, app0, app, ota_0, 0x10000, 1M,
app1, app, ota_1, , 1M,
spiffs, data, spiffs, , 0x1F0000,

1 # Name # Name, Type, SubType, Offset, Size, Flags Type SubType Offset Size Flags
2 nvs nvs, data, nvs, 0x9000, 0x5000 data nvs 0x9000 0x6000
3 phy_init otadata, data, ota, 0xe000, 0x2000 data phy 0xf000 0x1000
4 factory app0, app, ota_0, 0x10000, 1M, app factory 0x10000 1M
5 app1, app, ota_1, , 1M,
6 spiffs, data, spiffs, , 0x1F0000,

7
tools/platformio-build.py
View File

@ -102,10 +102,9 @@ env.Append(
], ],
UPLOADERFLAGS=[ UPLOADERFLAGS=[
"0x1000", '"%s"' % join(FRAMEWORK_DIR, "tools", "0x1000", '"%s"' % join(FRAMEWORK_DIR, "tools", "sdk", "bin", "bootloader.bin"),
"sdk", "bin", "bootloader.bin"), "0x8000", '"%s"' % join(FRAMEWORK_DIR, "tools", "partitions", "default.bin"),
"0x8000", '"%s"' % join(FRAMEWORK_DIR, "tools", "0xe000", '"%s"' % join(FRAMEWORK_DIR, "tools", "partitions", "boot_app0.bin"),
"sdk", "bin", "partitions_singleapp.bin"),
"0x10000" "0x10000"
] ]
) )