From f9c31bd8b8a8329615f5dd9b9fc4c217003a2b2f Mon Sep 17 00:00:00 2001
From: Christian Baars <christianbaars@MacBook-Pro-von-Christian.local>
Date: Thu, 9 Jun 2022 22:00:19 +0200
Subject: [PATCH] make discoverAttributes optional

---
 tasmota/include/xsns_62_esp32_mi.h                   |  1 +
 tasmota/tasmota_xdrv_driver/xdrv_52_3_berry_MI32.ino | 10 +++++++---
 tasmota/tasmota_xsns_sensor/xsns_62_esp32_mi.ino     |  8 +++++---
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/tasmota/include/xsns_62_esp32_mi.h b/tasmota/include/xsns_62_esp32_mi.h
index edbf0b2db..dd404ab14 100644
--- a/tasmota/include/xsns_62_esp32_mi.h
+++ b/tasmota/include/xsns_62_esp32_mi.h
@@ -190,6 +190,7 @@ struct {
       uint32_t triggerBerryConnCB:1;
       uint32_t triggerNextConnJob:1;
       uint32_t readyForNextConnJob:1;
+      uint32_t discoverAttributes:1;
     };
     uint32_t all = 0;
   } mode;
diff --git a/tasmota/tasmota_xdrv_driver/xdrv_52_3_berry_MI32.ino b/tasmota/tasmota_xdrv_driver/xdrv_52_3_berry_MI32.ino
index 032e2e2ed..e247ee01a 100644
--- a/tasmota/tasmota_xdrv_driver/xdrv_52_3_berry_MI32.ino
+++ b/tasmota/tasmota_xdrv_driver/xdrv_52_3_berry_MI32.ino
@@ -119,7 +119,7 @@ extern "C" {
   extern void MI32setBerryAdvCB(void* function, uint8_t *buffer);
   extern void MI32setBerryConnCB(void* function, uint8_t *buffer);
   extern bool MI32runBerryConnection(uint8_t operation, bool response);
-  extern bool MI32setBerryCtxSvc(const char *Svc);
+  extern bool MI32setBerryCtxSvc(const char *Svc, bool discoverAttributes);
   extern bool MI32setBerryCtxChr(const char *Chr);
   extern bool MI32setBerryCtxMAC(uint8_t *MAC, uint8_t type);
   extern bool MI32addMACtoBlockList(uint8_t *MAC, uint8_t type);
@@ -175,8 +175,12 @@ extern "C" {
   int be_BLE_set_service(bvm *vm);
   int be_BLE_set_service(bvm *vm){    
     int32_t argc = be_top(vm); // Get the number of arguments
-    if (argc == 2 && be_isstring(vm, 2)) {
-      if (MI32setBerryCtxSvc(be_tostring(vm, 2))) be_return(vm);
+    if (argc > 1 && be_isstring(vm, 2)) {
+      bool discoverAttributes = false;
+      if(argc == 3 && be_isint(vm, 3)){
+        discoverAttributes = be_toint(vm,3)>0;
+      }
+      if (MI32setBerryCtxSvc(be_tostring(vm, 2),discoverAttributes)) be_return(vm);
     }
     be_raise(vm, kTypeError, nullptr);
   }
diff --git a/tasmota/tasmota_xsns_sensor/xsns_62_esp32_mi.ino b/tasmota/tasmota_xsns_sensor/xsns_62_esp32_mi.ino
index a84106b15..55d84db7a 100644
--- a/tasmota/tasmota_xsns_sensor/xsns_62_esp32_mi.ino
+++ b/tasmota/tasmota_xsns_sensor/xsns_62_esp32_mi.ino
@@ -702,10 +702,11 @@ extern "C" {
     AddLog(LOG_LEVEL_INFO,PSTR("M32: Connection Ctx created"));
   }
 
-  bool MI32setBerryCtxSvc(const char *Svc){
+  bool MI32setBerryCtxSvc(const char *Svc, bool discoverAttributes){
     if(MI32.conCtx != nullptr){
       MI32.conCtx->serviceUUID = NimBLEUUID(Svc);
       AddLog(LOG_LEVEL_DEBUG,PSTR("M32: SVC: %s"),MI32.conCtx->serviceUUID.toString().c_str());
+      MI32.mode.discoverAttributes = discoverAttributes;
       return true;
     }
     return false;
@@ -1182,8 +1183,9 @@ void MI32ConnectionTask(void *pvParameters){
         timer++;
         vTaskDelay(10/ portTICK_PERIOD_MS);
       }
-      // TODO: make next line optional
-      // MI32Client->discoverAttributes(); // solves connection problems on i.e. yeelight dimmer
+      if(MI32.mode.discoverAttributes){
+        MI32Client->discoverAttributes(); // solves connection problems on i.e. yeelight dimmer
+      }
       NimBLERemoteService* pSvc = nullptr;
       NimBLERemoteCharacteristic* pChr = nullptr;