mirror of
https://github.com/arendst/Tasmota.git
synced 2025-07-22 18:26:30 +00:00
Rename usb to cdc
This commit is contained in:
parent
31f82adc76
commit
1b701173d0
12
.github/workflows/Tasmota_build_devel.yml
vendored
12
.github/workflows/Tasmota_build_devel.yml
vendored
@ -40,20 +40,20 @@ jobs:
|
||||
- tasmota32-ir
|
||||
- tasmota32-lvgl
|
||||
- tasmota32c3
|
||||
- tasmota32c3usb
|
||||
- tasmota32c3cdc
|
||||
- tasmota32s2
|
||||
- tasmota32s2usb
|
||||
- tasmota32s2cdc
|
||||
- tasmota32s3
|
||||
- tasmota32s3usb
|
||||
- tasmota32s3cdc
|
||||
- tasmota32solo1
|
||||
- tasmota32solo1-safeboot
|
||||
- tasmota32-safeboot
|
||||
- tasmota32c3-safeboot
|
||||
- tasmota32c3usb-safeboot
|
||||
- tasmota32c3cdc-safeboot
|
||||
- tasmota32s2-safeboot
|
||||
- tasmota32s2usb-safeboot
|
||||
- tasmota32s2cdc-safeboot
|
||||
- tasmota32s3-safeboot
|
||||
- tasmota32s3usb-safeboot
|
||||
- tasmota32s3cdc-safeboot
|
||||
steps:
|
||||
- uses: actions/checkout@v3
|
||||
with:
|
||||
|
12
.github/workflows/Tasmota_build_master.yml
vendored
12
.github/workflows/Tasmota_build_master.yml
vendored
@ -39,20 +39,20 @@ jobs:
|
||||
- tasmota32-ir
|
||||
- tasmota32-lvgl
|
||||
- tasmota32c3
|
||||
- tasmota32c3usb
|
||||
- tasmota32c3cdc
|
||||
- tasmota32s2
|
||||
- tasmota32s2usb
|
||||
- tasmota32s2cdc
|
||||
- tasmota32s3
|
||||
- tasmota32s3usb
|
||||
- tasmota32s3cdc
|
||||
- tasmota32solo1
|
||||
- tasmota32solo1-safeboot
|
||||
- tasmota32-safeboot
|
||||
- tasmota32c3-safeboot
|
||||
- tasmota32c3usb-safeboot
|
||||
- tasmota32c3cdc-safeboot
|
||||
- tasmota32s2-safeboot
|
||||
- tasmota32s2usb-safeboot
|
||||
- tasmota32s2cdc-safeboot
|
||||
- tasmota32s3-safeboot
|
||||
- tasmota32s3usb-safeboot
|
||||
- tasmota32s3cdc-safeboot
|
||||
steps:
|
||||
- uses: actions/checkout@v3
|
||||
with:
|
||||
|
12
.github/workflows/build_all_the_things.yml
vendored
12
.github/workflows/build_all_the_things.yml
vendored
@ -43,20 +43,20 @@ jobs:
|
||||
- tasmota32-ir
|
||||
- tasmota32-lvgl
|
||||
- tasmota32c3
|
||||
- tasmota32c3usb
|
||||
- tasmota32c3cdc
|
||||
- tasmota32s2
|
||||
- tasmota32s2usb
|
||||
- tasmota32s2cdc
|
||||
- tasmota32s3
|
||||
- tasmota32s3usb
|
||||
- tasmota32s3cdc
|
||||
- tasmota32solo1
|
||||
- tasmota32solo1-safeboot
|
||||
- tasmota32-safeboot
|
||||
- tasmota32c3-safeboot
|
||||
- tasmota32c3usb-safeboot
|
||||
- tasmota32c3cdc-safeboot
|
||||
- tasmota32s2-safeboot
|
||||
- tasmota32s2usb-safeboot
|
||||
- tasmota32s2cdc-safeboot
|
||||
- tasmota32s3-safeboot
|
||||
- tasmota32s3usb-safeboot
|
||||
- tasmota32s3cdc-safeboot
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
- name: Set up Python
|
||||
|
@ -80,8 +80,8 @@ The latter links can be used for OTA upgrades too like ``OtaUrl http://ota.tasmo
|
||||
The following binary downloads have been compiled with ESP32/Arduino library core version **2.0.3**.
|
||||
|
||||
- **tasmota32.bin** = The Tasmota version with most drivers including additional sensors and KNX for 4M+ flash. **RECOMMENDED RELEASE BINARY**
|
||||
- **tasmota32xx.bin** = The Tasmota version with most drivers including additional sensors and KNX for ESP32-C3/S2/S3 and 4M+ flash.
|
||||
- **tasmota32xxusb.bin** = The Tasmota version with most drivers including additional sensors and KNX for ESP32-C3/S2/S3 with embedded USB only and 4M+ flash.
|
||||
- **tasmota32xy.bin** = The Tasmota version with most drivers including additional sensors and KNX for ESP32-C3/S2/S3 and 4M+ flash.
|
||||
- **tasmota32xycdc.bin** = The Tasmota version with most drivers including additional sensors and KNX for ESP32-C3/S2/S3 with embedded USB CDC only and 4M+ flash.
|
||||
- **tasmota32solo1.bin** = The Tasmota version with most drivers including additional sensors and KNX for single core ESP32 and 4M+ flash.
|
||||
- **tasmota32-AF.bin** to **tasmota32-VN.bin** = The Tasmota version in different languages for 4M+ flash.
|
||||
- **tasmota32-bluetooth.bin** = The Bluetooth version adds BLE support for 4M+ flash.
|
||||
|
@ -4,7 +4,7 @@
|
||||
"ldscript": "esp32c3_out.ld"
|
||||
},
|
||||
"core": "esp32",
|
||||
"extra_flags": "-DARDUINO_USB_MODE=1 -DARDUINO_USB_CDC_ON_BOOT=0 -DESP32_4M -DESP32C3 -DUSE_USB_SERIAL_CONSOLE",
|
||||
"extra_flags": "-DARDUINO_USB_MODE=1 -DARDUINO_USB_CDC_ON_BOOT=0 -DESP32_4M -DESP32C3 -DUSE_USB_CDC_CONSOLE",
|
||||
"f_cpu": "160000000L",
|
||||
"f_flash": "80000000L",
|
||||
"flash_mode": "dout",
|
||||
@ -28,7 +28,7 @@
|
||||
"flash_extra_images": [
|
||||
[
|
||||
"0x10000",
|
||||
"variants/tasmota/tasmota32c3usb-safeboot.bin"
|
||||
"variants/tasmota/tasmota32c3cdc-safeboot.bin"
|
||||
]
|
||||
]
|
||||
},
|
@ -4,7 +4,7 @@
|
||||
"ldscript": "esp32s2_out.ld"
|
||||
},
|
||||
"core": "esp32",
|
||||
"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 -DUSE_USB_SERIAL_CONSOLE -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 -DUSE_USB_CDC_CONSOLE -DESP32_4M -DESP32S2",
|
||||
"f_cpu": "240000000L",
|
||||
"f_flash": "80000000L",
|
||||
"flash_mode": "dout",
|
||||
@ -28,7 +28,7 @@
|
||||
"flash_extra_images": [
|
||||
[
|
||||
"0x10000",
|
||||
"variants/tasmota/tasmota32s2usb-safeboot.bin"
|
||||
"variants/tasmota/tasmota32s2cdc-safeboot.bin"
|
||||
]
|
||||
]
|
||||
},
|
@ -5,7 +5,7 @@
|
||||
"memory_type": "qspi_qspi"
|
||||
},
|
||||
"core": "esp32",
|
||||
"extra_flags": "-DBOARD_HAS_PSRAM -DARDUINO_USB_MODE=1 -DARDUINO_USB_CDC_ON_BOOT=0 -DARDUINO_USB_MSC_ON_BOOT=0 -DARDUINO_USB_DFU_ON_BOOT=0 -DUSE_USB_SERIAL_CONSOLE -DESP32_4M -DESP32S3",
|
||||
"extra_flags": "-DBOARD_HAS_PSRAM -DARDUINO_USB_MODE=1 -DARDUINO_USB_CDC_ON_BOOT=0 -DARDUINO_USB_MSC_ON_BOOT=0 -DARDUINO_USB_DFU_ON_BOOT=0 -DUSE_USB_CDC_CONSOLE -DESP32_4M -DESP32S3",
|
||||
"f_cpu": "240000000L",
|
||||
"f_flash": "80000000L",
|
||||
"flash_mode": "dio",
|
||||
@ -31,7 +31,7 @@
|
||||
"flash_extra_images": [
|
||||
[
|
||||
"0x10000",
|
||||
"variants/tasmota/tasmota32s3usb-safeboot.bin"
|
||||
"variants/tasmota/tasmota32s3cdc-safeboot.bin"
|
||||
]
|
||||
]
|
||||
},
|
@ -36,11 +36,11 @@ default_envs =
|
||||
; tasmota32-ir
|
||||
; tasmota32solo1
|
||||
; tasmota32c3
|
||||
; tasmota32c3usb
|
||||
; tasmota32c3cdc
|
||||
; tasmota32s2
|
||||
; tasmota32s2usb
|
||||
; tasmota32s2cdc
|
||||
; tasmota32s3
|
||||
; tasmota32s3usb
|
||||
; tasmota32s3cdc
|
||||
; tasmota32-odroidgo
|
||||
; tasmota32-core2
|
||||
; tasmota32-nspanel
|
||||
|
@ -171,13 +171,13 @@ lib_ignore =
|
||||
Micro-RTSP
|
||||
epdiy
|
||||
|
||||
[env:tasmota32c3usb-safeboot]
|
||||
[env:tasmota32c3cdc-safeboot]
|
||||
extends = env:tasmota32c3-safeboot
|
||||
board = esp32c3usb
|
||||
board = esp32c3cdc
|
||||
|
||||
[env:tasmota32c3usb]
|
||||
[env:tasmota32c3cdc]
|
||||
extends = env:tasmota32c3
|
||||
board = esp32c3usb
|
||||
board = esp32c3cdc
|
||||
|
||||
[env:tasmota32s2-safeboot]
|
||||
extends = env:tasmota32_base
|
||||
@ -200,13 +200,13 @@ lib_ignore =
|
||||
Micro-RTSP
|
||||
epdiy
|
||||
|
||||
[env:tasmota32s2usb-safeboot]
|
||||
[env:tasmota32s2cdc-safeboot]
|
||||
extends = env:tasmota32s2-safeboot
|
||||
board = esp32s2usb
|
||||
board = esp32s2cdc
|
||||
|
||||
[env:tasmota32s2usb]
|
||||
[env:tasmota32s2cdc]
|
||||
extends = env:tasmota32s2
|
||||
board = esp32s2usb
|
||||
board = esp32s2cdc
|
||||
|
||||
[env:tasmota32s3-safeboot]
|
||||
extends = env:tasmota32_base
|
||||
@ -228,13 +228,13 @@ lib_ignore =
|
||||
Micro-RTSP
|
||||
epdiy
|
||||
|
||||
[env:tasmota32s3usb-safeboot]
|
||||
[env:tasmota32s3cdc-safeboot]
|
||||
extends = env:tasmota32s3-safeboot
|
||||
board = esp32s3usb
|
||||
board = esp32s3cdc
|
||||
|
||||
[env:tasmota32s3usb]
|
||||
[env:tasmota32s3cdc]
|
||||
extends = env:tasmota32s3
|
||||
board = esp32s3usb
|
||||
board = esp32s3cdc
|
||||
|
||||
[env:tasmota32-AF]
|
||||
extends = env:tasmota32_base
|
||||
|
@ -169,8 +169,8 @@ WiFiUDP PortUdp; // UDP Syslog and Alexa
|
||||
*/
|
||||
#if CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32S3
|
||||
|
||||
//#if CONFIG_TINYUSB_CDC_ENABLED // This define is not recognized here so use USE_USB_SERIAL_CONSOLE
|
||||
#ifdef USE_USB_SERIAL_CONSOLE
|
||||
//#if CONFIG_TINYUSB_CDC_ENABLED // This define is not recognized here so use USE_USB_CDC_CONSOLE
|
||||
#ifdef USE_USB_CDC_CONSOLE
|
||||
//#warning **** TasConsole use USB ****
|
||||
|
||||
#if ARDUINO_USB_MODE
|
||||
@ -186,11 +186,11 @@ bool tasconsole_serial = false;
|
||||
//#warning **** TasConsole uses USBCDC ****
|
||||
#endif // ARDUINO_USB_MODE
|
||||
|
||||
#else // No USE_USB_SERIAL_CONSOLE
|
||||
#else // No USE_USB_CDC_CONSOLE
|
||||
HardwareSerial TasConsole = Serial; // Fallback serial interface for ESP32C3, S2 and S3 if no USB_SERIAL defined
|
||||
bool tasconsole_serial = true;
|
||||
//#warning **** TasConsole uses Serial ****
|
||||
#endif // USE_USB_SERIAL_CONSOLE
|
||||
#endif // USE_USB_CDC_CONSOLE
|
||||
|
||||
#else // No ESP32C3, S2 or S3
|
||||
HardwareSerial TasConsole = Serial; // Fallback serial interface for non ESP32C3, S2 and S3
|
||||
@ -433,16 +433,16 @@ void setup(void) {
|
||||
// Serial.setRxBufferSize(INPUT_BUFFER_SIZE); // Default is 256 chars
|
||||
#ifdef ESP32
|
||||
#if CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32S3
|
||||
#ifdef USE_USB_SERIAL_CONSOLE
|
||||
#ifdef USE_USB_CDC_CONSOLE
|
||||
TasConsole.begin(115200); // Will always be 115200 bps
|
||||
#if !ARDUINO_USB_MODE
|
||||
USB.begin(); // This needs a serial console with DTR/DSR support
|
||||
#endif // No ARDUINO_USB_MODE
|
||||
TasConsole.println();
|
||||
AddLog(LOG_LEVEL_INFO, PSTR("CMD: Using embedded USB"));
|
||||
#else // No USE_USB_SERIAL_CONSOLE
|
||||
AddLog(LOG_LEVEL_INFO, PSTR("CMD: Using USB CDC"));
|
||||
#else // No USE_USB_CDC_CONSOLE
|
||||
TasConsole = Serial;
|
||||
#endif // USE_USB_SERIAL_CONSOLE
|
||||
#endif // USE_USB_CDC_CONSOLE
|
||||
#else // No ESP32C3, S2 or S3
|
||||
TasConsole = Serial;
|
||||
#endif // ESP32C3, S2 or S3
|
||||
|
Loading…
x
Reference in New Issue
Block a user