mirrors
/
Tasmota
mirror of https://github.com/arendst/Tasmota.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #15286 from Jason2866/work 

Add standard USB modes in boards.json
This commit is contained in:
Theo Arends 2022-04-04 15:17:19 +02:00 committed by GitHub
parent a8ff74b897 72f1da9ca4
commit d9c43c0ab7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
boards/esp32c3.json
View File

@ -4,7 +4,7 @@
"ldscript": "esp32c3_out.ld" "ldscript": "esp32c3_out.ld"
}, },
"core": "esp32", "core": "esp32",
"extra_flags": "-DARDUINO_USB_CDC_ON_BOOT=0 -DESP32_4M -DESP32C3", "extra_flags": "-DARDUINO_USB_MODE=1 -DARDUINO_USB_CDC_ON_BOOT=0 -DESP32_4M -DESP32C3",
"f_cpu": "160000000L", "f_cpu": "160000000L",
"f_flash": "80000000L", "f_flash": "80000000L",
"flash_mode": "dout", "flash_mode": "dout",

2
boards/esp32s2.json
View File

@ -4,7 +4,7 @@
"ldscript": "esp32s2_out.ld" "ldscript": "esp32s2_out.ld"
}, },
"core": "esp32", "core": "esp32",
"extra_flags": "-DBOARD_HAS_PSRAM -DESP32_4M -DESP32S2", "extra_flags": "-DBOARD_HAS_PSRAM -DARDUINO_USB_MODE=0 -DARDUINO_USB_CDC_ON_BOOT=0 -DARDUINO_USB_MSC_ON_BOOT=0 -DARDUINO_USB_DFU_ON_BOOT=0 -DESP32_4M -DESP32S2",
"f_cpu": "240000000L", "f_cpu": "240000000L",
"f_flash": "80000000L", "f_flash": "80000000L",
"flash_mode": "dout", "flash_mode": "dout",

2
boards/esp32s3.json
View File

@ -5,7 +5,7 @@
"memory_type": "qspi_qspi" "memory_type": "qspi_qspi"
}, },
"core": "esp32", "core": "esp32",
"extra_flags": "-DBOARD_HAS_PSRAM -DESP32_4M -DESP32S3", "extra_flags": "-DBOARD_HAS_PSRAM -DARDUINO_USB_MODE=0 -DARDUINO_USB_CDC_ON_BOOT=0 -DARDUINO_USB_MSC_ON_BOOT=0 -DARDUINO_USB_DFU_ON_BOOT=0 -DESP32_4M -DESP32S3",
"f_cpu": "240000000L", "f_cpu": "240000000L",
"f_flash": "80000000L", "f_flash": "80000000L",
"flash_mode": "dio", "flash_mode": "dio",

2
boards/esp32s3_8M.json
View File

@ -5,7 +5,7 @@
"memory_type": "qspi_qspi" "memory_type": "qspi_qspi"
}, },
"core": "esp32", "core": "esp32",
"extra_flags": "-DBOARD_HAS_PSRAM -DESP32_8M -DESP32S3", "extra_flags": "-DBOARD_HAS_PSRAM -DARDUINO_USB_MODE=0 -DARDUINO_USB_CDC_ON_BOOT=0 -DARDUINO_USB_MSC_ON_BOOT=0 -DARDUINO_USB_DFU_ON_BOOT=0 -DESP32_8M -DESP32S3",
"f_cpu": "240000000L", "f_cpu": "240000000L",
"f_flash": "80000000L", "f_flash": "80000000L",
"flash_mode": "dio", "flash_mode": "dio",

4
tasmota/support_esp.ino
View File

@ -382,6 +382,10 @@ String ESP32GetResetReason(uint32_t cpu_no) {
case 17 : return F("Time Group1 reset CPU"); // 17 - TG1WDT_CPU_RESET case 17 : return F("Time Group1 reset CPU"); // 17 - TG1WDT_CPU_RESET
case 18 : return F("Super watchdog reset digital core and rtc module"); // 18 - SUPER_WDT_RESET case 18 : return F("Super watchdog reset digital core and rtc module"); // 18 - SUPER_WDT_RESET
case 19 : return F("Glitch reset digital core and rtc module"); // 19 - GLITCH_RTC_RESET case 19 : return F("Glitch reset digital core and rtc module"); // 19 - GLITCH_RTC_RESET
case 20 : return F("Efuse reset digital core"); // 20 EFUSE_RESET
case 21 : return F("Usb uart reset digital core"); // 21 USB_UART_CHIP_RESET
case 22 : return F("Usb jtag reset digital core"); // 22 USB_JTAG_CHIP_RESET
case 23 : return F("Power glitch reset digital core and rtc module"); // 23 POWER_GLITCH_RESET
} }
return F("No meaning"); // 0 and undefined return F("No meaning"); // 0 and undefined