Enhance configuration loading and WiFi setup with detailed comments; implement NTP time synchronization for accurate scheduling
This commit is contained in:
parent
20910d5fda
commit
5d162f3971
182
main.py
182
main.py
@ -25,9 +25,10 @@ from scripts.temperature_sensor import TemperatureSensor
|
|||||||
from scripts.air_conditioning import ACController
|
from scripts.air_conditioning import ACController
|
||||||
from scripts.heating import HeaterController
|
from scripts.heating import HeaterController
|
||||||
from scripts.web_server import TempWebServer
|
from scripts.web_server import TempWebServer
|
||||||
from scripts.scheduler import ScheduleMonitor
|
from scripts.scheduler import ScheduleMonitor # NEW: Import scheduler for time-based temp changes
|
||||||
|
|
||||||
# Load saved settings from file
|
# ===== START: Configuration Loading =====
|
||||||
|
# Load saved settings from config.json file on Pico
|
||||||
def load_config():
|
def load_config():
|
||||||
"""Load configuration from config.json file."""
|
"""Load configuration from config.json file."""
|
||||||
try:
|
try:
|
||||||
@ -36,34 +37,38 @@ def load_config():
|
|||||||
print("Loaded saved settings from config.json")
|
print("Loaded saved settings from config.json")
|
||||||
return config
|
return config
|
||||||
except:
|
except:
|
||||||
|
# If file doesn't exist or is corrupted, use defaults
|
||||||
print("No saved config found, using defaults")
|
print("No saved config found, using defaults")
|
||||||
return {
|
return {
|
||||||
'ac_target': 77.0,
|
'ac_target': 77.0, # Default AC target temp
|
||||||
'ac_swing': 1.0,
|
'ac_swing': 1.0, # Default AC tolerance (+/- degrees)
|
||||||
'heater_target': 80.0,
|
'heater_target': 80.0, # Default heater target temp
|
||||||
'heater_swing': 2.0,
|
'heater_swing': 2.0, # Default heater tolerance (+/- degrees)
|
||||||
'schedules': [],
|
'schedules': [], # No schedules by default
|
||||||
'schedule_enabled': False
|
'schedule_enabled': False # Schedules disabled by default
|
||||||
}
|
}
|
||||||
|
|
||||||
# Load configuration
|
# Load configuration from file
|
||||||
config = load_config()
|
config = load_config()
|
||||||
|
# ===== END: Configuration Loading =====
|
||||||
|
|
||||||
# Connect to WiFi
|
# ===== START: WiFi Connection =====
|
||||||
|
# Connect to WiFi using credentials from secrets.py
|
||||||
wifi = connect_wifi(led)
|
wifi = connect_wifi(led)
|
||||||
|
|
||||||
# Set static IP and print WiFi details
|
# Set static IP and print WiFi details
|
||||||
if wifi and wifi.isconnected():
|
if wifi and wifi.isconnected():
|
||||||
# Configure static IP
|
# Configure static IP (easier to bookmark web interface)
|
||||||
static_ip = '192.168.86.43'
|
static_ip = '192.168.86.43' # Change this to match your network
|
||||||
subnet = '255.255.255.0'
|
subnet = '255.255.255.0'
|
||||||
gateway = '192.168.86.1'
|
gateway = '192.168.86.1' # Usually your router IP
|
||||||
dns = '192.168.86.1'
|
dns = '192.168.86.1' # Usually your router IP
|
||||||
|
|
||||||
|
# Apply static IP configuration
|
||||||
wifi.ifconfig((static_ip, subnet, gateway, dns))
|
wifi.ifconfig((static_ip, subnet, gateway, dns))
|
||||||
time.sleep(1)
|
time.sleep(1)
|
||||||
|
|
||||||
# Print WiFi details
|
# Print WiFi details for debugging
|
||||||
ifconfig = wifi.ifconfig()
|
ifconfig = wifi.ifconfig()
|
||||||
print("\n" + "="*50)
|
print("\n" + "="*50)
|
||||||
print("WiFi Connected Successfully!")
|
print("WiFi Connected Successfully!")
|
||||||
@ -75,38 +80,47 @@ if wifi and wifi.isconnected():
|
|||||||
print(f"Web Interface: http://{ifconfig[0]}")
|
print(f"Web Interface: http://{ifconfig[0]}")
|
||||||
print("="*50 + "\n")
|
print("="*50 + "\n")
|
||||||
|
|
||||||
# Send startup message with IP
|
# Send startup notification to Discord
|
||||||
send_discord_message(f"Pico W online at http://{ifconfig[0]} ✅")
|
send_discord_message(f"Pico W online at http://{ifconfig[0]} ✅")
|
||||||
|
|
||||||
# Sync time with NTP
|
# ===== START: NTP Time Sync =====
|
||||||
|
# Sync time with internet time server (required for schedules to work correctly)
|
||||||
|
# Without this, the Pico's clock starts at 2021 on every reboot
|
||||||
try:
|
try:
|
||||||
import ntptime
|
import ntptime
|
||||||
ntptime.settime()
|
ntptime.settime() # Downloads current time from pool.ntp.org
|
||||||
print("Time synced with NTP server")
|
print("Time synced with NTP server")
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
print("Failed to sync time: {}".format(e))
|
print("Failed to sync time: {}".format(e))
|
||||||
|
# ===== END: NTP Time Sync =====
|
||||||
|
|
||||||
else:
|
else:
|
||||||
|
# WiFi connection failed
|
||||||
print("\n" + "="*50)
|
print("\n" + "="*50)
|
||||||
print("WiFi Connection Failed!")
|
print("WiFi Connection Failed!")
|
||||||
print("="*50 + "\n")
|
print("="*50 + "\n")
|
||||||
|
# ===== END: WiFi Connection =====
|
||||||
|
|
||||||
# Start web server
|
# ===== START: Web Server Setup =====
|
||||||
|
# Start web server for monitoring and control (accessible at http://192.168.86.43)
|
||||||
web_server = TempWebServer(port=80)
|
web_server = TempWebServer(port=80)
|
||||||
web_server.start()
|
web_server.start()
|
||||||
|
# ===== END: Web Server Setup =====
|
||||||
|
|
||||||
# Sensor configuration registry
|
# ===== START: Sensor Configuration =====
|
||||||
|
# Define all temperature sensors and their alert thresholds
|
||||||
SENSOR_CONFIG = {
|
SENSOR_CONFIG = {
|
||||||
'inside': {
|
'inside': {
|
||||||
'pin': 10,
|
'pin': 10, # GPIO pin for DS18B20 sensor
|
||||||
'label': 'Inside',
|
'label': 'Inside', # Display name
|
||||||
'alert_high': 80.0,
|
'alert_high': 80.0, # Send alert if temp > 80°F
|
||||||
'alert_low': 70.0
|
'alert_low': 70.0 # Send alert if temp < 70°F
|
||||||
},
|
},
|
||||||
'outside': {
|
'outside': {
|
||||||
'pin': 11,
|
'pin': 11, # GPIO pin for DS18B20 sensor
|
||||||
'label': 'Outside',
|
'label': 'Outside', # Display name
|
||||||
'alert_high': 85.0,
|
'alert_high': 85.0, # Send alert if temp > 85°F
|
||||||
'alert_low': 68.0
|
'alert_low': 68.0 # Send alert if temp < 68°F
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -118,50 +132,58 @@ def get_configured_sensors():
|
|||||||
sensors[key] = TemperatureSensor(pin=config['pin'], label=config['label'])
|
sensors[key] = TemperatureSensor(pin=config['pin'], label=config['label'])
|
||||||
return sensors
|
return sensors
|
||||||
|
|
||||||
# Get configured sensors
|
# Create sensor instances
|
||||||
sensors = get_configured_sensors()
|
sensors = get_configured_sensors()
|
||||||
|
# ===== END: Sensor Configuration =====
|
||||||
|
|
||||||
# AC Controller options
|
# ===== START: AC Controller Setup =====
|
||||||
|
# Set up air conditioning relay controller
|
||||||
ac_controller = ACController(
|
ac_controller = ACController(
|
||||||
relay_pin=15,
|
relay_pin=15, # GPIO pin connected to AC relay
|
||||||
min_run_time=30,
|
min_run_time=30, # Minimum seconds AC must run before turning off
|
||||||
min_off_time=5
|
min_off_time=5 # Minimum seconds AC must be off before turning on again
|
||||||
)
|
)
|
||||||
|
|
||||||
# Use loaded config values for AC monitor
|
# Create AC monitor (automatically controls AC based on temperature)
|
||||||
ac_monitor = ACMonitor(
|
ac_monitor = ACMonitor(
|
||||||
ac_controller=ac_controller,
|
ac_controller=ac_controller,
|
||||||
temp_sensor=sensors['inside'],
|
temp_sensor=sensors['inside'], # Use inside sensor for AC control
|
||||||
target_temp=config['ac_target'],
|
target_temp=config['ac_target'], # Target temp from config.json
|
||||||
temp_swing=config['ac_swing'],
|
temp_swing=config['ac_swing'], # Tolerance (+/- degrees)
|
||||||
interval=30
|
interval=30 # Check temperature every 30 seconds
|
||||||
)
|
)
|
||||||
|
# ===== END: AC Controller Setup =====
|
||||||
|
|
||||||
# Heater Controller options
|
# ===== START: Heater Controller Setup =====
|
||||||
|
# Set up heating relay controller
|
||||||
heater_controller = HeaterController(
|
heater_controller = HeaterController(
|
||||||
relay_pin=16,
|
relay_pin=16, # GPIO pin connected to heater relay
|
||||||
min_run_time=30,
|
min_run_time=30, # Minimum seconds heater must run before turning off
|
||||||
min_off_time=5
|
min_off_time=5 # Minimum seconds heater must be off before turning on again
|
||||||
)
|
)
|
||||||
|
|
||||||
# Use loaded config values for heater monitor
|
# Create heater monitor (automatically controls heater based on temperature)
|
||||||
heater_monitor = HeaterMonitor(
|
heater_monitor = HeaterMonitor(
|
||||||
heater_controller=heater_controller,
|
heater_controller=heater_controller,
|
||||||
temp_sensor=sensors['inside'],
|
temp_sensor=sensors['inside'], # Use inside sensor for heater control
|
||||||
target_temp=config['heater_target'],
|
target_temp=config['heater_target'], # Target temp from config.json
|
||||||
temp_swing=config['heater_swing'],
|
temp_swing=config['heater_swing'], # Tolerance (+/- degrees)
|
||||||
interval=30
|
interval=30 # Check temperature every 30 seconds
|
||||||
)
|
)
|
||||||
|
# ===== END: Heater Controller Setup =====
|
||||||
|
|
||||||
# Create schedule monitor
|
# ===== START: Schedule Monitor Setup =====
|
||||||
|
# Create schedule monitor (automatically changes temp targets based on time of day)
|
||||||
schedule_monitor = ScheduleMonitor(
|
schedule_monitor = ScheduleMonitor(
|
||||||
ac_monitor=ac_monitor,
|
ac_monitor=ac_monitor, # Pass AC monitor to control
|
||||||
heater_monitor=heater_monitor,
|
heater_monitor=heater_monitor, # Pass heater monitor to control
|
||||||
config=config,
|
config=config, # Pass config with schedules
|
||||||
interval=60 # Check schedule every 60 seconds
|
interval=60 # Check schedule every 60 seconds
|
||||||
)
|
)
|
||||||
|
# ===== END: Schedule Monitor Setup =====
|
||||||
|
|
||||||
# Print loaded settings
|
# ===== START: Print Current Settings =====
|
||||||
|
# Display loaded configuration for debugging
|
||||||
print("\n" + "="*50)
|
print("\n" + "="*50)
|
||||||
print("Current Climate Control Settings:")
|
print("Current Climate Control Settings:")
|
||||||
print("="*50)
|
print("="*50)
|
||||||
@ -171,40 +193,62 @@ print(f"Schedule: {'Enabled' if config.get('schedule_enabled') else 'Disab
|
|||||||
if config.get('schedules'):
|
if config.get('schedules'):
|
||||||
print(f"Schedules: {len(config.get('schedules', []))} configured")
|
print(f"Schedules: {len(config.get('schedules', []))} configured")
|
||||||
print("="*50 + "\n")
|
print("="*50 + "\n")
|
||||||
|
# ===== END: Print Current Settings =====
|
||||||
|
|
||||||
# Set up monitors
|
# ===== START: Monitor Setup =====
|
||||||
|
# Set up all monitoring systems (run in order during main loop)
|
||||||
monitors = [
|
monitors = [
|
||||||
|
# WiFi monitor: Checks connection, reconnects if needed, blinks LED
|
||||||
WiFiMonitor(wifi, led, interval=5, reconnect_cooldown=60),
|
WiFiMonitor(wifi, led, interval=5, reconnect_cooldown=60),
|
||||||
schedule_monitor, # Add schedule monitor
|
|
||||||
|
# Schedule monitor: Changes temp targets based on time of day
|
||||||
|
schedule_monitor,
|
||||||
|
|
||||||
|
# AC monitor: Automatically turns AC on/off based on temperature
|
||||||
ac_monitor,
|
ac_monitor,
|
||||||
|
|
||||||
|
# Heater monitor: Automatically turns heater on/off based on temperature
|
||||||
heater_monitor,
|
heater_monitor,
|
||||||
|
|
||||||
|
# Inside temperature monitor: Logs temps, sends alerts if out of range
|
||||||
TemperatureMonitor(
|
TemperatureMonitor(
|
||||||
sensor=sensors['inside'],
|
sensor=sensors['inside'],
|
||||||
label=SENSOR_CONFIG['inside']['label'],
|
label=SENSOR_CONFIG['inside']['label'],
|
||||||
check_interval=10,
|
check_interval=10, # Check temp every 10 seconds
|
||||||
report_interval=30,
|
report_interval=30, # Log to CSV every 30 seconds
|
||||||
alert_high=SENSOR_CONFIG['inside']['alert_high'],
|
alert_high=SENSOR_CONFIG['inside']['alert_high'], # High temp alert threshold
|
||||||
alert_low=SENSOR_CONFIG['inside']['alert_low'],
|
alert_low=SENSOR_CONFIG['inside']['alert_low'], # Low temp alert threshold
|
||||||
log_file="/temp_logs.csv",
|
log_file="/temp_logs.csv", # CSV file path
|
||||||
send_alerts_to_separate_channel=True
|
send_alerts_to_separate_channel=True # Use separate Discord channel
|
||||||
),
|
),
|
||||||
|
|
||||||
|
# Outside temperature monitor: Logs temps, sends alerts if out of range
|
||||||
TemperatureMonitor(
|
TemperatureMonitor(
|
||||||
sensor=sensors['outside'],
|
sensor=sensors['outside'],
|
||||||
label=SENSOR_CONFIG['outside']['label'],
|
label=SENSOR_CONFIG['outside']['label'],
|
||||||
check_interval=10,
|
check_interval=10, # Check temp every 10 seconds
|
||||||
report_interval=30,
|
report_interval=30, # Log to CSV every 30 seconds
|
||||||
alert_high=SENSOR_CONFIG['outside']['alert_high'],
|
alert_high=SENSOR_CONFIG['outside']['alert_high'], # High temp alert threshold
|
||||||
alert_low=SENSOR_CONFIG['outside']['alert_low'],
|
alert_low=SENSOR_CONFIG['outside']['alert_low'], # Low temp alert threshold
|
||||||
log_file="/temp_logs.csv",
|
log_file="/temp_logs.csv", # CSV file path
|
||||||
send_alerts_to_separate_channel=False
|
send_alerts_to_separate_channel=False # Use main Discord channel
|
||||||
),
|
),
|
||||||
]
|
]
|
||||||
|
# ===== END: Monitor Setup =====
|
||||||
|
|
||||||
print("Starting monitoring loop...")
|
print("Starting monitoring loop...")
|
||||||
print("Press Ctrl+C to stop\n")
|
print("Press Ctrl+C to stop\n")
|
||||||
|
|
||||||
# Main monitoring loop
|
# ===== START: Main Loop =====
|
||||||
|
# Main monitoring loop (runs forever until Ctrl+C)
|
||||||
while True:
|
while True:
|
||||||
|
# Run all monitors (each checks if it's time to run via should_run())
|
||||||
run_monitors(monitors)
|
run_monitors(monitors)
|
||||||
|
|
||||||
|
# Check for incoming web requests (non-blocking)
|
||||||
|
# Pass schedule_monitor so web interface can reload config when schedules change
|
||||||
web_server.check_requests(sensors, ac_monitor, heater_monitor, schedule_monitor)
|
web_server.check_requests(sensors, ac_monitor, heater_monitor, schedule_monitor)
|
||||||
time.sleep(0.1)
|
|
||||||
|
# Small delay to prevent CPU overload (0.1 seconds = 10 loops per second)
|
||||||
|
time.sleep(0.1)
|
||||||
|
# ===== END: Main Loop =====
|
||||||
Loading…
x
Reference in New Issue
Block a user