ZengQingming/JoyD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

解决地址冲突

Browse Source
This commit is contained in:
zqm
2026-03-31 17:01:45 +08:00
parent 2aea8864e9
commit 40515e469f
25 changed files with 1180 additions and 383 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ESP32/my_usb_project/build/bootloader/config/sdkconfig.cmake
View File

@@ -456,12 +456,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 "y")
set(CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE "")
set(CONFIG_PARTITION_TABLE_SINGLE_APP "")
set(CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE "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_singleapp.csv")
set(CONFIG_PARTITION_TABLE_FILENAME "partitions_singleapp_large.csv")
set(CONFIG_PARTITION_TABLE_OFFSET "0x8000")
set(CONFIG_PARTITION_TABLE_MD5 "y")
set(CONFIG_COMPILER_OPTIMIZATION_DEBUG "y")

4
ESP32/my_usb_project/build/bootloader/config/sdkconfig.h
View File

@@ -410,9 +410,9 @@
#define CONFIG_ESPTOOLPY_AFTER_RESET 1
#define CONFIG_ESPTOOLPY_AFTER "hard_reset"
#define CONFIG_ESPTOOLPY_MONITOR_BAUD 115200
#define CONFIG_PARTITION_TABLE_SINGLE_APP 1
#define CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE 1
#define CONFIG_PARTITION_TABLE_CUSTOM_FILENAME "partitions.csv"
#define CONFIG_PARTITION_TABLE_FILENAME "partitions_singleapp.csv"
#define CONFIG_PARTITION_TABLE_FILENAME "partitions_singleapp_large.csv"
#define CONFIG_PARTITION_TABLE_OFFSET 0x8000
#define CONFIG_PARTITION_TABLE_MD5 1
#define CONFIG_COMPILER_OPTIMIZATION_DEBUG 1

6
ESP32/my_usb_project/build/bootloader/config/sdkconfig.json
View File

@@ -328,11 +328,11 @@
"NEWLIB_TIME_SYSCALL_USE_RTC_HRT": true,
"PARTITION_TABLE_CUSTOM": false,
"PARTITION_TABLE_CUSTOM_FILENAME": "partitions.csv",
"PARTITION_TABLE_FILENAME": "partitions_singleapp.csv",
"PARTITION_TABLE_FILENAME": "partitions_singleapp_large.csv",
"PARTITION_TABLE_MD5": true,
"PARTITION_TABLE_OFFSET": 32768,
"PARTITION_TABLE_SINGLE_APP": true,
"PARTITION_TABLE_SINGLE_APP_LARGE": false,
"PARTITION_TABLE_SINGLE_APP": false,
"PARTITION_TABLE_SINGLE_APP_LARGE": true,
"PARTITION_TABLE_TWO_OTA": false,
"PERIPH_CTRL_FUNC_IN_IRAM": true,
"RTC_CLK_CAL_CYCLES": 1024,