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

Support for ESP32S2 GPIOs

This commit is contained in:
Stephan Hadinger 2021-09-04 14:20:09 +02:00
parent e2d5fde341
commit a0693c6ed1
4 changed files with 126 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -7,6 +7,7 @@ All notable changes to this project will be documented in this file.
### Added
- Command ``WebGetConfig <url>`` if ``#define USE_WEBGETCONFIG`` is enabled to restore/init configuration from external webserver (#13034)
- Berry class ``webclient`` for HTTP/HTTPS requests
- Support for ESP32S2 GPIOs
### Fixed
- OpenTherm invalid JSON (#13028)

16
tasmota/support.ino
View File

@ -1565,6 +1565,10 @@ void TemplateGpios(myio *gp)
for (uint32_t i = 0; i < nitems(Settings->user_template.gp.io); i++) {
#if defined(ESP32) && CONFIG_IDF_TARGET_ESP32C3
dest[i] = src[i];
#elif defined(CONFIG_IDF_TARGET_ESP32S2)
if (22 == i) { j = 33; } // skip 22-32
dest[j] = src[i];
j++;
#else
if (6 == i) { j = 9; }
if (8 == i) { j = 12; }
@ -1623,6 +1627,8 @@ bool FlashPin(uint32_t pin)
{
#if defined(ESP32) && CONFIG_IDF_TARGET_ESP32C3
return (pin > 10) && (pin < 18); // ESP32C3 has GPIOs 11-17 reserved for Flash
#elif defined(CONFIG_IDF_TARGET_ESP32S2)
return (pin > 21) && (pin < 33); // ESP32S2 skip 22-32
#else // ESP32 and ESP8266
return (((pin > 5) && (pin < 9)) || (11 == pin));
#endif
@ -1632,6 +1638,8 @@ bool RedPin(uint32_t pin) // pin may be dangerous to change, display in RED in t
{
#if defined(ESP32) && CONFIG_IDF_TARGET_ESP32C3
return false; // no red pin on ESP32C3
#elif defined(CONFIG_IDF_TARGET_ESP32S2)
return false; // no red pin on ESP32S3
#else // ESP32 and ESP8266
#ifdef CONFIG_IDF_TARGET_ESP32
@ -1648,13 +1656,17 @@ uint32_t ValidPin(uint32_t pin, uint32_t gpio) {
return GPIO_NONE; // Disable flash pins GPIO6, GPIO7, GPIO8 and GPIO11
}
#ifndef CONFIG_IDF_TARGET_ESP32C3
#if defined(CONFIG_IDF_TARGET_ESP32C3)
// ignore
#elif defined(CONFIG_IDF_TARGET_ESP32S2)
// ignore
#else // not ESP32C3 and not ESP32S2
if ((WEMOS == Settings->module) && !Settings->flag3.user_esp8285_enable) { // SetOption51 - Enable ESP8285 user GPIO's
if ((9 == pin) || (10 == pin)) {
return GPIO_NONE; // Disable possible flash GPIO9 and GPIO10
}
}
#endif // not ESP32C3
#endif
return gpio;
}

100
tasmota/tasmota_template.h
View File

@ -1005,7 +1005,17 @@ typedef struct MYTMPLT8266 {
// 0 1 2 3 4 5 6 7 8 9101112131415161718192021
const char PINS_WEMOS[] PROGMEM = "AOAOAOAOAOAOIOIOIOIOIOFLFLFLFLFLFLFLIOIORXTX";
#else // not CONFIG_IDF_TARGET_ESP32C3
#elif defined(CONFIG_IDF_TARGET_ESP32S2)
#define MAX_GPIO_PIN 47 // Number of supported GPIO
#define MIN_FLASH_PINS 11 // Number of flash chip pins unusable for configuration (22-25 don't exist, 26-32 for SPI)
#define MAX_USER_PINS 36 // MAX_GPIO_PIN - MIN_FLASH_PINS
#define WEMOS_MODULE 0 // Wemos module
// 0 1 2 3 4 5 6 7 8 910111213141516171819202122232425262728293031323334353637383940414243444546
const char PINS_WEMOS[] PROGMEM = "IOAOAOAOAOAOAOAOAOAOAOAOAOAOAOAOAOAOAOAOAOIO--------FLFLFLFLFLFLFLIOIOIOIOIOIOIOIOIOIOIOIOIOI ";
#else // not CONFIG_IDF_TARGET_ESP32C3 nor CONFIG_IDF_TARGET_ESP32S2 - ESP32
#define MAX_GPIO_PIN 40 // Number of supported GPIO
#define MIN_FLASH_PINS 4 // Number of flash chip pins unusable for configuration (GPIO6, 7, 8 and 11)
@ -1015,7 +1025,7 @@ const char PINS_WEMOS[] PROGMEM = "AOAOAOAOAOAOIOIOIOIOIOFLFLFLFLFLFLFLIOIORXTX"
// 0 1 2 3 4 5 6 7 8 9101112131415161718192021222324252627282930313233343536373839
const char PINS_WEMOS[] PROGMEM = "IOTXIORXIOIOflashcFLFLolIOIOIOIOIOIOIOIOIOIOIOIOIOIOIOIOIOIOIOIOAOAOIAIAIAIAIAIA";
#endif // not CONFIG_IDF_TARGET_ESP32C3
#endif // ESP32/S2/C3 selection
#endif // ESP32
/********************************************************************************************\
@ -2527,11 +2537,89 @@ const mytmplt kModules[] PROGMEM = {
/*********************************************************************************************\
Known templates
\*********************************************************************************************/
#else // not CONFIG_IDF_TARGET_ESP32C3 - now ESP32
#elif defined(CONFIG_IDF_TARGET_ESP32S2)
/********************************************************************************************\
* ESP32-C3 Module templates
\********************************************************************************************/
#define USER_MODULE 255
// Supported hardware modules
enum SupportedModules {
WEMOS,
MAXMODULE };
// Default module settings
const uint8_t kModuleNiceList[] PROGMEM = {
WEMOS,
};
// !!! Update this list in the same order as kModuleNiceList !!!
const char kModuleNames[] PROGMEM =
"ESP32S2|"
;
// !!! Update this list in the same order as SupportedModules !!!
const mytmplt kModules[] PROGMEM = {
{ // Generic ESP32C3 device
AGPIO(GPIO_USER), // 0 IO GPIO0, RTC_GPIO0, Strapping
AGPIO(GPIO_USER), // 1 AO GPIO1, ADC1_CH0, RTC_GPIO1
AGPIO(GPIO_USER), // 2 AO GPIO2, ADC1_CH1, RTC_GPIO2
AGPIO(GPIO_USER), // 3 AO GPIO3, ADC1_CH2, RTC_GPIO3
AGPIO(GPIO_USER), // 4 AO GPIO4, ADC1_CH3, RTC_GPIO4
AGPIO(GPIO_USER), // 5 AO GPIO5, ADC1_CH4, RTC_GPIO5
AGPIO(GPIO_USER), // 6 AO GPIO6, ADC1_CH5, RTC_GPIO6
AGPIO(GPIO_USER), // 7 AO GPIO7, ADC1_CH6, RTC_GPIO7
AGPIO(GPIO_USER), // 8 AO GPIO8, ADC1_CH7, RTC_GPIO8
AGPIO(GPIO_USER), // 9 AO GPIO9, ADC1_CH8, RTC_GPIO9
AGPIO(GPIO_USER), // 10 AO GPIO10, ADC1_CH9, RTC_GPIO10
AGPIO(GPIO_USER), // 11 AO GPIO11, ADC2_CH0, RTC_GPIO11
AGPIO(GPIO_USER), // 12 AO GPIO12, ADC2_CH1, RTC_GPIO12
AGPIO(GPIO_USER), // 13 AO GPIO13, ADC2_CH2, RTC_GPIO13
AGPIO(GPIO_USER), // 14 AO GPIO14, ADC2_CH3, RTC_GPIO14
AGPIO(GPIO_USER), // 15 AO GPIO15, ADC2_CH4, RTC_GPIO15, XTAL_32K_P
AGPIO(GPIO_USER), // 16 AO GPIO16, ADC2_CH5, RTC_GPIO16, XTAL_32K_N
AGPIO(GPIO_USER), // 17 AO GPIO17, ADC2_CH6, RTC_GPIO17, DAC_1
AGPIO(GPIO_USER), // 18 AO GPIO18, ADC2_CH7, RTC_GPIO18, DAC_2
AGPIO(GPIO_USER), // 19 AO GPIO19, ADC2_CH8, RTC_GPIO19
AGPIO(GPIO_USER), // 20 AO GPIO20, ADC2_CH9, RTC_GPIO20
AGPIO(GPIO_USER), // 21 IO GPIO21, RTC_GPIO21
// 22 -- Unused
// 23 -- Unused
// 24 -- Unused
// 25 -- Unused
// 26 FL SPICS1, PSRAM
// 27 FL SPIHD
// 28 FL SPIWP
// 29 FL SPICS0
// 30 FL SPICLK
// 31 FL SPIQ
// 32 FL SPID
AGPIO(GPIO_USER), // 33 IO GPIO33
AGPIO(GPIO_USER), // 34 IO GPIO34
AGPIO(GPIO_USER), // 35 IO GPIO35
AGPIO(GPIO_USER), // 36 IO GPIO36
AGPIO(GPIO_USER), // 37 IO GPIO37
AGPIO(GPIO_USER), // 38 IO GPIO38
AGPIO(GPIO_USER), // 39 IO GPIO39, JTAG MTCK
AGPIO(GPIO_USER), // 40 IO GPIO40, JTAG MTDO
AGPIO(GPIO_USER), // 41 IO GPIO41, JTAG MTDI
AGPIO(GPIO_USER), // 42 IO GPIO42, JTAG MTMS
AGPIO(GPIO_USER), // 43 IO GPIO43, U0TXD
AGPIO(GPIO_USER), // 44 IO GPIO44, U0RXD
AGPIO(GPIO_USER), // 45 IO GPIO45, Strapping
AGPIO(GPIO_USER), // 46 I GPIO46, Input only, Strapping
},
};
/*********************************************************************************************\
Known templates
\*********************************************************************************************/
#else // not CONFIG_IDF_TARGET_ESP32C3 nor CONFIG_IDF_TARGET_ESP32S2 - ESP32
/********************************************************************************************\
* ESP32 Module templates
\********************************************************************************************/
@ -2846,7 +2934,7 @@ const mytmplt kModules[] PROGMEM = {
\*********************************************************************************************/
#endif // Not CONFIG_IDF_TARGET_ESP32C3
#endif // ESP32/S2/C3 selection
#endif // ESP32
#endif // _TASMOTA_TEMPLATE_H_

18
tasmota/xdrv_01_webserver.ino
View File

@ -150,6 +150,14 @@ const char HTTP_SCRIPT_TEMPLATE2[] PROGMEM =
"for(i=0;i<" STR(MAX_USER_PINS) ";i++){"
"sk(g[i],i);" // Set GPIO
"}";
#elif defined(CONFIG_IDF_TARGET_ESP32S2)
const char HTTP_SCRIPT_TEMPLATE2[] PROGMEM =
"j=0;"
"for(i=0;i<" STR(MAX_USER_PINS) ";i++){" // Skip 22-32
"if(22==i){j=33;}"
"sk(g[i],j);" // Set GPIO
"j++;"
"}";
#else // Now ESP32 and ESP8266
const char HTTP_SCRIPT_TEMPLATE2[] PROGMEM =
"j=0;"
@ -1584,6 +1592,10 @@ void HandleTemplateConfiguration(void) {
#if defined(ESP32) && CONFIG_IDF_TARGET_ESP32C3
// ESP32C3 we always send all GPIOs, Flash are just hidden
WSContentSend_P(PSTR("%s%d"), (i>0)?",":"", template_gp.io[i]);
#elif defined(CONFIG_IDF_TARGET_ESP32S2)
if (!FlashPin(i)) {
WSContentSend_P(PSTR("%s%d"), (i>0)?",":"", template_gp.io[i]);
}
#else
if (!FlashPin(i)) {
WSContentSend_P(PSTR("%s%d"), (i>0)?",":"", template_gp.io[i]);
@ -1636,7 +1648,7 @@ void HandleTemplateConfiguration(void) {
hidden ? PSTR(" hidden") : "",
RedPin(i) ? WebColor(COL_TEXT_WARNING) : WebColor(COL_TEXT), i, (0==i) ? PSTR(" style='width:146px'") : "", i, i);
WSContentSend_P(PSTR("<td style='width:54px'><select id='h%d'></select></td></tr>"), i);
#else
#else // also works for ESP32S2
if (!FlashPin(i)) {
WSContentSend_P(PSTR("<tr><td><b><font color='#%06x'>" D_GPIO "%d</font></b></td><td%s><select id='g%d' onchange='ot(%d,this.value)'></select></td>"),
RedPin(i) ? WebColor(COL_TEXT_WARNING) : WebColor(COL_TEXT), i, (0==i) ? PSTR(" style='width:146px'") : "", i, i);
@ -1682,6 +1694,10 @@ void TemplateSaveSettings(void) {
for (uint32_t i = 0; i < nitems(Settings->user_template.gp.io); i++) {
#if defined(ESP32) && CONFIG_IDF_TARGET_ESP32C3
snprintf_P(command, sizeof(command), PSTR("%s%s%d"), command, (i>0)?",":"", WebGetGpioArg(i));
#elif defined(CONFIG_IDF_TARGET_ESP32S2)
if (22 == i) { j = 33; } // skip 22-32
snprintf_P(command, sizeof(command), PSTR("%s%s%d"), command, (i>0)?",":"", WebGetGpioArg(j));
j++;
#else
if (6 == i) { j = 9; }
if (8 == i) { j = 12; }