From 0e4561d855ba1bdbfc353948f4ac8fc5bb6c9f69 Mon Sep 17 00:00:00 2001
From: Barbudor <barbudor@barbudor.net>
Date: Fri, 11 Mar 2022 23:32:59 +0100
Subject: [PATCH] step 6 - some missing L0X to LXX renaming

---
 tasmota/berry/include/be_gpio_defines.h | 2 +-
 tasmota/berry/internal/gpio.be          | 2 +-
 tasmota/tasmota_template.h              | 6 +++---
 tools/lv_gpio/lv_gpio_enum.h            | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/tasmota/berry/include/be_gpio_defines.h b/tasmota/berry/include/be_gpio_defines.h
index f5793d2be..1fad4d944 100644
--- a/tasmota/berry/include/be_gpio_defines.h
+++ b/tasmota/berry/include/be_gpio_defines.h
@@ -255,7 +255,7 @@ const be_const_member_t lv_gpio_constants[] = {
     { "TX2X_TXD_BLACK", (int32_t) GPIO_TX2X_TXD_BLACK },
     { "TXD", (int32_t) GPIO_TXD },
     { "VINDRIKTNING_RX", (int32_t) GPIO_VINDRIKTNING_RX },
-    { "VL53L0X_XSHUT1", (int32_t) GPIO_VL53LXX_XSHUT1 },
+    { "VL53LXX_XSHUT1", (int32_t) GPIO_VL53LXX_XSHUT1 },
     { "WE517_RX", (int32_t) GPIO_WE517_RX },
     { "WE517_TX", (int32_t) GPIO_WE517_TX },
     { "WEBCAM_DATA", (int32_t) GPIO_WEBCAM_DATA },
diff --git a/tasmota/berry/internal/gpio.be b/tasmota/berry/internal/gpio.be
index a1816dfc7..5d9437d62 100644
--- a/tasmota/berry/internal/gpio.be
+++ b/tasmota/berry/internal/gpio.be
@@ -245,7 +245,7 @@ gpio.SSD1351_DC = 226
 gpio.XPT2046_CS = 227
 gpio.CSE7761_TX = 228
 gpio.CSE7761_RX = 229
-gpio.VL53L0X_XSHUT1 = 230
+gpio.VL53LXX_XSHUT1 = 230
 gpio.MAX7219CLK = 231
 gpio.MAX7219DIN = 232
 gpio.MAX7219CS = 233
diff --git a/tasmota/tasmota_template.h b/tasmota/tasmota_template.h
index 009fbb9a1..93b5ba869 100644
--- a/tasmota/tasmota_template.h
+++ b/tasmota/tasmota_template.h
@@ -154,7 +154,7 @@ enum UserSelectablePins {
   GPIO_SSD1351_DC,
   GPIO_XPT2046_CS,                     // XPT2046 SPI Chip Select
   GPIO_CSE7761_TX, GPIO_CSE7761_RX,    // CSE7761 Serial interface (Dual R3)
-  GPIO_VL53LXX_XSHUT1,                 // VL53L0X_XSHUT (the max number of sensors is VL53LXX_MAX_SENSORS)- Used when connecting multiple VL53L0X
+  GPIO_VL53LXX_XSHUT1,                 // VL53LXX_XSHUT (the max number of sensors is VL53LXX_MAX_SENSORS)- Used when connecting multiple VL53LXX
   GPIO_MAX7219CLK, GPIO_MAX7219DIN, GPIO_MAX7219CS, // MAX7219 interface
   GPIO_TFMINIPLUS_TX, GPIO_TFMINIPLUS_RX,  // TFmini Plus ToF sensor
   GPIO_ZEROCROSS,
@@ -940,8 +940,8 @@ const uint16_t kGpioNiceList[] PROGMEM = {
   AGPIO(GPIO_PROJECTOR_CTRL_TX),      // LCD/DLP Projector Serial Control
   AGPIO(GPIO_PROJECTOR_CTRL_RX),      // LCD/DLP Projector Serial Control
 #endif
-#ifdef USE_VL53L0X
-  AGPIO(GPIO_VL53LXX_XSHUT1) + VL53LXX_MAX_SENSORS,  // When using multiple VL53L0X.
+#if defined(USE_VL53L0X) or defined (USE_VL53L1X)
+  AGPIO(GPIO_VL53LXX_XSHUT1) + VL53LXX_MAX_SENSORS,  // When using multiple VL53LXX.
 #endif
 
 #ifdef USE_DISPLAY_MAX7219
diff --git a/tools/lv_gpio/lv_gpio_enum.h b/tools/lv_gpio/lv_gpio_enum.h
index 66a50cf4f..bd0ba6923 100644
--- a/tools/lv_gpio/lv_gpio_enum.h
+++ b/tools/lv_gpio/lv_gpio_enum.h
@@ -251,7 +251,7 @@ SSD1351_DC = GPIO_SSD1351_DC
 XPT2046_CS = GPIO_XPT2046_CS
 CSE7761_TX = GPIO_CSE7761_TX
 CSE7761_RX = GPIO_CSE7761_RX
-VL53L0X_XSHUT1 = GPIO_VL53LXX_XSHUT1
+VL53LXX_XSHUT1 = GPIO_VL53LXX_XSHUT1
 MAX7219CLK = GPIO_MAX7219CLK
 MAX7219DIN = GPIO_MAX7219DIN
 MAX7219CS = GPIO_MAX7219CS