Skip to content

Commit bfed024

Browse files
committed
Setting project version to match current GIIESP32Arduino library version.
1 parent 4af3e0f commit bfed024

File tree

7 files changed

+20
-11
lines changed

7 files changed

+20
-11
lines changed

tools/esp32/dio_qspi/include/sdkconfig.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414
#define CONFIG_APP_BUILD_BOOTLOADER 1
1515
#define CONFIG_APP_BUILD_USE_FLASH_SECTIONS 1
1616
#define CONFIG_APP_COMPILE_TIME_DATE 1
17+
#define CONFIG_APP_PROJECT_VER_FROM_CONFIG 1
18+
#define CONFIG_APP_PROJECT_VER "1.0.0-alpha.4"
1719
#define CONFIG_APP_RETRIEVE_LEN_ELF_SHA 16
1820
#define CONFIG_BOOTLOADER_OFFSET_IN_FLASH 0x1000
1921
#define CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_SIZE 1
@@ -598,5 +600,5 @@
598600
#define CONFIG_ULP_COPROC_ENABLED CONFIG_ESP32_ULP_COPROC_ENABLED
599601
#define CONFIG_ULP_COPROC_RESERVE_MEM CONFIG_ESP32_ULP_COPROC_RESERVE_MEM
600602
#define CONFIG_WARN_WRITE_STRINGS CONFIG_COMPILER_WARN_WRITE_STRINGS
601-
#define CONFIG_ARDUINO_IDF_COMMIT "1b16ef6cfc"
602-
#define CONFIG_ARDUINO_IDF_BRANCH "v4.4.2"
603+
#define CONFIG_ARDUINO_IDF_COMMIT ""
604+
#define CONFIG_ARDUINO_IDF_BRANCH "feature/fws-1b16ef6cfc-4.4.2"

tools/esp32/dout_qspi/include/sdkconfig.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414
#define CONFIG_APP_BUILD_BOOTLOADER 1
1515
#define CONFIG_APP_BUILD_USE_FLASH_SECTIONS 1
1616
#define CONFIG_APP_COMPILE_TIME_DATE 1
17+
#define CONFIG_APP_PROJECT_VER_FROM_CONFIG 1
18+
#define CONFIG_APP_PROJECT_VER "1.0.0-alpha.4"
1719
#define CONFIG_APP_RETRIEVE_LEN_ELF_SHA 16
1820
#define CONFIG_BOOTLOADER_OFFSET_IN_FLASH 0x1000
1921
#define CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_SIZE 1
@@ -598,5 +600,5 @@
598600
#define CONFIG_ULP_COPROC_ENABLED CONFIG_ESP32_ULP_COPROC_ENABLED
599601
#define CONFIG_ULP_COPROC_RESERVE_MEM CONFIG_ESP32_ULP_COPROC_RESERVE_MEM
600602
#define CONFIG_WARN_WRITE_STRINGS CONFIG_COMPILER_WARN_WRITE_STRINGS
601-
#define CONFIG_ARDUINO_IDF_COMMIT "1b16ef6cfc"
602-
#define CONFIG_ARDUINO_IDF_BRANCH "v4.4.2"
603+
#define CONFIG_ARDUINO_IDF_COMMIT ""
604+
#define CONFIG_ARDUINO_IDF_BRANCH "feature/fws-1b16ef6cfc-4.4.2"

tools/esp32/ld/sections.ld

Lines changed: 2 additions & 2 deletions
Large diffs are not rendered by default.

tools/esp32/lib/libapp_update.a

0 Bytes
Binary file not shown.

tools/esp32/qio_qspi/include/sdkconfig.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414
#define CONFIG_APP_BUILD_BOOTLOADER 1
1515
#define CONFIG_APP_BUILD_USE_FLASH_SECTIONS 1
1616
#define CONFIG_APP_COMPILE_TIME_DATE 1
17+
#define CONFIG_APP_PROJECT_VER_FROM_CONFIG 1
18+
#define CONFIG_APP_PROJECT_VER "1.0.0-alpha.4"
1719
#define CONFIG_APP_RETRIEVE_LEN_ELF_SHA 16
1820
#define CONFIG_BOOTLOADER_OFFSET_IN_FLASH 0x1000
1921
#define CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_SIZE 1
@@ -598,5 +600,5 @@
598600
#define CONFIG_ULP_COPROC_ENABLED CONFIG_ESP32_ULP_COPROC_ENABLED
599601
#define CONFIG_ULP_COPROC_RESERVE_MEM CONFIG_ESP32_ULP_COPROC_RESERVE_MEM
600602
#define CONFIG_WARN_WRITE_STRINGS CONFIG_COMPILER_WARN_WRITE_STRINGS
601-
#define CONFIG_ARDUINO_IDF_COMMIT "1b16ef6cfc"
602-
#define CONFIG_ARDUINO_IDF_BRANCH "v4.4.2"
603+
#define CONFIG_ARDUINO_IDF_COMMIT ""
604+
#define CONFIG_ARDUINO_IDF_BRANCH "feature/fws-1b16ef6cfc-4.4.2"

tools/esp32/qout_qspi/include/sdkconfig.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414
#define CONFIG_APP_BUILD_BOOTLOADER 1
1515
#define CONFIG_APP_BUILD_USE_FLASH_SECTIONS 1
1616
#define CONFIG_APP_COMPILE_TIME_DATE 1
17+
#define CONFIG_APP_PROJECT_VER_FROM_CONFIG 1
18+
#define CONFIG_APP_PROJECT_VER "1.0.0-alpha.4"
1719
#define CONFIG_APP_RETRIEVE_LEN_ELF_SHA 16
1820
#define CONFIG_BOOTLOADER_OFFSET_IN_FLASH 0x1000
1921
#define CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_SIZE 1
@@ -598,5 +600,5 @@
598600
#define CONFIG_ULP_COPROC_ENABLED CONFIG_ESP32_ULP_COPROC_ENABLED
599601
#define CONFIG_ULP_COPROC_RESERVE_MEM CONFIG_ESP32_ULP_COPROC_RESERVE_MEM
600602
#define CONFIG_WARN_WRITE_STRINGS CONFIG_COMPILER_WARN_WRITE_STRINGS
601-
#define CONFIG_ARDUINO_IDF_COMMIT "1b16ef6cfc"
602-
#define CONFIG_ARDUINO_IDF_BRANCH "v4.4.2"
603+
#define CONFIG_ARDUINO_IDF_COMMIT ""
604+
#define CONFIG_ARDUINO_IDF_BRANCH "feature/fws-1b16ef6cfc-4.4.2"

tools/esp32/sdkconfig

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@ CONFIG_APP_BUILD_USE_FLASH_SECTIONS=y
3131
CONFIG_APP_COMPILE_TIME_DATE=y
3232
# CONFIG_APP_EXCLUDE_PROJECT_VER_VAR is not set
3333
# CONFIG_APP_EXCLUDE_PROJECT_NAME_VAR is not set
34-
# CONFIG_APP_PROJECT_VER_FROM_CONFIG is not set
34+
CONFIG_APP_PROJECT_VER_FROM_CONFIG=y
35+
CONFIG_APP_PROJECT_VER="1.0.0-alpha.4"
3536
CONFIG_APP_RETRIEVE_LEN_ELF_SHA=16
3637
# end of Application manager
3738

0 commit comments

Comments
 (0)