mgeppert/Tasmota
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

FIX max GPIO and add C5 dangerous and special GPIOs (#23806)

Browse Source 
* add C5 dangerous and special GPIOs
* Fix max GPIO and flash / red pins (#517)
This commit is contained in:
Jason2866 2025-08-23 19:38:27 +02:00 committed by GitHub
parent 050dcdf153
commit 81be80b04a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tasmota/include/tasmota_template.h
View File

@ -1426,13 +1426,13 @@ const char PINS_WEMOS[] PROGMEM = "AOAOAOAOAOAOIOIOIOIOIOFLFLFLFLFLFLFLIOIORXTX"
/* **************************************** /* ****************************************
* ESP32C5 * ESP32C5
* ****************************************/ * ****************************************/
#define MAX_GPIO_PIN 27 // Number of supported GPIO #define MAX_GPIO_PIN 29 // Number of supported GPIO
#define MIN_FLASH_PINS 0 // Number of flash chip pins unusable for configuration (GPIO24 to 26) #define MIN_FLASH_PINS 0 // Number of flash chip pins unusable for configuration (GPIO16-22 SPI0/1)
#define MAX_USER_PINS 27 // MAX_GPIO_PIN - MIN_FLASH_PINS #define MAX_USER_PINS 29 // MAX_GPIO_PIN - MIN_FLASH_PINS
#define WEMOS_MODULE 0 // Wemos module #define WEMOS_MODULE 0 // Wemos module
// 0 1 2 3 4 5 6 7 8 91011121314151617181920212223242526 // 0 1 2 3 4 5 6 7 8 91011121314151617181920212223242526272829
const char PINS_WEMOS[] PROGMEM = "IOAOAOAOAOAOAOIOIOIOIOIOIOIOIOIOIOIOFLFLFLIOFLFLFLIOIO"; const char PINS_WEMOS[] PROGMEM = "IOAOAOAOAOAOAOIOIOIOIOIOIOIOFLFLFLFLFLFLFLIOIOIOIOIOIOIOIOIO";
#elif CONFIG_IDF_TARGET_ESP32C6 #elif CONFIG_IDF_TARGET_ESP32C6

8
tasmota/include/tasmota_types.h
View File

@ -662,26 +662,26 @@ typedef struct {
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
// Mapping 0x3AC to 0x496 for ESP32, ESP32C2, ESP32C3, ESP32C5 and ESP32C6 // Mapping 0x3AC to 0x496 for ESP32, ESP32C2, ESP32C3, ESP32C5 and ESP32C6
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
myio my_gp; // 3AC 2x40 bytes (ESP32) / 2x21 bytes (ESP32-C2) / 2x22 bytes (ESP32-C3) / 2x27 bytes (ESP32-C5) / 2x31 bytes (ESP32-C6) myio my_gp; // 3AC 2x40 bytes (ESP32) / 2x21 bytes (ESP32-C2) / 2x22 bytes (ESP32-C3) / 2x29 bytes (ESP32-C5) / 2x31 bytes (ESP32-C6)
#if CONFIG_IDF_TARGET_ESP32C2 #if CONFIG_IDF_TARGET_ESP32C2
uint8_t free_esp32c2_3D6[38]; // 3D6 - Due to smaller myio uint8_t free_esp32c2_3D6[38]; // 3D6 - Due to smaller myio
#elif CONFIG_IDF_TARGET_ESP32C3 #elif CONFIG_IDF_TARGET_ESP32C3
uint8_t free_esp32c3_3D8[36]; // 3D8 - Due to smaller myio uint8_t free_esp32c3_3D8[36]; // 3D8 - Due to smaller myio
#elif CONFIG_IDF_TARGET_ESP32C5 #elif CONFIG_IDF_TARGET_ESP32C5
uint8_t free_esp32c5_3E2[26]; // 3E2 - Due to smaller myio uint8_t free_esp32c5_3E4[22]; // 3E4 - Due to smaller myio
#elif CONFIG_IDF_TARGET_ESP32C6 #elif CONFIG_IDF_TARGET_ESP32C6
uint8_t free_esp32c6_3EA[18]; // 3EA - Due to smaller myio uint8_t free_esp32c6_3EA[18]; // 3EA - Due to smaller myio
#endif // CONFIG_IDF_TARGET_ESP32C2/3/5/6 #endif // CONFIG_IDF_TARGET_ESP32C2/3/5/6
mytmplt user_template; // 3FC 2x37 bytes (ESP32) / 2x22 bytes (ESP32-C2) / 2x23 bytes (ESP32-C3) / 2x28 bytes (ESP32-C5) / 2x32 bytes (ESP32-C6) mytmplt user_template; // 3FC 2x37 bytes (ESP32) / 2x22 bytes (ESP32-C2) / 2x23 bytes (ESP32-C3) / 2x30 bytes (ESP32-C5) / 2x32 bytes (ESP32-C6)
#if CONFIG_IDF_TARGET_ESP32C2 #if CONFIG_IDF_TARGET_ESP32C2
uint8_t free_esp32c2_428[30]; // 428 - Due to smaller mytmplt uint8_t free_esp32c2_428[30]; // 428 - Due to smaller mytmplt
#elif CONFIG_IDF_TARGET_ESP32C3 #elif CONFIG_IDF_TARGET_ESP32C3
uint8_t free_esp32c3_42A[28]; // 42A - Due to smaller mytmplt uint8_t free_esp32c3_42A[28]; // 42A - Due to smaller mytmplt
#elif CONFIG_IDF_TARGET_ESP32C5 #elif CONFIG_IDF_TARGET_ESP32C5
uint8_t free_esp32c5_434[18]; // 434 - Due to smaller mytmplt uint8_t free_esp32c5_438[14]; // 438 - Due to smaller mytmplt
#elif CONFIG_IDF_TARGET_ESP32C6 #elif CONFIG_IDF_TARGET_ESP32C6
uint8_t free_esp32c6_43C[10]; // 43C - Due to smaller mytmplt uint8_t free_esp32c6_43C[10]; // 43C - Due to smaller mytmplt
#endif // CONFIG_IDF_TARGET_ESP32C2/3/5/6 #endif // CONFIG_IDF_TARGET_ESP32C2/3/5/6

6
tasmota/tasmota_support/support.ino
View File

@ -1786,6 +1786,8 @@ bool FlashPin(uint32_t pin) {
return (((pin > 10) && (pin < 12)) || ((pin > 13) && (pin < 18))); // ESP32C3 has GPIOs 11-17 reserved for Flash, with some boards GPIOs 12 13 are useable return (((pin > 10) && (pin < 12)) || ((pin > 13) && (pin < 18))); // ESP32C3 has GPIOs 11-17 reserved for Flash, with some boards GPIOs 12 13 are useable
#elif CONFIG_IDF_TARGET_ESP32C3 #elif CONFIG_IDF_TARGET_ESP32C3
return ((pin > 13) && (pin < 18)); // ESP32C3 has GPIOs 11-17 reserved for Flash, with some boards GPIOs 11 12 13 are useable return ((pin > 13) && (pin < 18)); // ESP32C3 has GPIOs 11-17 reserved for Flash, with some boards GPIOs 11 12 13 are useable
#elif CONFIG_IDF_TARGET_ESP32C5
return ((pin > 15) && (pin < 23)); // ESP32C5 has GPIOs 16-22 reserved for Flash
#elif CONFIG_IDF_TARGET_ESP32C6 #elif CONFIG_IDF_TARGET_ESP32C6
return ((pin == 24) || (pin == 25) || (pin == 27) || (pin == 29) || (pin == 30)); // ESP32C6 has GPIOs 24-30 reserved for Flash, with some boards GPIOs 26 28 are useable return ((pin == 24) || (pin == 25) || (pin == 27) || (pin == 29) || (pin == 30)); // ESP32C6 has GPIOs 24-30 reserved for Flash, with some boards GPIOs 26 28 are useable
#elif CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32S3 #elif CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32S3
@ -1794,7 +1796,7 @@ bool FlashPin(uint32_t pin) {
return false; // ESP32P4 has no flash pins, but GPIOs 34-38 are strapping pins return false; // ESP32P4 has no flash pins, but GPIOs 34-38 are strapping pins
#else #else
return (pin >= 28) && (pin <= 31); // ESP32 skip 28-31 return (pin >= 28) && (pin <= 31); // ESP32 skip 28-31
#endif // ESP32C2/C3/C6 and S2/S3 #endif // ESP32C2/C3/C5/C6 and S2/S3
#endif // ESP32 #endif // ESP32
} }
@ -1807,6 +1809,8 @@ bool RedPin(uint32_t pin) { // Pin may be dangerous to change, displa
return (12 == pin) || (13 == pin); // ESP32C2: GPIOs 12 13 are usually used for Flash (mode QIO/QOUT) return (12 == pin) || (13 == pin); // ESP32C2: GPIOs 12 13 are usually used for Flash (mode QIO/QOUT)
#elif CONFIG_IDF_TARGET_ESP32C3 #elif CONFIG_IDF_TARGET_ESP32C3
return (11 == pin) || (12 == pin) || (13 == pin); // ESP32C3: GPIOs 11 12 13 are usually used for Flash (mode QIO/QOUT) return (11 == pin) || (12 == pin) || (13 == pin); // ESP32C3: GPIOs 11 12 13 are usually used for Flash (mode QIO/QOUT)
#elif CONFIG_IDF_TARGET_ESP32C5
return (2 == pin) || (7 == pin) || (25 == pin) || (27 == pin) || (28 == pin); // ESP32C5: GPIO2,7,25,27,28 are strapping pins
#elif CONFIG_IDF_TARGET_ESP32C6 #elif CONFIG_IDF_TARGET_ESP32C6
return (26 == pin) || (28 == pin); // ESP32C6: GPIOs 26 28 are usually used for Flash (mode QIO/QOUT) return (26 == pin) || (28 == pin); // ESP32C6: GPIOs 26 28 are usually used for Flash (mode QIO/QOUT)
#elif CONFIG_IDF_TARGET_ESP32S2 #elif CONFIG_IDF_TARGET_ESP32S2