From 749b9421329f0ca8453e7df0df0702a3d29e8276 Mon Sep 17 00:00:00 2001
From: Clyde Stubbs <2366188+clydebarrow@users.noreply.github.com>
Date: Thu, 31 Oct 2024 17:37:32 +1100
Subject: [PATCH 1/2] [lvlg] fix tests (#7708)

---
 tests/components/lvgl/common.yaml | 40 +------------------------------
 1 file changed, 1 insertion(+), 39 deletions(-)

diff --git a/tests/components/lvgl/common.yaml b/tests/components/lvgl/common.yaml
index cebc3caaa7..c7d635db1c 100644
--- a/tests/components/lvgl/common.yaml
+++ b/tests/components/lvgl/common.yaml
@@ -4,56 +4,18 @@ touchscreen:
     display: tft_display
     update_interval: 50ms
     threshold: 1
-    calibration:
-      x_max: 240
-      y_max: 320
 
 font:
   - file: "$component_dir/roboto.ttf"
     id: roboto20
     size: 20
-    extras:
-      - file: '$component_dir/materialdesignicons-webfont.ttf'
-        glyphs: [
-          "\U000F004B",
-          "\U0000f0ed",
-          "\U000F006E",
-          "\U000F012C",
-          "\U000F179B",
-          "\U000F0748",
-          "\U000F1A1B",
-          "\U000F02DC",
-          "\U000F0A02",
-          "\U000F035F",
-          "\U000F0156",
-          "\U000F0C5F",
-          "\U000f0084",
-          "\U000f0091",
-        ]
+
   - file: "$component_dir/helvetica.ttf"
     id: helvetica20
   - file: "$component_dir/roboto.ttf"
     id: roboto10
     size: 10
     bpp: 4
-    extras:
-      - file: '$component_dir/materialdesignicons-webfont.ttf'
-        glyphs: [
-          "\U000F004B",
-          "\U0000f0ed",
-          "\U000F006E",
-          "\U000F012C",
-          "\U000F179B",
-          "\U000F0748",
-          "\U000F1A1B",
-          "\U000F02DC",
-          "\U000F0A02",
-          "\U000F035F",
-          "\U000F0156",
-          "\U000F0C5F",
-          "\U000f0084",
-          "\U000f0091",
-        ]
 
 sensor:
   - platform: lvgl

From cefbfb75bd4b5f8baaf5599c1c4221aab1919426 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Thu, 31 Oct 2024 23:46:35 +1300
Subject: [PATCH 2/2] [esp32_ble] Add disconnect as a virtual function to
 ``ESPBTClient`` (#7705)

---
 esphome/components/esp32_ble_client/ble_client_base.h    | 2 +-
 esphome/components/esp32_ble_tracker/esp32_ble_tracker.h | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/esphome/components/esp32_ble_client/ble_client_base.h b/esphome/components/esp32_ble_client/ble_client_base.h
index fd586e59d6..fca66c0b3c 100644
--- a/esphome/components/esp32_ble_client/ble_client_base.h
+++ b/esphome/components/esp32_ble_client/ble_client_base.h
@@ -35,7 +35,7 @@ class BLEClientBase : public espbt::ESPBTClient, public Component {
   void gap_event_handler(esp_gap_ble_cb_event_t event, esp_ble_gap_cb_param_t *param) override;
   void connect() override;
   esp_err_t pair();
-  void disconnect();
+  void disconnect() override;
   void release_services();
 
   bool connected() { return this->state_ == espbt::ClientState::ESTABLISHED; }
diff --git a/esphome/components/esp32_ble_tracker/esp32_ble_tracker.h b/esphome/components/esp32_ble_tracker/esp32_ble_tracker.h
index d2bb6a6e6d..2fc5da829d 100644
--- a/esphome/components/esp32_ble_tracker/esp32_ble_tracker.h
+++ b/esphome/components/esp32_ble_tracker/esp32_ble_tracker.h
@@ -11,9 +11,9 @@
 
 #ifdef USE_ESP32
 
+#include <esp_bt_defs.h>
 #include <esp_gap_ble_api.h>
 #include <esp_gattc_api.h>
-#include <esp_bt_defs.h>
 
 #include <freertos/FreeRTOS.h>
 #include <freertos/semphr.h>
@@ -172,6 +172,7 @@ class ESPBTClient : public ESPBTDeviceListener {
                                    esp_ble_gattc_cb_param_t *param) = 0;
   virtual void gap_event_handler(esp_gap_ble_cb_event_t event, esp_ble_gap_cb_param_t *param) = 0;
   virtual void connect() = 0;
+  virtual void disconnect() = 0;
   virtual void set_state(ClientState st) { this->state_ = st; }
   ClientState state() const { return state_; }
   int app_id;