Refactor TemperatureMonitor: remove run and _log_temp methods to streamline monitoring logic
This commit is contained in:
parent
424d906760
commit
f8e2a6e749
@ -36,126 +36,4 @@ class TemperatureMonitor(Monitor):
|
||||
self.log_file = log_file
|
||||
self.send_alerts_to_separate_channel = send_alerts_to_separate_channel
|
||||
self.last_report_ms = 0
|
||||
self.last_alert_state = None # Track if we were in alert state
|
||||
|
||||
def run(self):
|
||||
"""Read sensors every check_interval, report/log every report_interval."""
|
||||
temps = self.sensor.read_all_temps(unit='F')
|
||||
if not temps:
|
||||
# print(f"No temperature readings available for {self.label}")
|
||||
return
|
||||
|
||||
now = time.ticks_ms()
|
||||
should_report = time.ticks_diff(now, self.last_report_ms) >= (self.report_interval * 1000)
|
||||
|
||||
for rom, temp in temps.items():
|
||||
sensor_id = rom.hex()[:8]
|
||||
|
||||
# Check if in alert state
|
||||
has_alert = False
|
||||
alert_type = None
|
||||
|
||||
if self.alert_high and temp > self.alert_high:
|
||||
has_alert = True
|
||||
alert_type = "HIGH"
|
||||
elif self.alert_low and temp < self.alert_low:
|
||||
has_alert = True
|
||||
alert_type = "LOW"
|
||||
|
||||
# Send alert immediately if entering alert state or if alert persists
|
||||
if has_alert:
|
||||
alert_msg = f"🚨 {self.label} Temperature: {temp:.1f}°F ⚠️ {alert_type} (threshold: {self.alert_high if alert_type == 'HIGH' else self.alert_low}°F)"
|
||||
|
||||
if self.send_alerts_to_separate_channel:
|
||||
send_discord_message(alert_msg, is_alert=True)
|
||||
else:
|
||||
send_discord_message(alert_msg, is_alert=False)
|
||||
|
||||
self.last_alert_state = True
|
||||
|
||||
# Send normal report at report_interval
|
||||
elif should_report:
|
||||
temp_msg = f"🌡️ {self.label} Temperature: {temp:.1f}°F"
|
||||
send_discord_message(temp_msg, is_alert=False)
|
||||
|
||||
# Reset alert state if we were in alert and now normal
|
||||
if self.last_alert_state:
|
||||
recovery_msg = f"✅ {self.label} Temperature back to normal: {temp:.1f}°F"
|
||||
send_discord_message(recovery_msg, is_alert=False)
|
||||
self.last_alert_state = False
|
||||
|
||||
# Log to file at report_interval
|
||||
if should_report and self.log_file:
|
||||
self._log_temp(sensor_id, temp)
|
||||
|
||||
# Update last report time
|
||||
if should_report:
|
||||
self.last_report_ms = now
|
||||
|
||||
def _log_temp(self, sensor_id, temp):
|
||||
"""Log temperature reading to file."""
|
||||
try:
|
||||
import time
|
||||
timestamp = time.localtime()
|
||||
log_entry = f"{timestamp[0]}-{timestamp[1]:02d}-{timestamp[2]:02d} {timestamp[3]:02d}:{timestamp[4]:02d}:{timestamp[5]:02d},{self.label},{sensor_id},{temp:.2f}\n"
|
||||
|
||||
with open(self.log_file, 'a') as f:
|
||||
f.write(log_entry)
|
||||
except Exception as e:
|
||||
print(f"Error logging temperature: {e}")
|
||||
|
||||
class WiFiMonitor(Monitor):
|
||||
"""Monitor WiFi connection and handle reconnection."""
|
||||
def __init__(self, wifi, led, interval=5, reconnect_cooldown=60):
|
||||
super().__init__(interval)
|
||||
self.wifi = wifi
|
||||
self.led = led
|
||||
self.reconnect_cooldown = reconnect_cooldown
|
||||
self.last_reconnect_attempt = 0
|
||||
self.was_connected = wifi.isconnected() if wifi else False
|
||||
|
||||
def run(self):
|
||||
"""Check WiFi status, blink LED, attempt reconnect if needed."""
|
||||
import network
|
||||
from scripts.networking import connect_wifi
|
||||
|
||||
is_connected = self.wifi.isconnected() if self.wifi else False
|
||||
|
||||
if not is_connected:
|
||||
# Fast blink when disconnected
|
||||
self.led.on()
|
||||
time.sleep(0.2)
|
||||
self.led.off()
|
||||
|
||||
# Try reconnect if cooldown passed
|
||||
now = time.ticks_ms()
|
||||
if time.ticks_diff(now, self.last_reconnect_attempt) >= (self.reconnect_cooldown * 1000):
|
||||
self.last_reconnect_attempt = now
|
||||
# print("Attempting WiFi reconnect...")
|
||||
self.wifi = connect_wifi(self.led)
|
||||
|
||||
if self.wifi and self.wifi.isconnected():
|
||||
send_discord_message("WiFi connection restored 🔄")
|
||||
self.was_connected = True
|
||||
else:
|
||||
# Slow blink when connected
|
||||
self.led.on()
|
||||
time.sleep(1)
|
||||
self.led.off()
|
||||
|
||||
# Notify if connection was just restored
|
||||
if not self.was_connected:
|
||||
send_discord_message("WiFi connection restored 🔄")
|
||||
self.was_connected = True
|
||||
|
||||
def run_monitors(monitors):
|
||||
"""
|
||||
Run all monitors in the list, checking if each should run based on interval.
|
||||
Call this in your main loop.
|
||||
"""
|
||||
for monitor in monitors:
|
||||
if monitor.should_run():
|
||||
try:
|
||||
monitor.run()
|
||||
except Exception as e:
|
||||
print(f"Error running monitor {monitor.__class__.__name__}: {e}")
|
||||
self.last_alert_state = None # T
|
||||
Loading…
x
Reference in New Issue
Block a user