fix(panel): remove redundant code

Lzw655 · Lzw655 · commit 9436426ef50e · 2024-07-28T11:51:15.000+08:00
diff --git a/ESP_Panel_Board_Custom.h b/ESP_Panel_Board_Custom.h
@@ -247,8 +247,11 @@
 /* Touch panel bus parameters */
 #if ESP_PANEL_TOUCH_BUS_TYPE == ESP_PANEL_BUS_TYPE_I2C
 
-    #define ESP_PANEL_TOUCH_BUS_HOST_ID     (0)     // Typically set to 0 to use the default address
-    #define ESP_PANEL_TOUCH_I2C_ADDRESS     (0)     // For GT911, there are two addresses: 0x5D(default) and 0x14
+    #define ESP_PANEL_TOUCH_BUS_HOST_ID     (0)     // Typically set to 0
+    #define ESP_PANEL_TOUCH_I2C_ADDRESS     (0)     // Typically set to 0 to use the default address.
+                                                    // - For touchs with only one address, set to 0
+                                                    // - For touchs with multiple addresses, set to 0 or the address
+                                                    //   Like GT911, there are two addresses: 0x5D(default) and 0x14
 #if !ESP_PANEL_TOUCH_BUS_SKIP_INIT_HOST
     #define ESP_PANEL_TOUCH_I2C_CLK_HZ      (400 * 1000)
                                                     // Typically set to 400K
@@ -372,7 +375,7 @@
  */
 #define ESP_PANEL_BOARD_CUSTOM_FILE_VERSION_MAJOR 0
 #define ESP_PANEL_BOARD_CUSTOM_FILE_VERSION_MINOR 1
-#define ESP_PANEL_BOARD_CUSTOM_FILE_VERSION_PATCH 3
+#define ESP_PANEL_BOARD_CUSTOM_FILE_VERSION_PATCH 4
 
 #endif /* ESP_PANEL_USE_CUSTOM_BOARD */
 
diff --git a/examples/LVGL/v8/Porting/ESP_Panel_Board_Custom.h b/examples/LVGL/v8/Porting/ESP_Panel_Board_Custom.h
@@ -247,8 +247,11 @@
 /* Touch panel bus parameters */
 #if ESP_PANEL_TOUCH_BUS_TYPE == ESP_PANEL_BUS_TYPE_I2C
 
-    #define ESP_PANEL_TOUCH_BUS_HOST_ID     (0)     // Typically set to 0 to use the default address
-    #define ESP_PANEL_TOUCH_I2C_ADDRESS     (0)     // For GT911, there are two addresses: 0x5D(default) and 0x14
+    #define ESP_PANEL_TOUCH_BUS_HOST_ID     (0)     // Typically set to 0
+    #define ESP_PANEL_TOUCH_I2C_ADDRESS     (0)     // Typically set to 0 to use the default address.
+                                                    // - For touchs with only one address, set to 0
+                                                    // - For touchs with multiple addresses, set to 0 or the address
+                                                    //   Like GT911, there are two addresses: 0x5D(default) and 0x14
 #if !ESP_PANEL_TOUCH_BUS_SKIP_INIT_HOST
     #define ESP_PANEL_TOUCH_I2C_CLK_HZ      (400 * 1000)
                                                     // Typically set to 400K
@@ -372,7 +375,7 @@
  */
 #define ESP_PANEL_BOARD_CUSTOM_FILE_VERSION_MAJOR 0
 #define ESP_PANEL_BOARD_CUSTOM_FILE_VERSION_MINOR 1
-#define ESP_PANEL_BOARD_CUSTOM_FILE_VERSION_PATCH 3
+#define ESP_PANEL_BOARD_CUSTOM_FILE_VERSION_PATCH 4
 
 #endif /* ESP_PANEL_USE_CUSTOM_BOARD */
 
diff --git a/examples/LVGL/v8/Rotation/ESP_Panel_Board_Custom.h b/examples/LVGL/v8/Rotation/ESP_Panel_Board_Custom.h
@@ -247,8 +247,11 @@
 /* Touch panel bus parameters */
 #if ESP_PANEL_TOUCH_BUS_TYPE == ESP_PANEL_BUS_TYPE_I2C
 
