Michel2/ESPEasy
1
0
Fork 0
mirror of https://github.com/letscontrolit/ESPEasy.git synced 2026-07-28 04:07:47 +00:00
Code Issues Releases Activity

Merge branch 'mega' of https://github.com/letscontrolit/ESPEasy into feature/P044-led-and-events-without-client

Browse Source
This commit is contained in:
Ton Huisman
2023-12-28 15:04:04 +01:00
parent 40762e4fab e67583af09
commit d4c6cb92c7
544 changed files with 17595 additions and 11789 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/ESPEasySerial/ESPEasySerialType.h
+14 -2
View File
@@ -20,8 +20,12 @@
# define SOC_RX0 3
# elif CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32S3
# define SOC_RX0 44
# elif CONFIG_IDF_TARGET_ESP32C6
# define SOC_RX0 17
# elif CONFIG_IDF_TARGET_ESP32C3
# define SOC_RX0 20
# elif CONFIG_IDF_TARGET_ESP32C2
# define SOC_RX0 19
# endif // if CONFIG_IDF_TARGET_ESP32
# endif // ifndef SOC_RX0
@@ -30,8 +34,12 @@
# define SOC_TX0 1
# elif CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32S3
# define SOC_TX0 43
# elif CONFIG_IDF_TARGET_ESP32C6
# define SOC_TX0 16
# elif CONFIG_IDF_TARGET_ESP32C3
# define SOC_TX0 21
# elif CONFIG_IDF_TARGET_ESP32C2
# define SOC_TX0 20
# endif // if CONFIG_IDF_TARGET_ESP32
# endif // ifndef SOC_TX0
@@ -42,7 +50,7 @@
# define SOC_RX1 13
# elif CONFIG_IDF_TARGET_ESP32S2
# define SOC_RX1 18
# elif CONFIG_IDF_TARGET_ESP32C3
# elif CONFIG_IDF_TARGET_ESP32C2 || CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32C6
# define SOC_RX1 4
# elif CONFIG_IDF_TARGET_ESP32S3
# define SOC_RX1 15
@@ -54,7 +62,7 @@
# define SOC_TX1 15
# elif CONFIG_IDF_TARGET_ESP32S2
# define SOC_TX1 17
# elif CONFIG_IDF_TARGET_ESP32C3
# elif CONFIG_IDF_TARGET_ESP32C2 || CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32C6
# define SOC_TX1 5
# elif CONFIG_IDF_TARGET_ESP32S3
# define SOC_TX1 16
@@ -70,6 +78,8 @@
# define SOC_RX2 16
# elif CONFIG_IDF_TARGET_ESP32S3
# define SOC_RX2 19
# elif CONFIG_IDF_TARGET_ESP32C6
# define SOC_RX2 6
# else // if CONFIG_IDF_TARGET_ESP32
# define SOC_RX2 -1
# endif // if CONFIG_IDF_TARGET_ESP32
@@ -80,6 +90,8 @@
# define SOC_TX2 17
# elif CONFIG_IDF_TARGET_ESP32S3
# define SOC_TX2 20
# elif CONFIG_IDF_TARGET_ESP32C6
# define SOC_TX2 7
# else // if CONFIG_IDF_TARGET_ESP32
# define SOC_TX2 -1
# endif // if CONFIG_IDF_TARGET_ESP32
lib/ESPEasySerial/ESPEasySerial_common_defines.h
+4 -3
View File
@@ -8,7 +8,7 @@
#ifndef SOC_UART_NUM
# ifdef ESP8266
# define SOC_UART_NUM 2
# elif defined(ESP32_CLASSIC) || defined(ESP32S2) || defined(ESP32S3) || defined(ESP32C3)
# elif defined(ESP32_CLASSIC) || defined(ESP32S2) || defined(ESP32S3) || defined(ESP32C2) || defined(ESP32C3) || defined(ESP32C6)
# include <soc/soc_caps.h>
# else // ifdef ESP8266
static_assert(false, "Implement processor architecture");
@@ -19,11 +19,12 @@ static_assert(false, "Implement processor architecture");
#ifdef ESP32
/*
#if CONFIG_IDF_TARGET_ESP32C3 || // support USB via HWCDC using JTAG interface
#if CONFIG_IDF_TARGET_ESP32C6 || // support USB via HWCDC using JTAG interface
CONFIG_IDF_TARGET_ESP32C3 || // support USB via HWCDC using JTAG interface
CONFIG_IDF_TARGET_ESP32S2 || // support USB via USBCDC
CONFIG_IDF_TARGET_ESP32S3 // support USB via HWCDC using JTAG interface or USBCDC
*/
# if CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32S3
# if CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32C6 || CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32S3
// #if CONFIG_TINYUSB_CDC_ENABLED // This define is not recognized here so use USE_USB_CDC_CONSOLE
# ifdef USE_USB_CDC_CONSOLE