Move AP locked status to its own json value

ratgdo · Oct 29, 2024 · 229dc19 · 229dc19
1 parent 6f8a331
commit 229dc19
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 8 deletions.
diff --git a/docs/webpage/webpage.png b/docs/webpage/webpage.png
diff --git a/src/web.cpp b/src/web.cpp
@@ -617,7 +617,8 @@ void handle_status()
     ADD_STR(json, "macAddress", macAddress);
     ADD_STR(json, "wifiSSID", wifiSSID);
     ADD_STR(json, "wifiRSSI", (std::to_string(WiFi.RSSI()) + " dBm, Channel " + std::to_string(WiFi.channel())).c_str());
-    ADD_STR(json, "wifiBSSID", (WiFi.BSSIDstr() + (wifiConf.bssid_set ? " (locked)" : "")).c_str());
+    ADD_STR(json, "wifiBSSID", WiFi.BSSIDstr().c_str());
+    ADD_BOOL(json, "lockedAP", wifiConf.bssid_set)
     ADD_INT(json, "GDOSecurityType", userConfig->gdoSecurityType);
     ADD_STR(json, "garageDoorState", garage_door.active ? DOOR_STATE(garage_door.current_state) : DOOR_STATE(255));
     ADD_STR(json, "garageLockState", LOCK_STATE(garage_door.current_lock));

diff --git a/src/www/functions.js b/src/www/functions.js
@@ -226,6 +226,12 @@ function setElementsFromStatus(status) {
                 document.getElementById(key).value = value;
                 document.getElementById("wifiPowerValue").innerHTML = value;
                 break;
+            case "lockedAP":
+                document.getElementById("lockedAP").style.display = (value) ? "table" : "none";
+                break;
+            case "clients":
+                document.getElementById(key).innerHTML = (value > 0) ? `Yes (${value})` : 'No';
+                break;
             case "localIP":
                 document.getElementById(key).innerHTML = value;
                 document.getElementById("IPaddress").placeholder = value;

diff --git a/src/www/index.html b/src/www/index.html
@@ -66,7 +66,8 @@
             </tr>
             <tr>
               <td>WiFi AP:</td>
-              <td id="wifiBSSID"></td>
+              <td><span id="wifiBSSID"></span><br><sup style="font-size: 0.6em;"><span id="lockedAP"
+                    style="display: none">(Locked to AP)</span></sup></td>
             </tr>
             <tr>
               <td>MAC Address:</td>
@@ -89,7 +90,8 @@
             </tr>
             <tr>
               <td>HomeKit ID:</td>
-              <td><span id="accessoryID"></span><br><sup style="font-size: 0.6em;">(clients:<span id="clients"></span>)</sup></td>
+              <td><span id="accessoryID"></span><br><sup style="font-size: 0.6em;">HomeKit connected: <span
+                    id="clients">No</span></sup></td>
             </tr>
           </table>
         </div>
@@ -365,10 +367,8 @@
                 <td></td>
               </tr>
               <tr>
-                <td>
-                  <input type="button" value="Save Settings" onclick="saveSettings()">
-                </td>
-                <td>
+                <td colspan="2" style="text-align: center;">
+                  <input type="button" value="Save Settings" onclick="saveSettings()">&nbsp;
                   <input type="button" value="Reset Door" onclick="resetDoor()">&nbsp;
                   <input type="button" value="Set WiFi SSID" onclick="setSSID()">
                 </td>

diff --git a/src/www/status.json b/src/www/status.json
@@ -15,7 +15,8 @@
   "syslogIP": "192.168.99.2",
   "wifiSSID": "Test",
   "wifiRSSI": "-55 dBm, Channel 6",
-  "wifiBSSID": "AA:BB:CC:DD:EE:FF (locked)",
+  "wifiBSSID": "AA:BB:CC:DD:EE:FF",
+  "lockedAP": true,
   "GDOSecurityType" : 2,
   "garageLightOn": false,
   "garageDoorState": "Closed",