Fix: Service and characteristic reversed uuid128 for ESPHome 2021.9.x and older, connecting state and characteristic handle initialization

Author: myhomeiot

components/myhomeiot_ble_client/__init__.py

@@ -1,7 +1,7 @@
 import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome.components import myhomeiot_ble_host, esp32_ble_tracker
-from esphome import automation
+from esphome import const, automation
 from esphome.const import (
     CONF_ID,
     CONF_MAC_ADDRESS,
@@ -47,23 +47,27 @@
     .extend(myhomeiot_ble_host.BLE_CLIENT_SCHEMA)
 )
 
+def versiontuple(v):
+    return tuple(map(int, (v.split("."))))
+
 def to_code(config):
     var = cg.new_Pvariable(config[CONF_ID])
 
+    reversed = versiontuple(const.__version__) >= versiontuple("2021.9.0")
     if len(config[CONF_SERVICE_UUID]) == len(esp32_ble_tracker.bt_uuid16_format):
         cg.add(var.set_service_uuid16(esp32_ble_tracker.as_hex(config[CONF_SERVICE_UUID])))
     elif len(config[CONF_SERVICE_UUID]) == len(esp32_ble_tracker.bt_uuid32_format):
         cg.add(var.set_service_uuid32(esp32_ble_tracker.as_hex(config[CONF_SERVICE_UUID])))
     elif len(config[CONF_SERVICE_UUID]) == len(esp32_ble_tracker.bt_uuid128_format):
-        uuid128 = esp32_ble_tracker.as_hex_array(config[CONF_SERVICE_UUID])
+        uuid128 = esp32_ble_tracker.as_reversed_hex_array(config[CONF_SERVICE_UUID]) if reversed else esp32_ble_tracker.as_hex_array(config[CONF_SERVICE_UUID])
         cg.add(var.set_service_uuid128(uuid128))
 
     if len(config[CONF_CHARACTERISTIC_UUID]) == len(esp32_ble_tracker.bt_uuid16_format):
         cg.add(var.set_char_uuid16(esp32_ble_tracker.as_hex(config[CONF_CHARACTERISTIC_UUID])))
     elif len(config[CONF_CHARACTERISTIC_UUID]) == len(esp32_ble_tracker.bt_uuid32_format):
         cg.add(var.set_char_uuid32(esp32_ble_tracker.as_hex(config[CONF_CHARACTERISTIC_UUID])))
     elif len(config[CONF_CHARACTERISTIC_UUID]) == len(esp32_ble_tracker.bt_uuid128_format):
-        uuid128 = esp32_ble_tracker.as_hex_array(config[CONF_CHARACTERISTIC_UUID])
+        uuid128 = esp32_ble_tracker.as_reversed_hex_array(config[CONF_CHARACTERISTIC_UUID]) if reversed else esp32_ble_tracker.as_hex_array(config[CONF_CHARACTERISTIC_UUID])
         cg.add(var.set_char_uuid128(uuid128))
 
     yield cg.register_component(var, config)

components/myhomeiot_ble_client/myhomeiot_ble_client.cpp

@@ -31,13 +31,12 @@ void MyHomeIOT_BLEClient::loop() {
 
 void MyHomeIOT_BLEClient::connect() {
   ESP_LOGI(TAG, "[%s] Connecting", to_string(this->address).c_str());
+  this->state_ = esp32_ble_tracker::ClientState::Connecting;
   if (auto status = esp_ble_gattc_open(ble_host_->gattc_if, this->remote_bda, BLE_ADDR_TYPE_PUBLIC, true))
   {
     ESP_LOGW(TAG, "[%s] open error, status (%d)", to_string(this->address).c_str(), status);
     report_error(esp32_ble_tracker::ClientState::Idle);
   }
-  else
-    this->state_ = esp32_ble_tracker::ClientState::Connecting;
 }
 
 void MyHomeIOT_BLEClient::disconnect() {
@@ -108,7 +107,7 @@ void MyHomeIOT_BLEClient::gattc_event_handler(esp_gattc_cb_event_t event, esp_ga
         break;
       }
       ESP_LOGV(TAG, "[%s] CFG_MTU_EVT, MTU (%d)", to_string(this->address).c_str(), param->cfg_mtu.mtu);
-      if (auto status = esp_ble_gattc_search_service(esp_gattc_if, param->cfg_mtu.conn_id, NULL)) {
+      if (auto status = esp_ble_gattc_search_service(esp_gattc_if, param->cfg_mtu.conn_id, nullptr)) {
         ESP_LOGW(TAG, "[%s] search_service failed, status (%d)", to_string(this->address).c_str(), status);
         report_error();
       }
@@ -173,7 +172,7 @@ void MyHomeIOT_BLEClient::gattc_event_handler(esp_gattc_cb_event_t event, esp_ga
             this->char_handle, ESP_GATT_AUTH_REQ_NONE) != ESP_GATT_OK) {
             ESP_LOGW(TAG, "[%s] read_char error sending read request, status (%d)",
               to_string(this->address).c_str(), status);
-            this->char_handle = 0;
+            this->char_handle = ESP_GATT_ILLEGAL_HANDLE;
           }
           break;
         }