Merge branch 'add-netmaker' of https://github.com/nstoik/farm_device …

…into add-netmaker
nstoik · Apr 10, 2024 · 12a2c59 · 12a2c59
2 parents 31bdcae + 59214bd
commit 12a2c59
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 1 deletion.
diff --git a/device/Pipfile b/device/Pipfile
@@ -35,6 +35,7 @@ gpiozero = "~=2.0"
 netifaces = "~=0.11.0"
 click = "~=8.1.3"
 psutil = "~=5.9.4"
+psutil = "~=5.9.4"
 pika = "~=1.3"
 celery = "~=5.3"
 multiprocessing-logging = "~=0.3.3"

diff --git a/device/Pipfile.lock b/device/Pipfile.lock
diff --git a/device/fd_device/network/wifi.py b/device/fd_device/network/wifi.py
@@ -107,7 +107,7 @@ def scan_wifi(interface=None) -> List:
 
 
 def add_wifi_network(
-    wifi_name: str, wifi_password: str, interface: Optional[Interface] = None
+    wifi_name: str, wifi_password: str, interface: Interface | None = None
 ) -> Optional[Wifi]:
     """Add a wifi entry to the database of stored WiFi networks.