Addds possibility to ignor BSSID

OSi (Ondrej Sienczak) · OSi (Ondrej Sienczak) · commit 938fa209d49e · 2023-08-25T16:14:59.000+02:00
On some meshing WiFi networks there can be various BSSID per one SSID. In this case we shall ignore BSSID selection as this may vary.
diff --git a/esp32/micropython.bin b/esp32/micropython.bin
diff --git a/simulator/lang/lang_cz.py b/simulator/lang/lang_cz.py
@@ -32,6 +32,7 @@
     "Go to travel mode": "Zcela vypnout (opět zapnout tlačítkem reset)",
     "Hotspot SSID": "Nastavit název hotspotu",
     "Hotspot setup": "Nastavení hotspotu",
+    "Ignore BSSID": "Ignorovat BSSID",
     "Indoor high": "Vnitřní nejvyšsí",
     "Language": "Jazyk (Language)",
     "Latitude": "Zem. šířka",
@@ -53,6 +54,7 @@
     "Summer time": "Letní čas",
     "Two days": "Dvoudenní",
     "Units": "Jednotky",
+    "Use with BSSID": "použít včetně BSSID",
     "Use": "Použít",
     "Variant": "Varianta",
     "WiFi setup": "Nastavení WiFi",
diff --git a/simulator/machine.py b/simulator/machine.py
@@ -14,7 +14,7 @@ def init(self, baudrate, polarity, phase, sck, mosi, miso):
 _pins = [1] * 256
 
 
-_pins[32] = 1  # 1 - Meteostation, 0 - Config server
+_pins[32] = 0  # 1 - Meteostation, 0 - Config server
 
 
 class WDT:
diff --git a/simulator/web/__init__.py b/simulator/web/__init__.py
@@ -134,21 +134,24 @@ def input(self, txt, var, dfl="", tp="text", space=4):
         self.row(
             (
                 f"<label>{txt}</label>",
-                '<input type="{3}" id="{0}" name="{0}" value="{2}">'.format(
-                    var, txt, dfl, tp
-                ),
+                f'<input type="{tp}" id="{var}" name="{var}" value="{dfl}">',
             ),
             space,
         )
 
     def variable(self, var, val):
+        self.row(
+            (f'<input type="hidden" id="{var}" name="{var}" value="{val}" />',),
+            0,
+        )
+
+    def checkbox(self, txt, var, checked=False, space=4):
         self.row(
             (
-                '<input type="hidden" id="{0}" name="{0}" value="{1}" />'.format(
-                    var, val
-                ),
+                f"<label>{txt}</label>",
+                f'<input type="checkbox" id="{var}" name="{var}"{" checked" if checked else ""}>',
             ),
-            0,
+            space,
         )
 
     def spacer(self):
diff --git a/simulator/web/page/alertbugd.py b/simulator/web/page/alertbugd.py
@@ -8,6 +8,8 @@
 
 @web.action_handler(__name__)
 def www(page, args):
+    logger.debug(f'args: {", ".join([k+"="+v for k, v in args.items()])}')
+
     beep["error_beep"] = 0
     beep.flush()
     web.index(page)
diff --git a/simulator/web/page/alertbuge.py b/simulator/web/page/alertbuge.py
@@ -8,6 +8,8 @@
 
 @web.action_handler(__name__)
 def www(page, args):
+    logger.debug(f'args: {", ".join([k+"="+v for k, v in args.items()])}')
+
     beep["error_beep"] = 1
     beep.flush()
     web.index(page)
diff --git a/simulator/web/page/alerttempd.py b/simulator/web/page/alerttempd.py
@@ -8,6 +8,8 @@
 
 @web.action_handler(__name__)
 def www(page, args):
+    logger.debug(f'args: {", ".join([k+"="+v for k, v in args.items()])}')
+
     beep["temp_balanced"] = 0
     beep.flush()
     web.index(page)
diff --git a/simulator/web/page/alerttempe.py b/simulator/web/page/alerttempe.py
@@ -8,6 +8,8 @@
 
 @web.action_handler(__name__)
 def www(page, args):
+    logger.debug(f'args: {", ".join([k+"="+v for k, v in args.items()])}')
+
     beep["temp_balanced"] = 1
     beep.flush()
     web.index(page)
diff --git a/simulator/web/page/apiedt.py b/simulator/web/page/apiedt.py
@@ -9,6 +9,8 @@
 
 @web.action_handler(__name__)
 def www(page, args):
