New partitions (#192)
* Add new partition scheme * Init NVS early, so it can be used without BT or WiFi
This commit is contained in:
parent
1f0df1ef97
commit
fb8fe671d6
@ -28,7 +28,6 @@ void arduino_phy_init()
|
||||
if(initialized){
|
||||
return;
|
||||
}
|
||||
nvs_flash_init();
|
||||
esp_phy_calibration_mode_t calibration_mode = PHY_RF_CAL_PARTIAL;
|
||||
if (rtc_get_reset_reason(0) == DEEPSLEEP_RESET) {
|
||||
calibration_mode = PHY_RF_CAL_NONE;
|
||||
@ -106,6 +105,7 @@ void initWiFi() __attribute__((weak));
|
||||
void initWiFi() {}
|
||||
|
||||
void initArduino(){
|
||||
nvs_flash_init();
|
||||
init();
|
||||
initVariant();
|
||||
initWiFi();
|
||||
|
@ -253,7 +253,7 @@ const char * WiFiAPClass::softAPgetHostname()
|
||||
*/
|
||||
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()
|
||||
{
|
||||
return tcpip_adapter_create_ip6_linklocal(TCPIP_ADAPTER_IF_AP) == 0;
|
||||
return tcpip_adapter_create_ip6_linklocal(TCPIP_ADAPTER_IF_AP) == ESP_OK;
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -87,4 +87,4 @@ recipe.size.regex.data=^(?:\.dram0\.data|\.dram0\.bss)\s+([0-9]+).*
|
||||
tools.esptool.upload.protocol=esp32
|
||||
tools.esptool.upload.params.verbose=
|
||||
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
BIN
tools/partitions/boot_app0.bin
Normal file
Binary file not shown.
BIN
tools/partitions/default.bin
Normal file
BIN
tools/partitions/default.bin
Normal file
Binary file not shown.
@ -1,4 +1,6 @@
|
||||
# Name, Type, SubType, Offset, Size, Flags
|
||||
nvs, data, nvs, 0x9000, 0x6000,
|
||||
phy_init, data, phy, 0xf000, 0x1000,
|
||||
factory, app, factory, 0x10000, 1M,
|
||||
nvs, data, nvs, 0x9000, 0x5000
|
||||
otadata, data, ota, 0xe000, 0x2000
|
||||
app0, app, ota_0, 0x10000, 1M,
|
||||
app1, app, ota_1, , 1M,
|
||||
spiffs, data, spiffs, , 0x1F0000,
|
||||
|
|
@ -102,10 +102,9 @@ env.Append(
|
||||
],
|
||||
|
||||
UPLOADERFLAGS=[
|
||||
"0x1000", '"%s"' % join(FRAMEWORK_DIR, "tools",
|
||||
"sdk", "bin", "bootloader.bin"),
|
||||
"0x8000", '"%s"' % join(FRAMEWORK_DIR, "tools",
|
||||
"sdk", "bin", "partitions_singleapp.bin"),
|
||||
"0x1000", '"%s"' % join(FRAMEWORK_DIR, "tools", "sdk", "bin", "bootloader.bin"),
|
||||
"0x8000", '"%s"' % join(FRAMEWORK_DIR, "tools", "partitions", "default.bin"),
|
||||
"0xe000", '"%s"' % join(FRAMEWORK_DIR, "tools", "partitions", "boot_app0.bin"),
|
||||
"0x10000"
|
||||
]
|
||||
)
|
||||
|
Loading…
Reference in New Issue
Block a user