diff --git a/CHANGELOG.md b/CHANGELOG.md index 2cc5925fc..a6e56f500 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ All notable changes to this project will be documented in this file. ### Added - Zigbee support for attributes of type `uint48` used by energy monitoring (#20992) - Support for EU863-870 LoRaWanBridge +- Added GPIO for SPI for Universal Touch Screen ### Breaking Changed diff --git a/tasmota/include/tasmota_template.h b/tasmota/include/tasmota_template.h index e00ae513b..56a239d0f 100644 --- a/tasmota/include/tasmota_template.h +++ b/tasmota/include/tasmota_template.h @@ -217,6 +217,7 @@ enum UserSelectablePins { GPIO_MAGIC_SWITCH, // MagicSwitch as in Sonoff BasicR4 GPIO_PIPSOLAR_TX, GPIO_PIPSOLAR_RX, // pipsolar inverter GPIO_LORA_CS, GPIO_LORA_RST, GPIO_LORA_BUSY, GPIO_LORA_DI0, GPIO_LORA_DI1, GPIO_LORA_DI2, GPIO_LORA_DI3, GPIO_LORA_DI4, GPIO_LORA_DI5, // LoRa SPI + GPIO_TS_SPI_CS, GPIO_TS_RST, GPIO_TS_IRQ, // SPI for Universal Touch Screen GPIO_SENSOR_END }; // Error as warning to rethink GPIO usage with max 2045 @@ -481,6 +482,7 @@ const char kSensorNames[] PROGMEM = D_GPIO_MAGIC_SWITCH "|" D_SENSOR_PIPSOLAR_TX "|" D_SENSOR_PIPSOLAR_RX "|" D_GPIO_LORA_CS "|" D_GPIO_LORA_RST "|" D_GPIO_LORA_BUSY "|" D_GPIO_LORA_DI "0|" D_GPIO_LORA_DI "1|" D_GPIO_LORA_DI "2|" D_GPIO_LORA_DI "3|" D_GPIO_LORA_DI "4|" D_GPIO_LORA_DI "5|" + D_GPIO_TS_SPI_CS "|" D_GPIO_TS_RST "|" D_GPIO_TS_IRQ "|" ; const char kSensorNamesFixed[] PROGMEM = @@ -649,6 +651,11 @@ const uint16_t kGpioNiceList[] PROGMEM = { AGPIO(GPIO_SSPI_DC), // Software SPI Data or Command #if defined(USE_DISPLAY) || defined(USE_LVGL) +#ifdef USE_UNIVERSAL_TOUCH + AGPIO(GPIO_TS_SPI_CS), // Touch CS + AGPIO(GPIO_TS_RST), // Touch Reset + AGPIO(GPIO_TS_IRQ), // Touch IRQ +#endif // USE_UNIVERSAL_TOUCH #ifdef USE_DISPLAY_ILI9341 AGPIO(GPIO_ILI9341_CS), AGPIO(GPIO_ILI9341_DC), diff --git a/tasmota/language/af_AF.h b/tasmota/language/af_AF.h index 3c2a0f100..b7e7fca4c 100644 --- a/tasmota/language/af_AF.h +++ b/tasmota/language/af_AF.h @@ -712,6 +712,10 @@ #define D_SENSOR_SPI_MOSI "SPI MOSI" #define D_SENSOR_SPI_CLK "SPI CLK" #define D_SENSOR_SDIO_CMD "SDIO CMD" +#define D_GPIO_TS_SPI_CS "TS SPI CS" +#define D_GPIO_TS_RST "TS RST" +#define D_GPIO_TS_IRQ "TS IRQ" +#define D_SENSOR_SDIO_CMD "SDIO CMD" #define D_SENSOR_SDIO_CLK "SDIO CLK" #define D_SENSOR_SDIO_D0 "SDIO D0" #define D_SENSOR_SDIO_D1 "SDIO D1" diff --git a/tasmota/language/bg_BG.h b/tasmota/language/bg_BG.h index d15f9ab2d..8b53b346c 100644 --- a/tasmota/language/bg_BG.h +++ b/tasmota/language/bg_BG.h @@ -712,6 +712,10 @@ #define D_SENSOR_SPI_MOSI "SPI MOSI" #define D_SENSOR_SPI_CLK "SPI CLK" #define D_SENSOR_SDIO_CMD "SDIO CMD" +#define D_GPIO_TS_SPI_CS "TS SPI CS" +#define D_GPIO_TS_RST "TS RST" +#define D_GPIO_TS_IRQ "TS IRQ" +#define D_SENSOR_SDIO_CMD "SDIO CMD" #define D_SENSOR_SDIO_CLK "SDIO CLK" #define D_SENSOR_SDIO_D0 "SDIO D0" #define D_SENSOR_SDIO_D1 "SDIO D1" diff --git a/tasmota/language/ca_AD.h b/tasmota/language/ca_AD.h index e8d460dc2..2b0f8f717 100644 --- a/tasmota/language/ca_AD.h +++ b/tasmota/language/ca_AD.h @@ -712,6 +712,10 @@ #define D_SENSOR_SPI_MOSI "SPI MOSI" #define D_SENSOR_SPI_CLK "SPI CLK" #define D_SENSOR_SDIO_CMD "SDIO CMD" +#define D_GPIO_TS_SPI_CS "TS SPI CS" +#define D_GPIO_TS_RST "TS RST" +#define D_GPIO_TS_IRQ "TS IRQ" +#define D_SENSOR_SDIO_CMD "SDIO CMD" #define D_SENSOR_SDIO_CLK "SDIO CLK" #define D_SENSOR_SDIO_D0 "SDIO D0" #define D_SENSOR_SDIO_D1 "SDIO D1" diff --git a/tasmota/language/cs_CZ.h b/tasmota/language/cs_CZ.h index 37bf3765b..bb27f86af 100644 --- a/tasmota/language/cs_CZ.h +++ b/tasmota/language/cs_CZ.h @@ -712,6 +712,10 @@ #define D_SENSOR_SPI_MOSI "SPI MOSI" #define D_SENSOR_SPI_CLK "SPI CLK" #define D_SENSOR_SDIO_CMD "SDIO CMD" +#define D_GPIO_TS_SPI_CS "TS SPI CS" +#define D_GPIO_TS_RST "TS RST" +#define D_GPIO_TS_IRQ "TS IRQ" +#define D_SENSOR_SDIO_CMD "SDIO CMD" #define D_SENSOR_SDIO_CLK "SDIO CLK" #define D_SENSOR_SDIO_D0 "SDIO D0" #define D_SENSOR_SDIO_D1 "SDIO D1" diff --git a/tasmota/language/de_DE.h b/tasmota/language/de_DE.h index e979ee3b2..9bd73424a 100644 --- a/tasmota/language/de_DE.h +++ b/tasmota/language/de_DE.h @@ -712,6 +712,10 @@ #define D_SENSOR_SPI_MOSI "SPI MOSI" #define D_SENSOR_SPI_CLK "SPI CLK" #define D_SENSOR_SDIO_CMD "SDIO CMD" +#define D_GPIO_TS_SPI_CS "TS SPI CS" +#define D_GPIO_TS_RST "TS RST" +#define D_GPIO_TS_IRQ "TS IRQ" +#define D_SENSOR_SDIO_CMD "SDIO CMD" #define D_SENSOR_SDIO_CLK "SDIO CLK" #define D_SENSOR_SDIO_D0 "SDIO D0" #define D_SENSOR_SDIO_D1 "SDIO D1" diff --git a/tasmota/language/el_GR.h b/tasmota/language/el_GR.h index 35fb30e00..ddc0de210 100644 --- a/tasmota/language/el_GR.h +++ b/tasmota/language/el_GR.h @@ -712,6 +712,10 @@ #define D_SENSOR_SPI_MOSI "SPI MOSI" #define D_SENSOR_SPI_CLK "SPI CLK" #define D_SENSOR_SDIO_CMD "SDIO CMD" +#define D_GPIO_TS_SPI_CS "TS SPI CS" +#define D_GPIO_TS_RST "TS RST" +#define D_GPIO_TS_IRQ "TS IRQ" +#define D_SENSOR_SDIO_CMD "SDIO CMD" #define D_SENSOR_SDIO_CLK "SDIO CLK" #define D_SENSOR_SDIO_D0 "SDIO D0" #define D_SENSOR_SDIO_D1 "SDIO D1" diff --git a/tasmota/language/en_GB.h b/tasmota/language/en_GB.h index 177478b31..5e98394a0 100644 --- a/tasmota/language/en_GB.h +++ b/tasmota/language/en_GB.h @@ -712,6 +712,10 @@ #define D_SENSOR_SPI_MOSI "SPI MOSI" #define D_SENSOR_SPI_CLK "SPI CLK" #define D_SENSOR_SDIO_CMD "SDIO CMD" +#define D_GPIO_TS_SPI_CS "TS SPI CS" +#define D_GPIO_TS_RST "TS RST" +#define D_GPIO_TS_IRQ "TS IRQ" +#define D_SENSOR_SDIO_CMD "SDIO CMD" #define D_SENSOR_SDIO_CLK "SDIO CLK" #define D_SENSOR_SDIO_D0 "SDIO D0" #define D_SENSOR_SDIO_D1 "SDIO D1" diff --git a/tasmota/language/es_ES.h b/tasmota/language/es_ES.h index 09a4ffcc5..1b347bd0b 100644 --- a/tasmota/language/es_ES.h +++ b/tasmota/language/es_ES.h @@ -712,6 +712,10 @@ #define D_SENSOR_SPI_MOSI "SPI MOSI" #define D_SENSOR_SPI_CLK "SPI CLK" #define D_SENSOR_SDIO_CMD "SDIO CMD" +#define D_GPIO_TS_SPI_CS "TS SPI CS" +#define D_GPIO_TS_RST "TS RST" +#define D_GPIO_TS_IRQ "TS IRQ" +#define D_SENSOR_SDIO_CMD "SDIO CMD" #define D_SENSOR_SDIO_CLK "SDIO CLK" #define D_SENSOR_SDIO_D0 "SDIO D0" #define D_SENSOR_SDIO_D1 "SDIO D1" diff --git a/tasmota/language/fr_FR.h b/tasmota/language/fr_FR.h index 6662195ec..a10c66d91 100644 --- a/tasmota/language/fr_FR.h +++ b/tasmota/language/fr_FR.h @@ -712,6 +712,10 @@ #define D_SENSOR_SPI_MOSI "SPI MOSI" #define D_SENSOR_SPI_CLK "SPI Clk" #define D_SENSOR_SDIO_CMD "SDIO Cmd" +#define D_GPIO_TS_SPI_CS "TS SPI CS" +#define D_GPIO_TS_RST "TS RST" +#define D_GPIO_TS_IRQ "TS IRQ" +#define D_SENSOR_SDIO_CMD "SDIO CMD" #define D_SENSOR_SDIO_CLK "SDIO Clk" #define D_SENSOR_SDIO_D0 "SDIO D0" #define D_SENSOR_SDIO_D1 "SDIO D1" diff --git a/tasmota/language/fy_NL.h b/tasmota/language/fy_NL.h index ddc85d9bc..0721348b1 100644 --- a/tasmota/language/fy_NL.h +++ b/tasmota/language/fy_NL.h @@ -712,6 +712,10 @@ #define D_SENSOR_SPI_MOSI "SPI MOSI" #define D_SENSOR_SPI_CLK "SPI CLK" #define D_SENSOR_SDIO_CMD "SDIO CMD" +#define D_GPIO_TS_SPI_CS "TS SPI CS" +#define D_GPIO_TS_RST "TS RST" +#define D_GPIO_TS_IRQ "TS IRQ" +#define D_SENSOR_SDIO_CMD "SDIO CMD" #define D_SENSOR_SDIO_CLK "SDIO CLK" #define D_SENSOR_SDIO_D0 "SDIO D0" #define D_SENSOR_SDIO_D1 "SDIO D1" diff --git a/tasmota/language/he_HE.h b/tasmota/language/he_HE.h index a32836a32..1c77dce8d 100644 --- a/tasmota/language/he_HE.h +++ b/tasmota/language/he_HE.h @@ -712,6 +712,10 @@ #define D_SENSOR_SPI_MOSI "SPI MOSI" #define D_SENSOR_SPI_CLK "SPI CLK" #define D_SENSOR_SDIO_CMD "SDIO CMD" +#define D_GPIO_TS_SPI_CS "TS SPI CS" +#define D_GPIO_TS_RST "TS RST" +#define D_GPIO_TS_IRQ "TS IRQ" +#define D_SENSOR_SDIO_CMD "SDIO CMD" #define D_SENSOR_SDIO_CLK "SDIO CLK" #define D_SENSOR_SDIO_D0 "SDIO D0" #define D_SENSOR_SDIO_D1 "SDIO D1" diff --git a/tasmota/language/hu_HU.h b/tasmota/language/hu_HU.h index a830c6f19..6df48927f 100644 --- a/tasmota/language/hu_HU.h +++ b/tasmota/language/hu_HU.h @@ -712,6 +712,10 @@ #define D_SENSOR_SPI_MOSI "SPI MOSI" #define D_SENSOR_SPI_CLK "SPI CLK" #define D_SENSOR_SDIO_CMD "SDIO CMD" +#define D_GPIO_TS_SPI_CS "TS SPI CS" +#define D_GPIO_TS_RST "TS RST" +#define D_GPIO_TS_IRQ "TS IRQ" +#define D_SENSOR_SDIO_CMD "SDIO CMD" #define D_SENSOR_SDIO_CLK "SDIO CLK" #define D_SENSOR_SDIO_D0 "SDIO D0" #define D_SENSOR_SDIO_D1 "SDIO D1" diff --git a/tasmota/language/it_IT.h b/tasmota/language/it_IT.h index d93ba7c4a..53ef355fb 100644 --- a/tasmota/language/it_IT.h +++ b/tasmota/language/it_IT.h @@ -712,6 +712,10 @@ #define D_SENSOR_SPI_MOSI "SPI - MOSI" #define D_SENSOR_SPI_CLK "SPI - CLK" #define D_SENSOR_SDIO_CMD "SDIO - CMD" +#define D_GPIO_TS_SPI_CS "TS SPI CS" +#define D_GPIO_TS_RST "TS RST" +#define D_GPIO_TS_IRQ "TS IRQ" +#define D_SENSOR_SDIO_CMD "SDIO CMD" #define D_SENSOR_SDIO_CLK "SDIO - CLK" #define D_SENSOR_SDIO_D0 "SDIO - D0" #define D_SENSOR_SDIO_D1 "SDIO - D1" diff --git a/tasmota/language/ko_KO.h b/tasmota/language/ko_KO.h index 0ffc03c70..54234adf2 100644 --- a/tasmota/language/ko_KO.h +++ b/tasmota/language/ko_KO.h @@ -712,6 +712,10 @@ #define D_SENSOR_SPI_MOSI "SPI MOSI" #define D_SENSOR_SPI_CLK "SPI CLK" #define D_SENSOR_SDIO_CMD "SDIO CMD" +#define D_GPIO_TS_SPI_CS "TS SPI CS" +#define D_GPIO_TS_RST "TS RST" +#define D_GPIO_TS_IRQ "TS IRQ" +#define D_SENSOR_SDIO_CMD "SDIO CMD" #define D_SENSOR_SDIO_CLK "SDIO CLK" #define D_SENSOR_SDIO_D0 "SDIO D0" #define D_SENSOR_SDIO_D1 "SDIO D1" diff --git a/tasmota/language/nl_NL.h b/tasmota/language/nl_NL.h index 8773b8ba7..c70bcfe80 100644 --- a/tasmota/language/nl_NL.h +++ b/tasmota/language/nl_NL.h @@ -712,6 +712,10 @@ #define D_SENSOR_SPI_MOSI "SPI MOSI" #define D_SENSOR_SPI_CLK "SPI CLK" #define D_SENSOR_SDIO_CMD "SDIO CMD" +#define D_GPIO_TS_SPI_CS "TS SPI CS" +#define D_GPIO_TS_RST "TS RST" +#define D_GPIO_TS_IRQ "TS IRQ" +#define D_SENSOR_SDIO_CMD "SDIO CMD" #define D_SENSOR_SDIO_CLK "SDIO CLK" #define D_SENSOR_SDIO_D0 "SDIO D0" #define D_SENSOR_SDIO_D1 "SDIO D1" diff --git a/tasmota/language/pl_PL.h b/tasmota/language/pl_PL.h index 86a7ad487..3c9f798a5 100644 --- a/tasmota/language/pl_PL.h +++ b/tasmota/language/pl_PL.h @@ -712,6 +712,10 @@ #define D_SENSOR_SPI_MOSI "SPI MOSI" #define D_SENSOR_SPI_CLK "SPI CLK" #define D_SENSOR_SDIO_CMD "SDIO CMD" +#define D_GPIO_TS_SPI_CS "TS SPI CS" +#define D_GPIO_TS_RST "TS RST" +#define D_GPIO_TS_IRQ "TS IRQ" +#define D_SENSOR_SDIO_CMD "SDIO CMD" #define D_SENSOR_SDIO_CLK "SDIO CLK" #define D_SENSOR_SDIO_D0 "SDIO D0" #define D_SENSOR_SDIO_D1 "SDIO D1" diff --git a/tasmota/language/pt_BR.h b/tasmota/language/pt_BR.h index 255eadfeb..036525ea6 100644 --- a/tasmota/language/pt_BR.h +++ b/tasmota/language/pt_BR.h @@ -712,6 +712,10 @@ #define D_SENSOR_SPI_MOSI "SPI MOSI" #define D_SENSOR_SPI_CLK "SPI CLK" #define D_SENSOR_SDIO_CMD "SDIO CMD" +#define D_GPIO_TS_SPI_CS "TS SPI CS" +#define D_GPIO_TS_RST "TS RST" +#define D_GPIO_TS_IRQ "TS IRQ" +#define D_SENSOR_SDIO_CMD "SDIO CMD" #define D_SENSOR_SDIO_CLK "SDIO CLK" #define D_SENSOR_SDIO_D0 "SDIO D0" #define D_SENSOR_SDIO_D1 "SDIO D1" diff --git a/tasmota/language/pt_PT.h b/tasmota/language/pt_PT.h index 28510dd8b..1adb3b023 100644 --- a/tasmota/language/pt_PT.h +++ b/tasmota/language/pt_PT.h @@ -712,6 +712,10 @@ #define D_SENSOR_SPI_MOSI "SPI MOSI" #define D_SENSOR_SPI_CLK "SPI CLK" #define D_SENSOR_SDIO_CMD "SDIO CMD" +#define D_GPIO_TS_SPI_CS "TS SPI CS" +#define D_GPIO_TS_RST "TS RST" +#define D_GPIO_TS_IRQ "TS IRQ" +#define D_SENSOR_SDIO_CMD "SDIO CMD" #define D_SENSOR_SDIO_CLK "SDIO CLK" #define D_SENSOR_SDIO_D0 "SDIO D0" #define D_SENSOR_SDIO_D1 "SDIO D1" diff --git a/tasmota/language/ro_RO.h b/tasmota/language/ro_RO.h index ed25fae4b..0465039ca 100644 --- a/tasmota/language/ro_RO.h +++ b/tasmota/language/ro_RO.h @@ -712,6 +712,10 @@ #define D_SENSOR_SPI_MOSI "SPI MOSI" #define D_SENSOR_SPI_CLK "SPI CLK" #define D_SENSOR_SDIO_CMD "SDIO CMD" +#define D_GPIO_TS_SPI_CS "TS SPI CS" +#define D_GPIO_TS_RST "TS RST" +#define D_GPIO_TS_IRQ "TS IRQ" +#define D_SENSOR_SDIO_CMD "SDIO CMD" #define D_SENSOR_SDIO_CLK "SDIO CLK" #define D_SENSOR_SDIO_D0 "SDIO D0" #define D_SENSOR_SDIO_D1 "SDIO D1" diff --git a/tasmota/language/ru_RU.h b/tasmota/language/ru_RU.h index ceec203cd..cc9e58a63 100644 --- a/tasmota/language/ru_RU.h +++ b/tasmota/language/ru_RU.h @@ -713,6 +713,10 @@ #define D_SENSOR_SPI_MOSI "SPI MOSI" #define D_SENSOR_SPI_CLK "SPI CLK" #define D_SENSOR_SDIO_CMD "SDIO CMD" +#define D_GPIO_TS_SPI_CS "TS SPI CS" +#define D_GPIO_TS_RST "TS RST" +#define D_GPIO_TS_IRQ "TS IRQ" +#define D_SENSOR_SDIO_CMD "SDIO CMD" #define D_SENSOR_SDIO_CLK "SDIO CLK" #define D_SENSOR_SDIO_D0 "SDIO D0" #define D_SENSOR_SDIO_D1 "SDIO D1" diff --git a/tasmota/language/sk_SK.h b/tasmota/language/sk_SK.h index 7c0f89eae..91a391341 100644 --- a/tasmota/language/sk_SK.h +++ b/tasmota/language/sk_SK.h @@ -712,6 +712,10 @@ #define D_SENSOR_SPI_MOSI "SPI MOSI" #define D_SENSOR_SPI_CLK "SPI CLK" #define D_SENSOR_SDIO_CMD "SDIO CMD" +#define D_GPIO_TS_SPI_CS "TS SPI CS" +#define D_GPIO_TS_RST "TS RST" +#define D_GPIO_TS_IRQ "TS IRQ" +#define D_SENSOR_SDIO_CMD "SDIO CMD" #define D_SENSOR_SDIO_CLK "SDIO CLK" #define D_SENSOR_SDIO_D0 "SDIO D0" #define D_SENSOR_SDIO_D1 "SDIO D1" diff --git a/tasmota/language/sv_SE.h b/tasmota/language/sv_SE.h index 52db82690..9f1122f0e 100644 --- a/tasmota/language/sv_SE.h +++ b/tasmota/language/sv_SE.h @@ -712,6 +712,10 @@ #define D_SENSOR_SPI_MOSI "SPI MOSI" #define D_SENSOR_SPI_CLK "SPI CLK" #define D_SENSOR_SDIO_CMD "SDIO CMD" +#define D_GPIO_TS_SPI_CS "TS SPI CS" +#define D_GPIO_TS_RST "TS RST" +#define D_GPIO_TS_IRQ "TS IRQ" +#define D_SENSOR_SDIO_CMD "SDIO CMD" #define D_SENSOR_SDIO_CLK "SDIO CLK" #define D_SENSOR_SDIO_D0 "SDIO D0" #define D_SENSOR_SDIO_D1 "SDIO D1" diff --git a/tasmota/language/tr_TR.h b/tasmota/language/tr_TR.h index 4c484b969..48103b9f6 100644 --- a/tasmota/language/tr_TR.h +++ b/tasmota/language/tr_TR.h @@ -712,6 +712,10 @@ #define D_SENSOR_SPI_MOSI "SPI MOSI" #define D_SENSOR_SPI_CLK "SPI CLK" #define D_SENSOR_SDIO_CMD "SDIO CMD" +#define D_GPIO_TS_SPI_CS "TS SPI CS" +#define D_GPIO_TS_RST "TS RST" +#define D_GPIO_TS_IRQ "TS IRQ" +#define D_SENSOR_SDIO_CMD "SDIO CMD" #define D_SENSOR_SDIO_CLK "SDIO CLK" #define D_SENSOR_SDIO_D0 "SDIO D0" #define D_SENSOR_SDIO_D1 "SDIO D1" diff --git a/tasmota/language/uk_UA.h b/tasmota/language/uk_UA.h index e6572f169..2997abd4d 100644 --- a/tasmota/language/uk_UA.h +++ b/tasmota/language/uk_UA.h @@ -712,6 +712,10 @@ #define D_SENSOR_SPI_MOSI "SPI MOSI" #define D_SENSOR_SPI_CLK "SPI CLK" #define D_SENSOR_SDIO_CMD "SDIO CMD" +#define D_GPIO_TS_SPI_CS "TS SPI CS" +#define D_GPIO_TS_RST "TS RST" +#define D_GPIO_TS_IRQ "TS IRQ" +#define D_SENSOR_SDIO_CMD "SDIO CMD" #define D_SENSOR_SDIO_CLK "SDIO CLK" #define D_SENSOR_SDIO_D0 "SDIO D0" #define D_SENSOR_SDIO_D1 "SDIO D1" diff --git a/tasmota/language/vi_VN.h b/tasmota/language/vi_VN.h index a2de8bb36..1793bfc67 100644 --- a/tasmota/language/vi_VN.h +++ b/tasmota/language/vi_VN.h @@ -712,6 +712,10 @@ #define D_SENSOR_SPI_MOSI "SPI MOSI" #define D_SENSOR_SPI_CLK "SPI CLK" #define D_SENSOR_SDIO_CMD "SDIO CMD" +#define D_GPIO_TS_SPI_CS "TS SPI CS" +#define D_GPIO_TS_RST "TS RST" +#define D_GPIO_TS_IRQ "TS IRQ" +#define D_SENSOR_SDIO_CMD "SDIO CMD" #define D_SENSOR_SDIO_CLK "SDIO CLK" #define D_SENSOR_SDIO_D0 "SDIO D0" #define D_SENSOR_SDIO_D1 "SDIO D1" diff --git a/tasmota/language/zh_CN.h b/tasmota/language/zh_CN.h index 921ce9c11..54a241600 100644 --- a/tasmota/language/zh_CN.h +++ b/tasmota/language/zh_CN.h @@ -712,6 +712,10 @@ #define D_SENSOR_SPI_MOSI "SPI MOSI" #define D_SENSOR_SPI_CLK "SPI CLK" #define D_SENSOR_SDIO_CMD "SDIO CMD" +#define D_GPIO_TS_SPI_CS "TS SPI CS" +#define D_GPIO_TS_RST "TS RST" +#define D_GPIO_TS_IRQ "TS IRQ" +#define D_SENSOR_SDIO_CMD "SDIO CMD" #define D_SENSOR_SDIO_CLK "SDIO CLK" #define D_SENSOR_SDIO_D0 "SDIO D0" #define D_SENSOR_SDIO_D1 "SDIO D1" diff --git a/tasmota/language/zh_TW.h b/tasmota/language/zh_TW.h index 5d0fa0c1f..38988f170 100644 --- a/tasmota/language/zh_TW.h +++ b/tasmota/language/zh_TW.h @@ -712,6 +712,10 @@ #define D_SENSOR_SPI_MOSI "SPI MOSI" #define D_SENSOR_SPI_CLK "SPI CLK" #define D_SENSOR_SDIO_CMD "SDIO CMD" +#define D_GPIO_TS_SPI_CS "TS SPI CS" +#define D_GPIO_TS_RST "TS RST" +#define D_GPIO_TS_IRQ "TS IRQ" +#define D_SENSOR_SDIO_CMD "SDIO CMD" #define D_SENSOR_SDIO_CLK "SDIO CLK" #define D_SENSOR_SDIO_D0 "SDIO D0" #define D_SENSOR_SDIO_D1 "SDIO D1" diff --git a/tasmota/tasmota_xdrv_driver/xdrv_54_lvgl.ino b/tasmota/tasmota_xdrv_driver/xdrv_54_lvgl.ino index 2b1a6b971..3b4b8d850 100644 --- a/tasmota/tasmota_xdrv_driver/xdrv_54_lvgl.ino +++ b/tasmota/tasmota_xdrv_driver/xdrv_54_lvgl.ino @@ -360,7 +360,6 @@ void lvgl_touchscreen_read(lv_indev_t *indev_drv, lv_indev_data_t *data) { // keep data for TS calibration lv_ts_calibration.state = data->state; if (data->state == LV_INDEV_STATE_PRESSED) { // if not pressed, the data may be invalid - AddLog(LOG_LEVEL_DEBUG_MORE, "LVG: TS: %i, %i", data->point.x, data->point.y); lv_ts_calibration.x = data->point.x; lv_ts_calibration.y = data->point.y; lv_ts_calibration.raw_x = Touch_Status(-1); diff --git a/tasmota/tasmota_xdrv_driver/xdrv_55_touch.ino b/tasmota/tasmota_xdrv_driver/xdrv_55_touch.ino index d0a5adc30..be1057a67 100644 --- a/tasmota/tasmota_xdrv_driver/xdrv_55_touch.ino +++ b/tasmota/tasmota_xdrv_driver/xdrv_55_touch.ino @@ -247,7 +247,7 @@ void utouch_Touch_Init() { char *name; utouch_found = renderer->utouch_Init(&name); if (utouch_found) { - AddLog(LOG_LEVEL_INFO, PSTR("UT: %s"), name); + AddLog(LOG_LEVEL_INFO, PSTR("UT : %s"), name); } } } @@ -469,7 +469,7 @@ void Touch_Check(void(*rotconvert)(int16_t *x, int16_t *y)) { #endif // USE_TOUCH_BUTTONS rotconvert(&TSGlobal.touch_xp, &TSGlobal.touch_yp); - AddLog(LOG_LEVEL_DEBUG_MORE, "TS : TSGlobal.touched x=%i y=%i gest=0x%02x (raw x=%i y=%i)", TSGlobal.touch_xp, TSGlobal.touch_yp, TSGlobal.gesture, TSGlobal.raw_touch_xp, TSGlobal.raw_touch_yp); + AddLog(LOG_LEVEL_DEBUG_MORE, "TS : touched x=%i y=%i gest=0x%02x (raw x=%i y=%i)", TSGlobal.touch_xp, TSGlobal.touch_yp, TSGlobal.gesture, TSGlobal.raw_touch_xp, TSGlobal.raw_touch_yp); #ifdef USE_TOUCH_BUTTONS CheckTouchButtons(TSGlobal.touched, TSGlobal.touch_xp, TSGlobal.touch_yp); diff --git a/tasmota/tasmota_xdsp_display/xdsp_17_universal.ino b/tasmota/tasmota_xdsp_display/xdsp_17_universal.ino index 02d942eae..9a11d29f4 100644 --- a/tasmota/tasmota_xdsp_display/xdsp_17_universal.ino +++ b/tasmota/tasmota_xdsp_display/xdsp_17_universal.ino @@ -247,6 +247,29 @@ int8_t cs; } } + cp = strstr(ddesc, ":UTI"); + if (cp) { + cp += 4; // skip ":UTI" + cp = strchr(cp, ','); // skip device name + cp++; + cp = strchr(cp, ','); + cp++; + if (*cp == 'I') { // I= I2C + cp = strchr(cp, ','); // skip interface type + cp++; + cp = strchr(cp, ','); // skip I2C bus number + cp++; + replacepin(&cp, Pin(GPIO_TS_RST)); + replacepin(&cp, Pin(GPIO_TS_IRQ)); + } else if (*cp == 'S') { // S= SPI + cp = strchr(cp, ','); // skip interface type + cp++; + replacepin(&cp, Pin(GPIO_TS_SPI_CS)); + replacepin(&cp, Pin(GPIO_TS_RST)); + replacepin(&cp, Pin(GPIO_TS_IRQ)); + } + } + uint16_t xs, ys; // we need screen size for gt911 touch controler cp = strstr(ddesc, ":H,"); @@ -501,7 +524,7 @@ int8_t cs; /*********************************************************************************************/ -int8_t replacepin(char **cp, uint16_t pin) { +int8_t replacepin(char **cp, int16_t pin) { int8_t res = 0; char *lp = *cp; if (*lp == ',') lp++;