-    #define ESP_PANEL_TOUCH_BUS_HOST_ID     (0)     // Typically set to 0 to use the default address
-    #define ESP_PANEL_TOUCH_I2C_ADDRESS     (0)     // For GT911, there are two addresses: 0x5D(default) and 0x14
+    #define ESP_PANEL_TOUCH_BUS_HOST_ID     (0)     // Typically set to 0
+    #define ESP_PANEL_TOUCH_I2C_ADDRESS     (0)     // Typically set to 0 to use the default address.
+                                                    // - For touchs with only one address, set to 0
+                                                    // - For touchs with multiple addresses, set to 0 or the address
+                                                    //   Like GT911, there are two addresses: 0x5D(default) and 0x14
 #if !ESP_PANEL_TOUCH_BUS_SKIP_INIT_HOST
     #define ESP_PANEL_TOUCH_I2C_CLK_HZ      (400 * 1000)
                                                     // Typically set to 400K
@@ -372,7 +375,7 @@
  */
 #define ESP_PANEL_BOARD_CUSTOM_FILE_VERSION_MAJOR 0
 #define ESP_PANEL_BOARD_CUSTOM_FILE_VERSION_MINOR 1
-#define ESP_PANEL_BOARD_CUSTOM_FILE_VERSION_PATCH 3
+#define ESP_PANEL_BOARD_CUSTOM_FILE_VERSION_PATCH 4
 
 #endif /* ESP_PANEL_USE_CUSTOM_BOARD */
 
diff --git a/examples/Panel/PanelTest/ESP_Panel_Board_Custom.h b/examples/Panel/PanelTest/ESP_Panel_Board_Custom.h
@@ -247,8 +247,11 @@
 /* Touch panel bus parameters */
 #if ESP_PANEL_TOUCH_BUS_TYPE == ESP_PANEL_BUS_TYPE_I2C
 
-    #define ESP_PANEL_TOUCH_BUS_HOST_ID     (0)     // Typically set to 0 to use the default address
-    #define ESP_PANEL_TOUCH_I2C_ADDRESS     (0)     // For GT911, there are two addresses: 0x5D(default) and 0x14
+    #define ESP_PANEL_TOUCH_BUS_HOST_ID     (0)     // Typically set to 0
+    #define ESP_PANEL_TOUCH_I2C_ADDRESS     (0)     // Typically set to 0 to use the default address.
+                                                    // - For touchs with only one address, set to 0
+                                                    // - For touchs with multiple addresses, set to 0 or the address
+                                                    //   Like GT911, there are two addresses: 0x5D(default) and 0x14
 #if !ESP_PANEL_TOUCH_BUS_SKIP_INIT_HOST
     #define ESP_PANEL_TOUCH_I2C_CLK_HZ      (400 * 1000)
                                                     // Typically set to 400K
@@ -372,7 +375,7 @@
  */
 #define ESP_PANEL_BOARD_CUSTOM_FILE_VERSION_MAJOR 0
 #define ESP_PANEL_BOARD_CUSTOM_FILE_VERSION_MINOR 1
-#define ESP_PANEL_BOARD_CUSTOM_FILE_VERSION_PATCH 3
+#define ESP_PANEL_BOARD_CUSTOM_FILE_VERSION_PATCH 4
 
 #endif /* ESP_PANEL_USE_CUSTOM_BOARD */
 
diff --git a/examples/PlatformIO/src/ESP_Panel_Board_Custom.h b/examples/PlatformIO/src/ESP_Panel_Board_Custom.h
@@ -247,8 +247,11 @@
 /* Touch panel bus parameters */
 #if ESP_PANEL_TOUCH_BUS_TYPE == ESP_PANEL_BUS_TYPE_I2C
 
