File tree Expand file tree Collapse file tree 7 files changed +20
-11
lines changed Expand file tree Collapse file tree 7 files changed +20
-11
lines changed Original file line number Diff line number Diff line change 14
14
#define CONFIG_APP_BUILD_BOOTLOADER 1
15
15
#define CONFIG_APP_BUILD_USE_FLASH_SECTIONS 1
16
16
#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"
17
19
#define CONFIG_APP_RETRIEVE_LEN_ELF_SHA 16
18
20
#define CONFIG_BOOTLOADER_OFFSET_IN_FLASH 0x1000
19
21
#define CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_SIZE 1
598
600
#define CONFIG_ULP_COPROC_ENABLED CONFIG_ESP32_ULP_COPROC_ENABLED
599
601
#define CONFIG_ULP_COPROC_RESERVE_MEM CONFIG_ESP32_ULP_COPROC_RESERVE_MEM
600
602
#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"
Original file line number Diff line number Diff line change 14
14
#define CONFIG_APP_BUILD_BOOTLOADER 1
15
15
#define CONFIG_APP_BUILD_USE_FLASH_SECTIONS 1
16
16
#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"
17
19
#define CONFIG_APP_RETRIEVE_LEN_ELF_SHA 16
18
20
#define CONFIG_BOOTLOADER_OFFSET_IN_FLASH 0x1000
19
21
#define CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_SIZE 1
598
600
#define CONFIG_ULP_COPROC_ENABLED CONFIG_ESP32_ULP_COPROC_ENABLED
599
601
#define CONFIG_ULP_COPROC_RESERVE_MEM CONFIG_ESP32_ULP_COPROC_RESERVE_MEM
600
602
#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"
Load Diff Large diffs are not rendered by default.
Original file line number Diff line number Diff line change 14
14
#define CONFIG_APP_BUILD_BOOTLOADER 1
15
15
#define CONFIG_APP_BUILD_USE_FLASH_SECTIONS 1
16
16
#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"
17
19
#define CONFIG_APP_RETRIEVE_LEN_ELF_SHA 16
18
20
#define CONFIG_BOOTLOADER_OFFSET_IN_FLASH 0x1000
19
21
#define CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_SIZE 1
598
600
#define CONFIG_ULP_COPROC_ENABLED CONFIG_ESP32_ULP_COPROC_ENABLED
599
601
#define CONFIG_ULP_COPROC_RESERVE_MEM CONFIG_ESP32_ULP_COPROC_RESERVE_MEM
600
602
#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"
Original file line number Diff line number Diff line change 14
14
#define CONFIG_APP_BUILD_BOOTLOADER 1
15
15
#define CONFIG_APP_BUILD_USE_FLASH_SECTIONS 1
16
16
#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"
17
19
#define CONFIG_APP_RETRIEVE_LEN_ELF_SHA 16
18
20
#define CONFIG_BOOTLOADER_OFFSET_IN_FLASH 0x1000
19
21
#define CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_SIZE 1
598
600
#define CONFIG_ULP_COPROC_ENABLED CONFIG_ESP32_ULP_COPROC_ENABLED
599
601
#define CONFIG_ULP_COPROC_RESERVE_MEM CONFIG_ESP32_ULP_COPROC_RESERVE_MEM
600
602
#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"
Original file line number Diff line number Diff line change @@ -31,7 +31,8 @@ CONFIG_APP_BUILD_USE_FLASH_SECTIONS=y
31
31
CONFIG_APP_COMPILE_TIME_DATE=y
32
32
# CONFIG_APP_EXCLUDE_PROJECT_VER_VAR is not set
33
33
# 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"
35
36
CONFIG_APP_RETRIEVE_LEN_ELF_SHA=16
36
37
# end of Application manager
37
38
You can’t perform that action at this time.
0 commit comments