Merge branch 'main' into lvgl_9.1

CoretechR · Dec 24, 2024 · 4efbf8c · 4efbf8c
2 parents aca6d00 + 547ccce
commit 4efbf8c
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 0 deletions.
diff --git a/Platformio/hardware/ESP32/boardtest/main_boardtest.cpp b/Platformio/hardware/ESP32/boardtest/main_boardtest.cpp
@@ -112,6 +112,7 @@ class LGFX : public lgfx::LGFX_Device
       cfg.pin_sda = SDA;
       cfg.pin_scl = SCL;
       cfg.freq = 400000;
+      cfg.bus_shared = true;
       cfg.x_min = 0;
       cfg.x_max = screenWidth-1;
       cfg.y_min = 0;

diff --git a/Platformio/hardware/ESP32/lvgl_hal_esp32.cpp b/Platformio/hardware/ESP32/lvgl_hal_esp32.cpp
@@ -32,6 +32,7 @@ static void my_touchpad_read(lv_indev_t *indev_driver, lv_indev_data_t *data) {
         data->state = LV_INDEV_STATE_PRESSED;
         data->point.x = x;
         data->point.y = y;
+        setLastActivityTimestamp_HAL();
     } else {
         data->state = LV_INDEV_STATE_RELEASED;
     }

diff --git a/Platformio/hardware/ESP32/tft_hal_esp32.cpp b/Platformio/hardware/ESP32/tft_hal_esp32.cpp
@@ -44,6 +44,7 @@ LGFX::LGFX(void) {
     cfg.pin_sda = SDA_GPIO;
     cfg.pin_scl = SCL_GPIO;
     cfg.freq = 400000;
+    cfg.bus_shared = true;
     cfg.x_min = 0;
     cfg.x_max = SCR_WIDTH-1;
     cfg.y_min = 0;