+    logger.debug(f'args: {", ".join([k+"="+v for k, v in args.items()])}')
+
     page.heading(2, trn("Edit API key"))
 
     with page.form("apiset") as form:
diff --git a/simulator/web/page/apiset.py b/simulator/web/page/apiset.py
@@ -8,6 +8,8 @@
 
 @web.action_handler(__name__)
 def www(page, args):
+    logger.debug(f'args: {", ".join([k+"="+v for k, v in args.items()])}')
+
     api["apikey"] = args["key"]
     api.flush()
     web.index(page)
diff --git a/simulator/web/page/battedt.py b/simulator/web/page/battedt.py
@@ -9,6 +9,8 @@
 
 @web.action_handler(__name__)
 def www(page, args):
+    logger.debug(f'args: {", ".join([k+"="+v for k, v in args.items()])}')
+
     page.heading(2, trn("Critical voltage"))
 
     with page.form("battset") as form:
diff --git a/simulator/web/page/battset.py b/simulator/web/page/battset.py
@@ -8,5 +8,7 @@
 
 @web.action_handler(__name__)
 def www(page, args):
+    logger.debug(f'args: {", ".join([k+"="+v for k, v in args.items()])}')
+
     vbat["low_voltage"] = max(2.8, min(4.0, float(args["v"])))
     web.index(page)
diff --git a/simulator/web/page/index.py b/simulator/web/page/index.py
@@ -9,6 +9,16 @@
 
 
 def index(page):
