From 7129c6404811559e9c4b5cb4b921ce3f373d9525 Mon Sep 17 00:00:00 2001 From: Christian Baars Date: Fri, 18 Nov 2022 20:46:42 +0100 Subject: [PATCH] hide sensors from discovery to do this in Berry --- tasmota/include/xsns_62_esp32_mi.h | 1 - tasmota/tasmota_xsns_sensor/xsns_62_esp32_mi.ino | 14 +++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/tasmota/include/xsns_62_esp32_mi.h b/tasmota/include/xsns_62_esp32_mi.h index 409821481..8418554df 100644 --- a/tasmota/include/xsns_62_esp32_mi.h +++ b/tasmota/include/xsns_62_esp32_mi.h @@ -201,7 +201,6 @@ struct { uint32_t allwaysAggregate:1; // always show all known values of one sensor in brdigemode uint32_t noSummary:1; // no sensor values at TELE-period uint32_t directBridgeMode:1; // send every received BLE-packet as a MQTT-message in real-time - uint32_t showRSSI:1; uint32_t activeScan:1; uint32_t ignoreBogusBattery:1; uint32_t minimalSummary:1; // DEPRECATED!! diff --git a/tasmota/tasmota_xsns_sensor/xsns_62_esp32_mi.ino b/tasmota/tasmota_xsns_sensor/xsns_62_esp32_mi.ino index ead1c2260..0b8c2eb26 100644 --- a/tasmota/tasmota_xsns_sensor/xsns_62_esp32_mi.ino +++ b/tasmota/tasmota_xsns_sensor/xsns_62_esp32_mi.ino @@ -615,7 +615,6 @@ void MI32PreInit(void) { MI32.option.noSummary = 0; MI32.option.minimalSummary = 0; MI32.option.directBridgeMode = 0; - MI32.option.showRSSI = 1; MI32.option.ignoreBogusBattery = 1; // from advertisements MI32loadCfg(); @@ -640,7 +639,7 @@ void MI32Init(void) { } } - if(MI32.mode.didGetConfig){ + if(MI32.mode.didGetConfig && !Settings->flag5.zigbee_hide_bridge_topic){ // borrow SO125 1 to turn off HomeKit MI32.mode.didStartHAP = 0; #ifdef USE_MI_HOMEKIT MI32getSetupCodeFromMAC(MI32.hk_setup_code); @@ -2096,6 +2095,7 @@ void MI32Show(bool json) if(!MI32.mode.triggeredTele){ if(MI32.option.noSummary) return; // no message at TELEPERIOD } + if(TasmotaGlobal.masterlog_level == LOG_LEVEL_DEBUG_MORE) return; // we want to announce sensors unlinked to the ESP, check for LOG_LEVEL_DEBUG_MORE is medium-safe MI32suspendScanTask(); for (uint32_t i = 0; i < MIBLEsensors.size(); i++) { if(MI32.mode.triggeredTele && MIBLEsensors[i].eventType.raw == 0) continue; @@ -2228,10 +2228,9 @@ void MI32Show(bool json) } } } - if (MI32.option.showRSSI) { - MI32ShowContinuation(&commaflg); - ResponseAppend_P(PSTR("\"RSSI\":%d"), MIBLEsensors[i].RSSI); - } + MI32ShowContinuation(&commaflg); + ResponseAppend_P(PSTR("\"RSSI\":%d"), MIBLEsensors[i].RSSI); + ResponseJsonEnd(); MIBLEsensors[i].eventType.raw = 0; @@ -2319,6 +2318,7 @@ int ExtStopBLE(){ MI32Scan->stop(); MI32.mode.deleteScanTask = 1; AddLog(LOG_LEVEL_INFO,PSTR("M32: stop BLE")); + while (MI32.mode.runningScan) yield(); } #ifdef USE_MI_HOMEKIT if(MI32.mode.didStartHAP) { @@ -2371,7 +2371,7 @@ bool Xsns62(uint32_t function) break; #ifdef USE_MI_EXT_GUI case FUNC_WEB_ADD_MAIN_BUTTON: - if (MI32.mode.didGetConfig) WSContentSend_P(HTTP_BTN_MENU_MI32); + if (Settings->flag5.mi32_enable) WSContentSend_P(HTTP_BTN_MENU_MI32); break; case FUNC_WEB_ADD_HANDLER: WebServer_on(PSTR("/m32"), MI32HandleWebGUI);