Merge 62446a9a30 into bb7c3eeba3

src/MqttTask.h

@@ -70,8 +70,8 @@ public:
     this->prevPubVarsTime = 0;
   }
 
-  inline void reconfigureSensor(uint8_t sensorId, Sensors::Settings& prevSettings) {
-    this->queueReconfigureSensors[sensorId] = prevSettings;
+  inline void rebuildHaEntity(uint8_t sensorId, Sensors::Settings& prevSettings) {
+    this->queueRebuildingHaEntities[sensorId] = prevSettings;
   }
 
 protected:
@@ -81,7 +81,7 @@ protected:
   MqttWriter* writer = nullptr;
   UnitSystem currentUnitSystem = UnitSystem::METRIC;
   bool currentHomeAssistantDiscovery = false;
-  std::unordered_map<uint8_t, Sensors::Settings> queueReconfigureSensors;
+  std::unordered_map<uint8_t, Sensors::Settings> queueRebuildingHaEntities;
   unsigned short readyForSendTime = 30000;
   unsigned long lastReconnectTime = 0;
   unsigned long connectedTime = 0;
@@ -276,8 +276,8 @@ protected:
         this->publishNonStaticHaEntities();
       }
 
-      // rebuilding ha configs
-      for (auto& [sensorId, prevSettings] : this->queueReconfigureSensors) {
+
+      for (auto& [sensorId, prevSettings] : this->queueRebuildingHaEntities) {
         Log.sinfoln(FPSTR(L_MQTT_HA), F("Rebuilding config for sensor #%hhu '%s'"), sensorId, prevSettings.name);
 
         // delete old config
@@ -297,6 +297,15 @@ protected:
               this->haHelper->deleteSignalQualityDynamicSensor(prevSettings);
               this->haHelper->deleteDynamicSensor(prevSettings, Sensors::ValueType::TEMPERATURE);
               break;
+            
+            case Sensors::Type::MANUAL:
+              this->client->unsubscribe(
+                this->haHelper->getDeviceTopic(
+                  F("sensors"),
+                  Sensors::makeObjectId(prevSettings.name).c_str(),
+                  F("set")
+                ).c_str()
+              );
 
             default:
               this->haHelper->deleteDynamicSensor(prevSettings, Sensors::ValueType::PRIMARY);
@@ -324,51 +333,26 @@ protected:
             this->haHelper->publishSignalQualityDynamicSensor(sSettings, false);
             this->haHelper->publishDynamicSensor(sSettings, Sensors::ValueType::TEMPERATURE, settings.system.unitSystem);
             break;
+
+          case Sensors::Type::MANUAL: 
+            this->client->subscribe(
+              this->haHelper->getDeviceTopic(
+                F("sensors"),
+                Sensors::makeObjectId(prevSettings.name).c_str(),
+                F("set")
+              ).c_str()
+            );
           
           default:
             this->haHelper->publishDynamicSensor(sSettings, Sensors::ValueType::PRIMARY, settings.system.unitSystem);
         }
       }
+      this->queueRebuildingHaEntities.clear();
 
     } else if (this->currentHomeAssistantDiscovery) {
       this->currentHomeAssistantDiscovery = false;
     }
 
-    // reconfigure manual sensors
-    for (auto& [sensorId, prevSettings] : this->queueReconfigureSensors) {
-      // unsubscribe from old topic
-      if (strlen(prevSettings.name) && prevSettings.enabled) {
-        if (prevSettings.type == Sensors::Type::MANUAL) {
-          this->client->unsubscribe(
-            this->haHelper->getDeviceTopic(
-              F("sensors"),
-              Sensors::makeObjectId(prevSettings.name).c_str(),
-              F("set")
-            ).c_str()
-          );
-        }
-      }
-
-      if (!Sensors::hasEnabledAndValid(sensorId)) {
-        continue;
-      }
-
-      // subscribe to new topic
-      auto& sSettings = Sensors::settings[sensorId];
-      if (sSettings.type == Sensors::Type::MANUAL) {
-        this->client->subscribe(
-          this->haHelper->getDeviceTopic(
-            F("sensors"),
-            Sensors::makeObjectId(sSettings.name).c_str(),
-            F("set")
-          ).c_str()
-        );
-      }
-    }
-
-    // clear queue
-    this->queueReconfigureSensors.clear();
-
     if (this->newConnection) {
       this->newConnection = false;
     }