-    #define ESP_PANEL_TOUCH_BUS_HOST_ID     (0)     // Typically set to 0 to use the default address
-    #define ESP_PANEL_TOUCH_I2C_ADDRESS     (0)     // For GT911, there are two addresses: 0x5D(default) and 0x14
+    #define ESP_PANEL_TOUCH_BUS_HOST_ID     (0)     // Typically set to 0
+    #define ESP_PANEL_TOUCH_I2C_ADDRESS     (0)     // Typically set to 0 to use the default address.
+                                                    // - For touchs with only one address, set to 0
+                                                    // - For touchs with multiple addresses, set to 0 or the address
+                                                    //   Like GT911, there are two addresses: 0x5D(default) and 0x14
 #if !ESP_PANEL_TOUCH_BUS_SKIP_INIT_HOST
     #define ESP_PANEL_TOUCH_I2C_CLK_HZ      (400 * 1000)
                                                     // Typically set to 400K
@@ -372,7 +375,7 @@
  */
 #define ESP_PANEL_BOARD_CUSTOM_FILE_VERSION_MAJOR 0
 #define ESP_PANEL_BOARD_CUSTOM_FILE_VERSION_MINOR 1
-#define ESP_PANEL_BOARD_CUSTOM_FILE_VERSION_PATCH 3
+#define ESP_PANEL_BOARD_CUSTOM_FILE_VERSION_PATCH 4
 
 #endif /* ESP_PANEL_USE_CUSTOM_BOARD */
 
diff --git a/examples/SquareLine/v8/Porting/ESP_Panel_Board_Custom.h b/examples/SquareLine/v8/Porting/ESP_Panel_Board_Custom.h
@@ -247,8 +247,11 @@
 /* Touch panel bus parameters */
 #if ESP_PANEL_TOUCH_BUS_TYPE == ESP_PANEL_BUS_TYPE_I2C
 
-    #define ESP_PANEL_TOUCH_BUS_HOST_ID     (0)     // Typically set to 0 to use the default address
-    #define ESP_PANEL_TOUCH_I2C_ADDRESS     (0)     // For GT911, there are two addresses: 0x5D(default) and 0x14
+    #define ESP_PANEL_TOUCH_BUS_HOST_ID     (0)     // Typically set to 0
+    #define ESP_PANEL_TOUCH_I2C_ADDRESS     (0)     // Typically set to 0 to use the default address.
+                                                    // - For touchs with only one address, set to 0
+                                                    // - For touchs with multiple addresses, set to 0 or the address
+                                                    //   Like GT911, there are two addresses: 0x5D(default) and 0x14
 #if !ESP_PANEL_TOUCH_BUS_SKIP_INIT_HOST
     #define ESP_PANEL_TOUCH_I2C_CLK_HZ      (400 * 1000)
                                                     // Typically set to 400K
@@ -372,7 +375,7 @@
  */
 #define ESP_PANEL_BOARD_CUSTOM_FILE_VERSION_MAJOR 0
 #define ESP_PANEL_BOARD_CUSTOM_FILE_VERSION_MINOR 1
-#define ESP_PANEL_BOARD_CUSTOM_FILE_VERSION_PATCH 3
+#define ESP_PANEL_BOARD_CUSTOM_FILE_VERSION_PATCH 4
 
 #endif /* ESP_PANEL_USE_CUSTOM_BOARD */
 
diff --git a/examples/SquareLine/v8/WiFiClock/ESP_Panel_Board_Custom.h b/examples/SquareLine/v8/WiFiClock/ESP_Panel_Board_Custom.h
@@ -247,8 +247,11 @@
 /* Touch panel bus parameters */
 #if ESP_PANEL_TOUCH_BUS_TYPE == ESP_PANEL_BUS_TYPE_I2C
 
-    #define ESP_PANEL_TOUCH_BUS_HOST_ID     (0)     // Typically set to 0 to use the default address
-    #define ESP_PANEL_TOUCH_I2C_ADDRESS     (0)     // For GT911, there are two addresses: 0x5D(default) and 0x14
+    #define ESP_PANEL_TOUCH_BUS_HOST_ID     (0)     // Typically set to 0
+    #define ESP_PANEL_TOUCH_I2C_ADDRESS     (0)     // Typically set to 0 to use the default address.
+                                                    // - For touchs with only one address, set to 0
+                                                    // - For touchs with multiple addresses, set to 0 or the address
+                                                    //   Like GT911, there are two addresses: 0x5D(default) and 0x14
 #if !ESP_PANEL_TOUCH_BUS_SKIP_INIT_HOST
     #define ESP_PANEL_TOUCH_I2C_CLK_HZ      (400 * 1000)
                                                     // Typically set to 400K