+    _pg_loc(page)
+    _pg_wifi(page)
+    _pg_set(page)
+
+    page.heading(2, trn("Misc"))
+    page.button(trn("Go to travel mode"), "zzz")
+    page.button(trn("Go to normal mode"), "reset")
+
+
+def _pg_loc(page):
     page.heading(2, trn("Locations setup"))
 
     with page.table(
@@ -33,6 +43,8 @@ def index(page):
     page.button(trn("Add new location"), "locnew")
     page.br()
 
+
+def _pg_wifi(page):
     page.heading(2, trn("WiFi setup"))
     with page.table(
         ("SSID", "BSSID", trn("Location"), "", ""),
@@ -64,6 +76,8 @@ def index(page):
     page.button(trn("Add new WiFi"), "wifinew")
     page.br()
 
+
+def _pg_set(page):
     page.heading(2, trn("Confort temperatures"))
     with page.table(None, 'frame="hsides"') as table:
         table.row(
@@ -151,10 +165,6 @@ def index(page):
             web.SPACES,
         )
 
-    page.heading(2, trn("Misc"))
-    page.button(trn("Go to travel mode"), "zzz")
-    page.button(trn("Go to normal mode"), "reset")
-
 
 @web.webpage_handler(__name__, "GET")
 def www(page, args):
@@ -163,6 +173,8 @@ def www(page, args):
 
 @web.webpage_handler(__name__, "POST")
 def www(page, args):
+    logger.debug(f'args: {", ".join([k+"="+v for k, v in args.items()])}')
+
     action = args.get("action", None)
 
     if action:
diff --git a/simulator/web/page/langedt.py b/simulator/web/page/langedt.py
@@ -10,6 +10,8 @@
 
 @web.action_handler(__name__)
 def www(page, args):
+    logger.debug(f'args: {", ".join([k+"="+v for k, v in args.items()])}')
+
     page.heading(2, trn("Choose Language"))
 
     with page.table(
diff --git a/simulator/web/page/languse.py b/simulator/web/page/languse.py
@@ -8,5 +8,7 @@
 
 @web.action_handler(__name__)
 def www(page, args):
+    logger.debug(f'args: {", ".join([k+"="+v for k, v in args.items()])}')
+
     api["language"] = args["l"]
     web.index(page)
diff --git a/simulator/web/page/locdlt.py b/simulator/web/page/locdlt.py
@@ -9,6 +9,8 @@
 
 @web.action_handler(__name__)
 def www(page, args):
+    logger.debug(f'args: {", ".join([k+"="+v for k, v in args.items()])}')
+
     page.heading(2, trn("DELETE LOCATION") + " ?!")
     loc = location["locations"][int(args["idx"])]
 
diff --git a/simulator/web/page/locedt.py b/simulator/web/page/locedt.py
@@ -9,6 +9,8 @@
 
 @web.action_handler(__name__)
 def www(page, args):
+    logger.debug(f'args: {", ".join([k+"="+v for k, v in args.items()])}')
+
     loc = location["locations"][int(args["idx"])]
     page.heading(2, trn("Edit location"))
     with page.form("locset") as form:
diff --git a/simulator/web/page/locmake.py b/simulator/web/page/locmake.py
@@ -8,6 +8,8 @@
 
 @web.action_handler(__name__)
 def www(page, args):
+    logger.debug(f'args: {", ".join([k+"="+v for k, v in args.items()])}')
+
     gps = [
         float(ll[:-1] if ll[-1] in ("N", "E") else ll) for ll in args["gps"].split(",")
     ]
diff --git a/simulator/web/page/locnew.py b/simulator/web/page/locnew.py
@@ -8,6 +8,8 @@
 
 @web.action_handler(__name__)
 def www(page, args):
+    logger.debug(f'args: {", ".join([k+"="+v for k, v in args.items()])}')
+
     page.heading(2, trn("Add new location"))
 
     with page.form("locmake") as form:
diff --git a/simulator/web/page/locrm.py b/simulator/web/page/locrm.py
@@ -8,6 +8,8 @@
 
 @web.action_handler(__name__)
 def www(page, args):
+    logger.debug(f'args: {", ".join([k+"="+v for k, v in args.items()])}')
+
     name = args["name"]
     locations = location["locations"]
     connections = connection["connections"]
diff --git a/simulator/web/page/locset.py b/simulator/web/page/locset.py
@@ -8,6 +8,8 @@
 
 @web.action_handler(__name__)
 def www(page, args):
+    logger.debug(f'args: {", ".join([k+"="+v for k, v in args.items()])}')
+
     i = int(args["idx"])
     gps = [
         float(ll[:-1] if ll[-1] in ("N", "E") else ll) for ll in args["gps"].split(",")
diff --git a/simulator/web/page/passedt.py b/simulator/web/page/passedt.py
@@ -9,6 +9,8 @@
 
 @web.action_handler(__name__)
 def www(page, args):
+    logger.debug(f'args: {", ".join([k+"="+v for k, v in args.items()])}')
+
     page.heading(2, trn("Set hotspot password"))
 
     with page.form("passset") as form:
diff --git a/simulator/web/page/passset.py b/simulator/web/page/passset.py
@@ -8,6 +8,8 @@
 
 @web.action_handler(__name__)
 def www(page, args):
+    logger.debug(f'args: {", ".join([k+"="+v for k, v in args.items()])}')
+
     p = args["p"]
     spot["passwd"] = p
     spot.flush()
diff --git a/simulator/web/page/refredt.py b/simulator/web/page/refredt.py
@@ -9,6 +9,8 @@
 
 @web.action_handler(__name__)
 def www(page, args):
+    logger.debug(f'args: {", ".join([k+"="+v for k, v in args.items()])}')
+
     page.heading(2, trn("Display refresh time"))
 
     with page.form("refrset") as form:
diff --git a/simulator/web/page/refrset.py b/simulator/web/page/refrset.py
@@ -8,6 +8,8 @@
 
 @web.action_handler(__name__)
 def www(page, args):
+    logger.debug(f'args: {", ".join([k+"="+v for k, v in args.items()])}')
+
     l = int(args["t"]), (int(args["b"]), int(args["e"]))
     behavior["refresh"], behavior["dbl"] = l
     behavior.flush()
diff --git a/simulator/web/page/reset.py b/simulator/web/page/reset.py
@@ -9,5 +9,7 @@
 
 @web.action_handler(__name__)
 def www(page, args):
+    logger.debug(f'args: {", ".join([k+"="+v for k, v in args.items()])}')
+
     play((2093, 30), 120, (1568, 30), 120, (1319, 30), 120, (1047, 30))
     reset()
diff --git a/simulator/web/page/ssidedt.py b/simulator/web/page/ssidedt.py
@@ -9,6 +9,8 @@
 
 @web.action_handler(__name__)
 def www(page, args):
+    logger.debug(f'args: {", ".join([k+"="+v for k, v in args.items()])}')
+
     page.heading(2, trn("Hotspot SSID"))
 
     with page.form("ssidset") as form:
diff --git a/simulator/web/page/ssidset.py b/simulator/web/page/ssidset.py
@@ -8,6 +8,8 @@
 
 @web.action_handler(__name__)
 def www(page, args):
+    logger.debug(f'args: {", ".join([k+"="+v for k, v in args.items()])}')
+
     spot["ssid"] = args["id"]
     spot.flush()
     web.index(page)
diff --git a/simulator/web/page/summertd.py b/simulator/web/page/summertd.py
@@ -8,6 +8,8 @@
 
 @web.action_handler(__name__)
 def www(page, args):
+    logger.debug(f'args: {", ".join([k+"="+v for k, v in args.items()])}')
+
     time["winter"] = True
     time.flush()
     web.index(page)
diff --git a/simulator/web/page/summerte.py b/simulator/web/page/summerte.py
@@ -8,6 +8,8 @@
 
 @web.action_handler(__name__)
 def www(page, args):
+    logger.debug(f'args: {", ".join([k+"="+v for k, v in args.items()])}')
+
     time["winter"] = False
     time.flush()
     web.index(page)
diff --git a/simulator/web/page/tempedt.py b/simulator/web/page/tempedt.py
@@ -9,6 +9,8 @@
 
 @web.action_handler(__name__)
 def www(page, args):
+    logger.debug(f'args: {", ".join([k+"="+v for k, v in args.items()])}')
+
     page.heading(2, trn("Edit temperatures"))
 
     with page.form("tempset") as form:
diff --git a/simulator/web/page/tempset.py b/simulator/web/page/tempset.py
@@ -8,6 +8,8 @@
 
 @web.action_handler(__name__)
 def www(page, args):
+    logger.debug(f'args: {", ".join([k+"="+v for k, v in args.items()])}')
+
     l = float(args["ihi"]), float(args["ohi"]), float(args["olo"])
     temp["indoor_high"], temp["outdoor_high"], temp["outdoor_low"] = l
     temp.flush()
diff --git a/simulator/web/page/variantedt.py b/simulator/web/page/variantedt.py
@@ -10,6 +10,8 @@
 
 @web.action_handler(__name__)
 def www(page, args):
+    logger.debug(f'args: {", ".join([k+"="+v for k, v in args.items()])}')
+
     page.heading(2, trn("Choose forecast variant"))
 
     with page.table(
diff --git a/simulator/web/page/variantuse.py b/simulator/web/page/variantuse.py
@@ -8,5 +8,7 @@
 
 @web.action_handler(__name__)
 def www(page, args):
+    logger.debug(f'args: {", ".join([k+"="+v for k, v in args.items()])}')
+
     api["variant"] = int(args["v"])
     web.index(page)
diff --git a/simulator/web/page/wifidlt.py b/simulator/web/page/wifidlt.py
@@ -9,6 +9,8 @@
 
 @web.action_handler(__name__)
 def www(page, args):
+    logger.debug(f'args: {", ".join([k+"="+v for k, v in args.items()])}')
+
     page.heading(2, trn("DELETE CONNECTION") + " ?!")
     config = connection["connections"][int(args["idx"])]
 
diff --git a/simulator/web/page/wifiedt.py b/simulator/web/page/wifiedt.py
@@ -9,12 +9,16 @@
 
 @web.action_handler(__name__)
 def www(page, args):
+    logger.debug(f'args: {", ".join([k+"="+v for k, v in args.items()])}')
+
     page.heading(2, trn("Edit connection"))
     config = connection["connections"][int(args["idx"])]
 
     with page.form("wifiset") as form:
-        form.label("SSID", "ssid", config["ssid"])
+        form.variable("idx", args["idx"])
+        form.input("SSID", "ssid", config["ssid"])
         form.label("BSSID", "bssid", config["bssid"])
+        form.checkbox(trn("Ignore BSSID"), "ib", config.get("ignore_bssid", True))
         form.input(trn("Password"), "psw", config["passwd"], "password")
         form.spacer()
 
diff --git a/simulator/web/page/wifimake.py b/simulator/web/page/wifimake.py
diff --git a/simulator/web/page/wifinew.py b/simulator/web/page/wifinew.py
diff --git a/simulator/web/page/wifirm.py b/simulator/web/page/wifirm.py
diff --git a/simulator/web/page/wifiset.py b/simulator/web/page/wifiset.py
diff --git a/simulator/web/page/wifiuse.py b/simulator/web/page/wifiuse.py
diff --git a/simulator/web/page/zzz.py b/simulator/web/page/zzz.py
