This commit is contained in:
Alexander 2024-06-19 01:44:20 -04:00
parent 31dbb87d85
commit e09d14859c
15 changed files with 269 additions and 395 deletions

File diff suppressed because it is too large Load Diff

View File

@ -191,13 +191,6 @@ C:/Users/alex/github/ESP-Nodes/ESP32-IDF_Blink/build/esp-idf/esp_partition/CMake
C:/Users/alex/github/ESP-Nodes/ESP32-IDF_Blink/build/esp-idf/esp_partition/CMakeFiles/install/local.dir
C:/Users/alex/github/ESP-Nodes/ESP32-IDF_Blink/build/esp-idf/esp_partition/CMakeFiles/install/strip.dir
C:/Users/alex/github/ESP-Nodes/ESP32-IDF_Blink/build/esp-idf/app_update/CMakeFiles/__idf_app_update.dir
C:/Users/alex/github/ESP-Nodes/ESP32-IDF_Blink/build/esp-idf/app_update/CMakeFiles/blank_ota_data.dir
C:/Users/alex/github/ESP-Nodes/ESP32-IDF_Blink/build/esp-idf/app_update/CMakeFiles/read-otadata.dir
C:/Users/alex/github/ESP-Nodes/ESP32-IDF_Blink/build/esp-idf/app_update/CMakeFiles/read_otadata.dir
C:/Users/alex/github/ESP-Nodes/ESP32-IDF_Blink/build/esp-idf/app_update/CMakeFiles/erase-otadata.dir
C:/Users/alex/github/ESP-Nodes/ESP32-IDF_Blink/build/esp-idf/app_update/CMakeFiles/erase_otadata.dir
C:/Users/alex/github/ESP-Nodes/ESP32-IDF_Blink/build/esp-idf/app_update/CMakeFiles/otadata-flash.dir
C:/Users/alex/github/ESP-Nodes/ESP32-IDF_Blink/build/esp-idf/app_update/CMakeFiles/encrypted-otadata-flash.dir
C:/Users/alex/github/ESP-Nodes/ESP32-IDF_Blink/build/esp-idf/app_update/CMakeFiles/edit_cache.dir
C:/Users/alex/github/ESP-Nodes/ESP32-IDF_Blink/build/esp-idf/app_update/CMakeFiles/rebuild_cache.dir
C:/Users/alex/github/ESP-Nodes/ESP32-IDF_Blink/build/esp-idf/app_update/CMakeFiles/list_install_components.dir

View File

@ -1 +1 @@
3b8741b172dc951e18509698dee938304bcf1523
31dbb87d8590d1adc5ac4e9659a555d88742900a

File diff suppressed because one or more lines are too long

View File

