Add blinking led callbacks

Author: GuLinux

upython/backend/board.py

@@ -25,6 +25,9 @@ def __init__(self):
             self.pinout_config = json.load(pinout_config_file)
         print(self.pinout_config)
         self.status_led = StatusLed(self.__load_output(self.pinout_config['status_led']))
+        self.wifi_manager.on_connecting = lambda: self.status_led.wifi_connecting()
+        self.wifi_manager.on_station_connected = lambda _: self.status_led.status_ok()
+        self.wifi_manager.on_ap_started = lambda _: self.status_led.wifi_failed()
 
 
     def __load_output(self, config: dict):

upython/backend/boards/esp32/wifi_manager.py

@@ -2,6 +2,8 @@
 import network
 import binascii
 import typing
+import protocols.wifi_manager
+
 if typing.TYPE_CHECKING:
     from config import Config
 
@@ -39,8 +41,9 @@ def __str__(self):
     def __repr__(self):
         return self.__str__()
 
-class ESPWiFiManager:
+class ESPWiFiManager(protocols.wifi_manager.WiFiManager):
     def __init__(self, config: Config):
+        super().__init__(config)
         self.config = config
         self.station_wlan = network.WLAN(network.STA_IF)
         self.ap_wlan = network.WLAN(network.AP_IF)
@@ -51,6 +54,7 @@ def scan(self) -> list[ScanResult]:
         return [ScanResult(*result) for result in raw_results]
 
     async def connect_stations(self, connect_ap_on_failure: bool = True):
+        self.on_connecting()
         self.set_hostname()
         self.ap_wlan.active(False)  # Disable AP mode while trying to connect to stations
         print('Connecting to WiFi stations...')
@@ -83,6 +87,7 @@ async def connect_stations(self, connect_ap_on_failure: bool = True):
             for _ in range(10):
                 if wlan.isconnected():
                     print(f'Connected to {wifi.ssid}')
+                    self.on_station_connected(wifi.ssid)
                     return
                 await asyncio.sleep(1)  # Non-blocking wait
             print(f'Failed to connect to {wifi.ssid}')
@@ -98,6 +103,7 @@ async def start_ap(self):
         self.ap_wlan.active(True)
         self.ap_wlan.config(ssid=ap.ssid, key=ap.psk, security=3)
         print(f'AP started with SSID: {ap.ssid}')
+        self.on_ap_started(ap.ssid)
 
     def set_hostname(self):
         network.hostname(self.config.ap.ssid)

upython/backend/boards/simulator/wifi_manager.py

@@ -1,11 +1,13 @@
 import asyncio
 from protocols.config import Config
+import protocols.wifi_manager
 from boards.cpython.json_config_storage import JsonConfigStorage
 import json
 
 
-class SimulatorWiFiManager:
+class SimulatorWiFiManager(protocols.wifi_manager.WiFiManager):
     def __init__(self, config: Config):
+        super().__init__(config)
         self.config = config
         with open(JsonConfigStorage.CONFIG_FILE_PATH, 'r') as config_file:
             self.stations = json.load(config_file)['stations']
@@ -20,6 +22,7 @@ def _sorted_available_stations(self) -> list[dict]:
 
 
     async def connect_stations(self, connect_ap_on_failure: bool = True):
+        self.on_connecting()
         print('Connecting to WiFi stations...')
         print(f'Configured stations: {self.config.stations}')
         available_stations = self._sorted_available_stations()
@@ -34,6 +37,7 @@ async def connect_stations(self, connect_ap_on_failure: bool = True):
             await asyncio.sleep(station.get('sim_delay', 1))  # Simulate connection attempt
             if station.get('sim_connection_allowed', True):
                 print(f'Connected to station: {station['ssid']}')
+                self.on_station_connected(station['ssid'])
                 return
             else:
                 print('Skipping station')
@@ -47,6 +51,7 @@ async def start_ap(self):
         print(f'Starting AP with SSID: {self.config.ap.ssid}')
         await asyncio.sleep(1)  # Simulate AP startup
         print('AP started')
+        self.on_ap_started(self.config.ap.ssid)
 
     def set_hostname(self):
         print(f'Setting hostname to {self.config.ap.ssid}')

upython/backend/main.py

@@ -53,8 +53,6 @@ async def get_config(request):
 async def main():
     await board.start()
     await board.wifi_manager.connect_stations()
-
-    board.status_led.wifi_connecting()
-    await app.start_server(port=int(os.environ.get('PORT', '80')))
+    await app.start_server(port=int(os.environ.get('PORT', '80')), debug=os.environ.get('DEBUG', 0) in ['1', 'true'])
 
 asyncio.run(main())

upython/backend/protocols/wifi_manager.py

@@ -1,13 +1,17 @@
 from protocols.config import Config
 from typing import Protocol
+from typing import Callable
 
 
 class WiFiManager(Protocol):
-    def __init__(self, config: Config):
-        pass
+    _on_ap_started: Callable[[str], None]
+    _on_station_connected: Callable[[str], None]
+    _on_connecting: Callable[[], None]
 
-    def scan(self) -> list[str]:
-        raise NotImplementedError()
+    def __init__(self, config: Config):
+        self._on_ap_started = lambda ssid: None
+        self._on_station_connected = lambda ssid: None
+        self._on_connecting = lambda: None
 
     async def connect_stations(self, connect_ap_on_failure: bool = True):
         raise NotImplementedError()
@@ -18,4 +22,27 @@ async def start_ap(self):
     def set_hostname(self):
         raise NotImplementedError()
 
-
+    @property
+    def on_station_connected(self) -> Callable[[str], None]:
+        return self._on_station_connected
+
+    @on_station_connected.setter
+    def on_station_connected(self, callback: Callable[[str], None]) -> None:
+        self._on_station_connected = callback
+
+    @property
+    def on_ap_started(self) -> Callable[[str], None]:
+        return self._on_ap_started    
+    
+    @on_ap_started.setter
+    def on_ap_started(self, callback: Callable[[str], None]) -> None:
+        self._on_ap_started = callback
+
+    @property
+    def on_connecting(self) -> Callable[[], None]:
+        return self._on_connecting
+    
+    @on_connecting.setter
+    def on_connecting(self, callback: Callable[[], None]) -> None:
+        self._on_connecting = callback
+    

upython/backend/simulator

@@ -0,0 +1,2 @@
+#!/usr/bin/env bash
+SIMULATOR=1 PORT=8080 DEBUG=1 python3 main.py

upython/backend/status_led.py

@@ -23,10 +23,10 @@ def _set_led(self, state):
 
 
     def wifi_connecting(self):
-        self.pattern = [(True, 0.5), (False, 0.5)]
+        self.pattern = [(True, 0.2), (False, 0.2)]
 
     def status_ok(self):
-        pass
+        self.pattern = [(True, 2), (False, 0.4)]
 
     def wifi_failed(self):
-        pass
+        self.pattern = [(True, 0.4), (False, 0.4)] * 3 + [(False, 2)]