@@ -372,7 +375,7 @@
  */
 #define ESP_PANEL_BOARD_CUSTOM_FILE_VERSION_MAJOR 0
 #define ESP_PANEL_BOARD_CUSTOM_FILE_VERSION_MINOR 1
-#define ESP_PANEL_BOARD_CUSTOM_FILE_VERSION_PATCH 3
+#define ESP_PANEL_BOARD_CUSTOM_FILE_VERSION_PATCH 4
 
 #endif /* ESP_PANEL_USE_CUSTOM_BOARD */
 
diff --git a/examples/Touch/I2C/I2C.ino b/examples/Touch/I2C/I2C.ino
@@ -53,8 +53,10 @@
  *      - ST1633, ST7123
  */
 #define EXAMPLE_TOUCH_NAME              GT911
-#define EXAMPLE_TOUCH_ADDRESS           (0)     // Typically set to `0` to use the default address
-                                                // For GT911, there are two addresses: 0x5D(default) and 0x14
+#define EXAMPLE_TOUCH_ADDRESS           (0)     // Typically set to 0 to use the default address.
+                                                // - For touchs with only one address, set to 0
+                                                // - For touchs with multiple addresses, set to 0 or the address
+                                                //   Like GT911, there are two addresses: 0x5D(default) and 0x14
 #define EXAMPLE_TOUCH_WIDTH             (480)
 #define EXAMPLE_TOUCH_HEIGHT            (480)
 #define EXAMPLE_TOUCH_I2C_FREQ_HZ       (400 * 1000)
diff --git a/src/ESP_Panel.cpp b/src/ESP_Panel.cpp
@@ -45,8 +45,6 @@ using namespace std;
 #define CREATE_LCD(name, bus, cfg)  _CREATE_LCD(name, bus, cfg)
 #define _CREATE_TOUCH(name, bus, cfg) make_shared<ESP_PanelTouch_##name>(bus, cfg)
 #define CREATE_TOUCH(name, bus, cfg)  _CREATE_TOUCH(name, bus, cfg)
-#define _CREATE_TOUCH_WITH_ADDR(name, bus, cfg, addr) make_shared<ESP_PanelTouch_##name>(bus, cfg, addr)
-#define CREATE_TOUCH_WITH_ADDR(name, bus, cfg, addr)  _CREATE_TOUCH_WITH_ADDR(name, bus, cfg, addr)
 #define _CREATE_EXPANDER(name, host_id, address) make_shared<ESP_IOExpander_##name>(host_id, address)
 #define CREATE_EXPANDER(name, host_id, address)  _CREATE_EXPANDER(name, host_id, address)
 
@@ -414,12 +412,7 @@ bool ESP_Panel::init(void)
     ESP_PANEL_CHECK_NULL_RET(touch_bus_ptr, false, "Create touch bus failed");
 
     ESP_LOGD(TAG, "Create touch device");
-    touch_ptr =
-#if ESP_PANEL_TOUCH_I2C_ADDRESS == 0
-        CREATE_TOUCH(ESP_PANEL_TOUCH_NAME, touch_bus_ptr.get(), lcd_touch_config);
-#else
-        CREATE_TOUCH_WITH_ADDR(ESP_PANEL_TOUCH_NAME, touch_bus_ptr.get(), lcd_touch_config, ESP_PANEL_TOUCH_I2C_ADDRESS);
-#endif
+    touch_ptr = CREATE_TOUCH(ESP_PANEL_TOUCH_NAME, touch_bus_ptr.get(), lcd_touch_config);
     ESP_PANEL_CHECK_NULL_RET(touch_ptr, false, "Create touch device failed");
 #endif /* ESP_PANEL_USE_TOUCH */
 