@ -1066,7 +1066,7 @@
},
{
"directory": "C:/Users/alex/github/ESP-Nodes/ESP32-IDF_Blink/build",
"command": "C:\\Users\\alex\\.espressif\\tools\\tools\\xtensa-esp-elf\\esp-13.2.0_20230928\\xtensa-esp-elf\\bin\\xtensa-esp32-elf-gcc.exe -DESP_PLATFORM -DIDF_VER=\\\"v5.2.2\\\" -DSOC_MMU_PAGE_SIZE=CONFIG_MMU_PAGE_SIZE -DSOC_XTAL_FREQ_MHZ=CONFIG_XTAL_FREQ -D_GLIBCXX_HAVE_POSIX_SEMAPHORE -D_GLIBCXX_USE_POSIX_SEMAPHORE -D_GNU_SOURCE -D_POSIX_READER_WRITER_LOCKS -D PROJECT_NAME=\\\"ESP32-IDF_Blink\\\" -DPROJECT_VER=\\\"c2439d1-dirty\\\" -IC:/Users/alex/github/ESP-Nodes/ESP32-IDF_Blink/build/config -IC:/Users/alex/esp/v5.2.2/esp-idf/components/esp_app_format/include -IC:/Users/alex/esp/v5.2.2/esp-idf/components/newlib/platform_include -IC:/Users/alex/esp/v5.2.2/esp-idf/components/freertos/config/include -IC:/Users/alex/esp/v5.2.2/esp-idf/components/freertos/config/include/freertos -IC:/Users/alex/esp/v5.2.2/esp-idf/components/freertos/config/xtensa/include -IC:/Users/alex/esp/v5.2.2/esp-idf/components/freertos/FreeRTOS-Kernel/include -IC:/Users/alex/esp/v5.2.2/esp-idf/components/freertos/FreeRTOS-Kernel/portable/xtensa/include -IC:/Users/alex/esp/v5.2.2/esp-idf/components/freertos/FreeRTOS-Kernel/portable/xtensa/include/freertos -IC:/Users/alex/esp/v5.2.2/esp-idf/components/freertos/esp_additions/include -IC:/Users/alex/esp/v5.2.2/esp-idf/components/esp_hw_support/include -IC:/Users/alex/esp/v5.2.2/esp-idf/components/esp_hw_support/include/soc -IC:/Users/alex/esp/v5.2.2/esp-idf/components/esp_hw_support/include/soc/esp32 -IC:/Users/alex/esp/v5.2.2/esp-idf/components/esp_hw_support/port/esp32/. -IC:/Users/alex/esp/v5.2.2/esp-idf/components/heap/include -IC:/Users/alex/esp/v5.2.2/esp-idf/components/log/include -IC:/Users/alex/esp/v5.2.2/esp-idf/components/soc/include -IC:/Users/alex/esp/v5.2.2/esp-idf/components/soc/esp32 -IC:/Users/alex/esp/v5.2.2/esp-idf/components/soc/esp32/include -IC:/Users/alex/esp/v5.2.2/esp-idf/components/hal/platform_port/include -IC:/Users/alex/esp/v5.2.2/esp-idf/components/hal/esp32/include -IC:/Users/alex/esp/v5.2.2/esp-idf/components/hal/include -IC:/Users/alex/esp/v5.2.2/esp-idf/components/esp_rom/include -IC:/Users/alex/esp/v5.2.2/esp-idf/components/esp_rom/include/esp32 -IC:/Users/alex/esp/v5.2.2/esp-idf/components/esp_rom/esp32 -IC:/Users/alex/esp/v5.2.2/esp-idf/components/esp_common/include -IC:/Users/alex/esp/v5.2.2/esp-idf/components/esp_system/include -IC:/Users/alex/esp/v5.2.2/esp-idf/components/esp_system/port/soc -IC:/Users/alex/esp/v5.2.2/esp-idf/components/esp_system/port/include/private -IC:/Users/alex/esp/v5.2.2/esp-idf/components/xtensa/esp32/include -IC:/Users/alex/esp/v5.2.2/esp-idf/components/xtensa/include -IC:/Users/alex/esp/v5.2.2/esp-idf/components/xtensa/deprecated_include -IC:/Users/alex/esp/v5.2.2/esp-idf/components/lwip/include -IC:/Users/alex/esp/v5.2.2/esp-idf/components/lwip/include/apps -IC:/Users/alex/esp/v5.2.2/esp-idf/components/lwip/include/apps/sntp -IC:/Users/alex/esp/v5.2.2/esp-idf/components/lwip/lwip/src/include -IC:/Users/alex/esp/v5.2.2/esp-idf/components/lwip/port/include -IC:/Users/alex/esp/v5.2.2/esp-idf/components/lwip/port/freertos/include -IC:/Users/alex/esp/v5.2.2/esp-idf/components/lwip/port/esp32xx/include -IC:/Users/alex/esp/v5.2.2/esp-idf/components/lwip/port/esp32xx/include/arch -IC:/Users/alex/esp/v5.2.2/esp-idf/components/lwip/port/esp32xx/include/sys -mlongcalls -Wno-frame-address -fno-builtin-memcpy -fno-builtin-memset -fno-builtin-bzero -fno-builtin-stpcpy -fno-builtin-strncpy -fdiagnostics-color=always -ffunction-sections -fdata-sections -Wall -Werror=all -Wno-error=unused-function -Wno-error=unused-variable -Wno-error=unused-but-set-variable -Wno-error=deprecated-declarations -Wextra -Wno-unused-parameter -Wno-sign-compare -Wno-enum-conversion -gdwarf-4 -ggdb -Og -fno-shrink-wrap -fmacro-prefix-map=C:/Users/alex/github/ESP-Nodes/ESP32-IDF_Blink=. -fmacro-prefix-map=C:/Users/alex/esp/v5.2.2/esp-idf=/IDF -fstrict-volatile-bitfields -fno-jump-tables -fno-tree-switch-conversion -std=gnu17 -Wno-old-style-declaration -o esp-idf\\esp_app_format\\CMakeFiles\\__idf_esp_app_format.dir\\esp_app_desc.c.obj -c C:\\Users\\alex\\esp\\v5.2.2\\esp-idf\\components\\esp_app_format\\esp_app_desc.c",
"command": "C:\\Users\\alex\\.espressif\\tools\\tools\\xtensa-esp-elf\\esp-13.2.0_20230928\\xtensa-esp-elf\\bin\\xtensa-esp32-elf-gcc.exe -DESP_PLATFORM -DIDF_VER=\\\"v5.2.2\\\" -DSOC_MMU_PAGE_SIZE=CONFIG_MMU_PAGE_SIZE -DSOC_XTAL_FREQ_MHZ=CONFIG_XTAL_FREQ -D_GLIBCXX_HAVE_POSIX_SEMAPHORE -D_GLIBCXX_USE_POSIX_SEMAPHORE -D_GNU_SOURCE -D_POSIX_READER_WRITER_LOCKS -D PROJECT_NAME=\\\"ESP32-IDF_Blink\\\" -DPROJECT_VER=\\\"31dbb87-dirty\\\" -IC:/Users/alex/github/ESP-Nodes/ESP32-IDF_Blink/build/config -IC:/Users/alex/esp/v5.2.2/esp-idf/components/esp_app_format/include -IC:/Users/alex/esp/v5.2.2/esp-idf/components/newlib/platform_include -IC:/Users/alex/esp/v5.2.2/esp-idf/components/freertos/config/include -IC:/Users/alex/esp/v5.2.2/esp-idf/components/freertos/config/include/freertos -IC:/Users/alex/esp/v5.2.2/esp-idf/components/freertos/config/xtensa/include -IC:/Users/alex/esp/v5.2.2/esp-idf/components/freertos/FreeRTOS-Kernel/include -IC:/Users/alex/esp/v5.2.2/esp-idf/components/freertos/FreeRTOS-Kernel/portable/xtensa/include -IC:/Users/alex/esp/v5.2.2/esp-idf/components/freertos/FreeRTOS-Kernel/portable/xtensa/include/freertos -IC:/Users/alex/esp/v5.2.2/esp-idf/components/freertos/esp_additions/include -IC:/Users/alex/esp/v5.2.2/esp-idf/components/esp_hw_support/include -IC:/Users/alex/esp/v5.2.2/esp-idf/components/esp_hw_support/include/soc -IC:/Users/alex/esp/v5.2.2/esp-idf/components/esp_hw_support/include/soc/esp32 -IC:/Users/alex/esp/v5.2.2/esp-idf/components/esp_hw_support/port/esp32/. -IC:/Users/alex/esp/v5.2.2/esp-idf/components/heap/include -IC:/Users/alex/esp/v5.2.2/esp-idf/components/log/include -IC:/Users/alex/esp/v5.2.2/esp-idf/components/soc/include -IC:/Users/alex/esp/v5.2.2/esp-idf/components/soc/esp32 -IC:/Users/alex/esp/v5.2.2/esp-idf/components/soc/esp32/include -IC:/Users/alex/esp/v5.2.2/esp-idf/components/hal/platform_port/include -IC:/Users/alex/esp/v5.2.2/esp-idf/components/hal/esp32/include -IC:/Users/alex/esp/v5.2.2/esp-idf/components/hal/include -IC:/Users/alex/esp/v5.2.2/esp-idf/components/esp_rom/include -IC:/Users/alex/esp/v5.2.2/esp-idf/components/esp_rom/include/esp32 -IC:/Users/alex/esp/v5.2.2/esp-idf/components/esp_rom/esp32 -IC:/Users/alex/esp/v5.2.2/esp-idf/components/esp_common/include -IC:/Users/alex/esp/v5.2.2/esp-idf/components/esp_system/include -IC:/Users/alex/esp/v5.2.2/esp-idf/components/esp_system/port/soc -IC:/Users/alex/esp/v5.2.2/esp-idf/components/esp_system/port/include/private -IC:/Users/alex/esp/v5.2.2/esp-idf/components/xtensa/esp32/include -IC:/Users/alex/esp/v5.2.2/esp-idf/components/xtensa/include -IC:/Users/alex/esp/v5.2.2/esp-idf/components/xtensa/deprecated_include -IC:/Users/alex/esp/v5.2.2/esp-idf/components/lwip/include -IC:/Users/alex/esp/v5.2.2/esp-idf/components/lwip/include/apps -IC:/Users/alex/esp/v5.2.2/esp-idf/components/lwip/include/apps/sntp -IC:/Users/alex/esp/v5.2.2/esp-idf/components/lwip/lwip/src/include -IC:/Users/alex/esp/v5.2.2/esp-idf/components/lwip/port/include -IC:/Users/alex/esp/v5.2.2/esp-idf/components/lwip/port/freertos/include -IC:/Users/alex/esp/v5.2.2/esp-idf/components/lwip/port/esp32xx/include -IC:/Users/alex/esp/v5.2.2/esp-idf/components/lwip/port/esp32xx/include/arch -IC:/Users/alex/esp/v5.2.2/esp-idf/components/lwip/port/esp32xx/include/sys -mlongcalls -Wno-frame-address -fno-builtin-memcpy -fno-builtin-memset -fno-builtin-bzero -fno-builtin-stpcpy -fno-builtin-strncpy -fdiagnostics-color=always -ffunction-sections -fdata-sections -Wall -Werror=all -Wno-error=unused-function -Wno-error=unused-variable -Wno-error=unused-but-set-variable -Wno-error=deprecated-declarations -Wextra -Wno-unused-parameter -Wno-sign-compare -Wno-enum-conversion -gdwarf-4 -ggdb -Og -fno-shrink-wrap -fmacro-prefix-map=C:/Users/alex/github/ESP-Nodes/ESP32-IDF_Blink=. -fmacro-prefix-map=C:/Users/alex/esp/v5.2.2/esp-idf=/IDF -fstrict-volatile-bitfields -fno-jump-tables -fno-tree-switch-conversion -std=gnu17 -Wno-old-style-declaration -o esp-idf\\esp_app_format\\CMakeFiles\\__idf_esp_app_format.dir\\esp_app_desc.c.obj -c C:\\Users\\alex\\esp\\v5.2.2\\esp-idf\\components\\esp_app_format\\esp_app_desc.c",
"file": "C:\\Users\\alex\\esp\\v5.2.2\\esp-idf\\components\\esp_app_format\\esp_app_desc.c"
},
{

View File

@ -318,12 +318,12 @@ set(CONFIG_ESPTOOLPY_AFTER_RESET "y")
set(CONFIG_ESPTOOLPY_AFTER_NORESET "")
set(CONFIG_ESPTOOLPY_AFTER "hard_reset")
set(CONFIG_ESPTOOLPY_MONITOR_BAUD "115200")
set(CONFIG_PARTITION_TABLE_SINGLE_APP "")
set(CONFIG_PARTITION_TABLE_SINGLE_APP "y")
set(CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE "")
set(CONFIG_PARTITION_TABLE_TWO_OTA "y")
set(CONFIG_PARTITION_TABLE_TWO_OTA "")
set(CONFIG_PARTITION_TABLE_CUSTOM "")
set(CONFIG_PARTITION_TABLE_CUSTOM_FILENAME "partitions.csv")
set(CONFIG_PARTITION_TABLE_FILENAME "partitions_two_ota.csv")
set(CONFIG_PARTITION_TABLE_FILENAME "partitions_singleapp.csv")
set(CONFIG_PARTITION_TABLE_OFFSET "0x8000")
set(CONFIG_PARTITION_TABLE_MD5 "y")
set(CONFIG_ENV_GPIO_RANGE_MIN "0")

View File

@ -273,9 +273,9 @@
#define CONFIG_ESPTOOLPY_AFTER_RESET 1
#define CONFIG_ESPTOOLPY_AFTER "hard_reset"
#define CONFIG_ESPTOOLPY_MONITOR_BAUD 115200
#define CONFIG_PARTITION_TABLE_TWO_OTA 1
#define CONFIG_PARTITION_TABLE_SINGLE_APP 1
#define CONFIG_PARTITION_TABLE_CUSTOM_FILENAME "partitions.csv"
#define CONFIG_PARTITION_TABLE_FILENAME "partitions_two_ota.csv"
#define CONFIG_PARTITION_TABLE_FILENAME "partitions_singleapp.csv"
#define CONFIG_PARTITION_TABLE_OFFSET 0x8000
#define CONFIG_PARTITION_TABLE_MD5 1
#define CONFIG_ENV_GPIO_RANGE_MIN 0

View File

@ -744,12 +744,12 @@
"OPENTHREAD_XTAL_ACCURACY": 130,
"PARTITION_TABLE_CUSTOM": false,
"PARTITION_TABLE_CUSTOM_FILENAME": "partitions.csv",
"PARTITION_TABLE_FILENAME": "partitions_two_ota.csv",
"PARTITION_TABLE_FILENAME": "partitions_singleapp.csv",
"PARTITION_TABLE_MD5": true,
"PARTITION_TABLE_OFFSET": 32768,
"PARTITION_TABLE_SINGLE_APP": false,
"PARTITION_TABLE_SINGLE_APP": true,
"PARTITION_TABLE_SINGLE_APP_LARGE": false,
"PARTITION_TABLE_TWO_OTA": true,
"PARTITION_TABLE_TWO_OTA": false,
"PCNT_CTRL_FUNC_IN_IRAM": false,
"PCNT_ENABLE_DEBUG_LOG": false,
"PCNT_ISR_IRAM_SAFE": false,

View File

@ -10,13 +10,11 @@
"flash_files" : {
"0x1000" : "bootloader/bootloader.bin",
"0x10000" : "$<TARGET_PROPERTY:__idf_build_target,EXECUTABLE_NAME>.bin",
"0x8000" : "partition_table/partition-table.bin",
"0xd000" : "ota_data_initial.bin"
"0x8000" : "partition_table/partition-table.bin"
},
"bootloader" : { "offset" : "0x1000", "file" : "bootloader/bootloader.bin", "encrypted" : "false" },
"app" : { "offset" : "0x10000", "file" : "$<TARGET_PROPERTY:__idf_build_target,EXECUTABLE_NAME>.bin", "encrypted" : "false" },
"partition-table" : { "offset" : "0x8000", "file" : "partition_table/partition-table.bin", "encrypted" : "false" },
"otadata" : { "offset" : "0xd000", "file" : "ota_data_initial.bin", "encrypted" : "false" },
"extra_esptool_args" : {
"after" : "hard_reset",
"before" : "default_reset",

View File

@ -2,4 +2,3 @@
0x1000 bootloader/bootloader.bin
0x10000 ESP32-IDF_Blink.bin
0x8000 partition_table/partition-table.bin
0xd000 ota_data_initial.bin

View File

@ -1,5 +1,4 @@
--flash_mode dio --flash_freq 40m --flash_size 2MB
0x1000 bootloader/bootloader.bin
0x10000 $<TARGET_PROPERTY:__idf_build_target,EXECUTABLE_NAME>.bin
0x8000 partition_table/partition-table.bin
0xd000 ota_data_initial.bin
0x8000 partition_table/partition-table.bin

View File

@ -2,4 +2,3 @@
0x1000 bootloader/bootloader.bin
0x10000 ESP32-IDF_Blink.bin
0x8000 partition_table/partition-table.bin
0xd000 ota_data_initial.bin

View File

@ -10,13 +10,11 @@
"flash_files" : {
"0x1000" : "bootloader/bootloader.bin",
"0x10000" : "ESP32-IDF_Blink.bin",
"0x8000" : "partition_table/partition-table.bin",
"0xd000" : "ota_data_initial.bin"
"0x8000" : "partition_table/partition-table.bin"
},
"bootloader" : { "offset" : "0x1000", "file" : "bootloader/bootloader.bin", "encrypted" : "false" },
"app" : { "offset" : "0x10000", "file" : "ESP32-IDF_Blink.bin", "encrypted" : "false" },
"partition-table" : { "offset" : "0x8000", "file" : "partition_table/partition-table.bin", "encrypted" : "false" },
"otadata" : { "offset" : "0xd000", "file" : "ota_data_initial.bin", "encrypted" : "false" },
"extra_esptool_args" : {
"after" : "hard_reset",
"before" : "default_reset",

View File

@ -1,7 +1,7 @@
{
"version": "1.1",
"project_name": "ESP32-IDF_Blink",
"project_version": "c2439d1-dirty",
"project_version": "31dbb87-dirty",
"project_path": "C:/Users/alex/github/ESP-Nodes/ESP32-IDF_Blink",
"idf_path": "C:/Users/alex/esp/v5.2.2/esp-idf",
"build_dir": "C:/Users/alex/github/ESP-Nodes/ESP32-IDF_Blink/build",

View File

@ -229,7 +229,7 @@ CONFIG_IDF_TOOLCHAIN="gcc"
CONFIG_IDF_TARGET_ARCH_XTENSA=y
CONFIG_IDF_TARGET_ARCH="xtensa"
CONFIG_IDF_TARGET="esp32"
CONFIG_IDF_INIT_VERSION="$IDF_INIT_VERSION"
CONFIG_IDF_INIT_VERSION="5.2.2"
CONFIG_IDF_TARGET_ESP32=y
CONFIG_IDF_FIRMWARE_CHIP_ID=0x0000