Skip to content

Commit

Permalink
Merge branch 'add-netmaker' of https://github.com/nstoik/farm_device
Browse files Browse the repository at this point in the history
…into add-netmaker
  • Loading branch information
nstoik committed Apr 10, 2024
2 parents 31bdcae + 59214bd commit 12a2c59
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 1 deletion.
1 change: 1 addition & 0 deletions device/Pipfile
Expand Up @@ -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"
Expand Down
19 changes: 19 additions & 0 deletions device/Pipfile.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion device/fd_device/network/wifi.py
Expand Up @@ -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.
Expand Down

0 comments on commit 12a2c59

Please sign in to comment.