@@ -382,26 +366,6 @@ protected:
 
     this->client->subscribe(this->haHelper->getDeviceTopic(F("settings/set")).c_str());
     this->client->subscribe(this->haHelper->getDeviceTopic(F("state/set")).c_str());
-
-    // subscribe to manual sensors
-    for (uint8_t sensorId = 0; sensorId <= Sensors::getMaxSensorId(); sensorId++) {
-      if (!Sensors::hasEnabledAndValid(sensorId)) {
-        continue;
-      }
-
-      auto& sSettings = Sensors::settings[sensorId];
-      if (sSettings.type != Sensors::Type::MANUAL) {
-        continue;
-      }
-
-      this->client->subscribe(
-        this->haHelper->getDeviceTopic(
-          F("sensors"),
-          Sensors::makeObjectId(sSettings.name).c_str(),
-          F("set")
-        ).c_str()
-      );
-    }
   }
 
   void onDisconnect() {
@@ -549,6 +513,15 @@ protected:
           this->haHelper->publishSignalQualityDynamicSensor(sSettings, false);
           this->haHelper->publishDynamicSensor(sSettings, Sensors::ValueType::TEMPERATURE, settings.system.unitSystem);
           break;
+
+        case Sensors::Type::MANUAL:
+          this->client->subscribe(
+            this->haHelper->getDeviceTopic(
+              F("sensors"),
+              Sensors::makeObjectId(sSettings.name).c_str(),
+              F("set")
+            ).c_str()
+          );
         
         default:
           this->haHelper->publishDynamicSensor(sSettings, Sensors::ValueType::PRIMARY, settings.system.unitSystem);

src/PortalTask.h

@@ -631,7 +631,7 @@ protected:
       }
 
       if (changed) {
-        tMqtt->reconfigureSensor(sensorId, prevSettings);
+        tMqtt->rebuildHaEntity(sensorId, prevSettings);
         fsSensorsSettings.update();
       }
     });

src_data/scripts/utils.js

@@ -132,14 +132,10 @@ const setupNetworkScanForm = (formSelector, tableSelector) => {
       for (let i = 0; i < result.length; i++) {
         let row = tbody.insertRow(-1);
         row.classList.add("network");
-        row.dataset.ssid = result[i].hidden ? '' : result[i].ssid;
-        row.insertCell().textContent = `#${i + 1}`;
-
-        const nameCell = row.insertCell();
-        nameCell.innerHTML = result[i].hidden ? `<i>${result[i].bssid}</i>` : result[i].ssid;
-        nameCell.onclick = (event) => {
-          const input = document.querySelector("[name='sta[ssid]']");
-          const ssid = event.target.parentNode.dataset.ssid;
+        row.setAttribute('data-ssid', result[i].hidden ? '' : result[i].ssid);
+        row.onclick = () => {
+          const input = document.querySelector('input#sta-ssid');
+          const ssid = this.getAttribute('data-ssid');
           if (!input || !ssid) {
             return;
           }
@@ -148,6 +144,9 @@ const setupNetworkScanForm = (formSelector, tableSelector) => {
           input.focus();
         };
 
+        row.insertCell().textContent = `#${i + 1}`;
+        row.insertCell().innerHTML = result[i].hidden ? `<i>${result[i].bssid}</i>` : result[i].ssid;
+
         // info cell
         let infoCell = row.insertCell();
 
@@ -166,7 +165,7 @@ const setupNetworkScanForm = (formSelector, tableSelector) => {
         }
         
         let signalQualityContainer = document.createElement("span");
-        signalQualityContainer.dataset.tooltip = `${result[i].signalQuality}%`;
+        signalQualityContainer.setAttribute('data-tooltip', `${result[i].signalQuality}%`);
         signalQualityContainer.appendChild(signalQualityIcon);
         infoCell.appendChild(signalQualityContainer);
 
@@ -193,7 +192,7 @@ const setupNetworkScanForm = (formSelector, tableSelector) => {
         }
 
         let authContainer = document.createElement("span");
-        authContainer.dataset.tooltip = (result[i].auth in authList) ? authList[result[i].auth] : "unknown";
+        authContainer.setAttribute('data-tooltip', (result[i].auth in authList) ? authList[result[i].auth] : "unknown");
         authContainer.appendChild(authIcon);
         infoCell.appendChild(authContainer);
       }