Merge pull request #2610 from makermelissa/main

Update and Lint FunHouse Motion Outlet code to work with settings.toml

Author: TheKitty

FunHouse_Motion_Outlet/.circuitpython.skip

@@ -3,6 +3,7 @@
 #
 # SPDX-License-Identifier: MIT
 
+import os
 import time
 import board
 import digitalio
@@ -14,21 +15,18 @@
 MOTION_TIMEOUT = 300  # Timeout in seconds
 USE_MQTT = False
 
-if USE_MQTT:
-    try:
-        from secrets import secrets
-    except ImportError:
-        print("WiFi secrets are kept in secrets.py, please add them there!")
-        raise
+# Use dict to avoid reassigning the variable
+timestamps = {
+    "last_pir": None
+}
 
 def set_outlet_state(value):
-    global last_pir_timestamp
     if value:
         funhouse.peripherals.dotstars.fill(0x00FF00)
-        last_pir_timestamp = time.monotonic()
+        timestamps["last_pir"] = time.monotonic()
     else:
         funhouse.peripherals.dotstars.fill(0xFF0000)
-        last_pir_timestamp = time.monotonic() - MOTION_TIMEOUT
+        timestamps["last_pir"] = time.monotonic() - MOTION_TIMEOUT
 
     outlet.value = value
     publish_outlet_state()
@@ -42,35 +40,34 @@ def publish_outlet_state():
         funhouse.network.mqtt_publish(OUTLET_STATE_TOPIC, output)
         funhouse.peripherals.led = False
 
-def connected(client, userdata, result, payload):
+def connected(client, _userdata, _result, _payload):
     status.fill = 0x00FF00
     status.outline = 0x008800
     print("Connected to MQTT! Subscribing...")
     client.subscribe(OUTLET_COMMAND_TOPIC)
 
-def disconnected(client):
+def disconnected(_client):
     status.fill = 0xFF0000
     status.outline = 0x880000
 
-def message(client, topic, payload):
+def message(_client, topic, payload):
     print("Topic {0} received new value: {1}".format(topic, payload))
     if topic == OUTLET_COMMAND_TOPIC:
         set_outlet_state(payload == "on")
 
 def timeleft():
-    seconds = int(last_pir_timestamp + MOTION_TIMEOUT - time.monotonic())
+    seconds = int(timestamps["last_pir"] + MOTION_TIMEOUT - time.monotonic())
     if outlet.value and seconds >= 0:
         minutes = seconds // 60
         seconds -= minutes * 60
         return "{:01}:{:02}".format(minutes, seconds)
-    return "Off"    
+    return "Off"
 
 # Set Initial States
 funhouse = FunHouse(default_bg=0x0F0F00)
 funhouse.peripherals.dotstars.fill(0)
 outlet = digitalio.DigitalInOut(board.A0)
 outlet.direction = digitalio.Direction.OUTPUT
-last_pir_timestamp = None
 funhouse.display.show(None)
 funhouse.add_text(
     text="Timeout Left:",
@@ -92,27 +89,27 @@ def timeleft():
 # Initialize a new MQTT Client object
 if USE_MQTT:
     funhouse.network.init_mqtt(
-        secrets["mqtt_broker"],
-        secrets["mqtt_port"],
-        secrets["mqtt_username"],
-        secrets["mqtt_password"],
+        os.getenv("MQTT_BROKER"),
+        os.getenv("MQTT_PORT"),
+        os.getenv("MQTT_USERNAME"),
+        os.getenv("MQTT_PASSWORD"),
     )
     funhouse.network.on_mqtt_connect = connected
     funhouse.network.on_mqtt_disconnect = disconnected
     funhouse.network.on_mqtt_message = message
 
-    print("Attempting to connect to {}".format(secrets["mqtt_broker"]))
+    print("Attempting to connect to {}".format(os.getenv("MQTT_BROKER")))
     funhouse.network.mqtt_connect()
 set_outlet_state(False)
 
 while True:
     if funhouse.peripherals.pir_sensor:
-        last_pir_timestamp = time.monotonic()
+        timestamps["last_pir"] = time.monotonic()
         if not outlet.value:
             set_outlet_state(True)
-    if outlet.value and time.monotonic() >= last_pir_timestamp + MOTION_TIMEOUT:
+    if outlet.value and time.monotonic() >= timestamps["last_pir"] + MOTION_TIMEOUT:
         set_outlet_state(False)
-    funhouse.set_text(timeleft(), countdown_label) 
+    funhouse.set_text(timeleft(), countdown_label)
     # Check any topics we are subscribed to
     if USE_MQTT:
         funhouse.network.mqtt_loop(0.5)