diff --git a/src/ESP_PanelVersions.h b/src/ESP_PanelVersions.h
@@ -21,7 +21,7 @@
 /* File `ESP_Panel_Board_Custom.h` */
 #define ESP_PANEL_BOARD_CUSTOM_VERSION_MAJOR 0
 #define ESP_PANEL_BOARD_CUSTOM_VERSION_MINOR 1
-#define ESP_PANEL_BOARD_CUSTOM_VERSION_PATCH 3
+#define ESP_PANEL_BOARD_CUSTOM_VERSION_PATCH 4
 
 /* File `ESP_Panel_Board_Supported.h` */
 #define ESP_PANEL_BOARD_SUPPORTED_VERSION_MAJOR 0
diff --git a/src/touch/ESP_PanelTouch.cpp b/src/touch/ESP_PanelTouch.cpp
@@ -78,25 +78,6 @@ ESP_PanelTouch::ESP_PanelTouch(ESP_PanelBus *bus, const esp_lcd_touch_config_t &
     }
 }
 
-ESP_PanelTouch::ESP_PanelTouch(ESP_PanelBus *bus, const esp_lcd_touch_config_t &config, int address):
-    bus(bus),
-    config(config),
-    handle(NULL),
-    _swap_xy(false),
-    _mirror_x(false),
-    _mirror_y(false),
-    _tp_points_num(0),
-    _tp_buttons_state{0},
-    onTouchInterruptCallback(NULL),
-    _isr_sem(NULL),
-    callback_data(CALLBACK_DATA_DEFAULT())
-{
-    if ((config.int_gpio_num != GPIO_NUM_NC) && (config.interrupt_callback == NULL) && (config.user_data == NULL)) {
-        this->config.interrupt_callback = onTouchInterrupt;
-        this->config.user_data = &callback_data;
-    }
-}
-
 bool ESP_PanelTouch::attachInterruptCallback(std::function<bool (void *)> callback, void *user_data)
 {
     ESP_PANEL_CHECK_FALSE_RET((config.interrupt_callback == onTouchInterrupt), false, "Interruption is not enabled");
diff --git a/src/touch/ESP_PanelTouch.h b/src/touch/ESP_PanelTouch.h
@@ -78,15 +78,6 @@ class ESP_PanelTouch {
      */
     ESP_PanelTouch(ESP_PanelBus *bus, const esp_lcd_touch_config_t &config);
 
-    /**
-     * @brief Construct a new touch device in a complex way, the `init()` function should be called after this function
-     *
-     * @param bus    Pointer to panel bus
-     * @param config Touch device configuration
-     * @param address The address of the touch device, default set to `0` to use the default address
-     */
-    ESP_PanelTouch(ESP_PanelBus *bus, const esp_lcd_touch_config_t &config, int address);
-
     /**
      * @brief Destroy the LCD device
      *
diff --git a/src/touch/GT911.cpp b/src/touch/GT911.cpp
@@ -19,11 +19,6 @@ ESP_PanelTouch_GT911::ESP_PanelTouch_GT911(ESP_PanelBus *bus, const esp_lcd_touc
 {
 }
 
-ESP_PanelTouch_GT911::ESP_PanelTouch_GT911(ESP_PanelBus *bus, const esp_lcd_touch_config_t &config, int address):
-    ESP_PanelTouch(bus, config, address)
-{
-}
-
 ESP_PanelTouch_GT911::~ESP_PanelTouch_GT911()
 {
     ESP_PANEL_ENABLE_TAG_DEBUG_LOG();
diff --git a/src/touch/GT911.h b/src/touch/GT911.h
@@ -36,15 +36,6 @@ class ESP_PanelTouch_GT911 : public ESP_PanelTouch {
      */
     ESP_PanelTouch_GT911(ESP_PanelBus *bus, const esp_lcd_touch_config_t &config);
 
-    /**
-     * @brief Construct a new touch device in a complex way, the `init()` function should be called after this function
-     *
-     * @param bus     Pointer to panel bus
-     * @param config  Touch device configuration
-     * @param address The address of the touch device, default set to `0` to use the default address
-     */
-    ESP_PanelTouch_GT911(ESP_PanelBus *bus, const esp_lcd_touch_config_t &config, int address);
-
     /**
      * @brief Destroy the LCD device
      *
