fix: Remove test_send.py script to clean up unused code

Scripts/discord_webhook.py

@@ -55,24 +55,24 @@ def send_discord_message(message, username="Auto Garden Bot", is_alert=False, de
         import gc  # type: ignore
         import time  # type: ignore
 
-        gc.collect(); gc.collect()
+        gc.collect()
 
         # Quick mem check before importing urequests/SSL
         mem = getattr(gc, "mem_free", lambda: None)()
         # Require larger headroom based on device testing (adjust if you re-test)
-        if mem is not None and mem < 150000:
+        if mem is not None and mem < 95000:
-            # quietly skip send when memory is insufficient
+            print("Discord send skipped: ENOMEM ({} bytes free)".format(mem))
             return False
 
         # Import urequests only when we plan to send
         try:
             import urequests as requests  # type: ignore
-        except Exception:
+        except Exception as e:
+            print("Discord send failed: urequests import error:", e)
             try:
                 _NEXT_ALLOWED_SEND_TS = time.time() + 60
             except:
                 pass
-            # quiet failure to avoid spamming serial; caller can check return value
             return False
 
         gc.collect()
@@ -93,14 +93,13 @@ def send_discord_message(message, username="Auto Garden Bot", is_alert=False, de
         return bool(status and 200 <= status < 300)
 
     except Exception as e:
-        # On ENOMEM/MemoryError back off
+        print("Discord send failed:", e)
         try:
             if ("ENOMEM" in str(e)) or isinstance(e, MemoryError):
                 import time  # type: ignore
                 _NEXT_ALLOWED_SEND_TS = time.time() + 60
         except:
             pass
-        # quiet exception path; return False for caller to handle/backoff
         return False
 
     finally:
@@ -132,6 +131,6 @@ def send_discord_message(message, username="Auto Garden Bot", is_alert=False, de
             pass
         try:
             import gc # type: ignore
-            gc.collect(); gc.collect()
+            gc.collect()
         except:
             pass

Scripts/test_send.py

@@ -1,16 +0,0 @@
-import ujson
-# Reload discord module fresh and run the forced debug send once.
-try:
-    # ensure we use latest module on device
-    import sys
-    if "scripts.discord_webhook" in sys.modules:
-        del sys.modules["scripts.discord_webhook"]
-    import scripts.discord_webhook as d
-    # load config.json to populate webhook URL
-    with open("config.json", "r") as f:
-        cfg = ujson.load(f)
-    d.set_config(cfg)
-    print("Running debug_force_send() — may trigger ENOMEM, run once only")
-    d.debug_force_send("memory test")
-except Exception as e:
-    print("test_send error:", e)

Scripts/web_server.py

@@ -58,12 +58,6 @@ class TempWebServer:
                 bytes_read = len(body_so_far.encode('utf-8'))
                 bytes_needed = content_length - bytes_read
                 
-                # ===== DEBUG: Print body reading info =====
-                print("DEBUG POST: Content-Length = {} bytes".format(content_length))
-                print("DEBUG POST: Already read = {} bytes".format(bytes_read))
-                print("DEBUG POST: Still need = {} bytes".format(bytes_needed))
-                # ===== END DEBUG =====
-                
                 # Read remaining body in loop (recv() may not return all at once!)
                 if bytes_needed > 0:
                     remaining_parts = []
@@ -77,20 +71,9 @@ class TempWebServer:
                             break
                         remaining_parts.append(chunk)
                         total_read += len(chunk)
-                        print("DEBUG POST: Read {} bytes (total: {}/{})".format(
-                            len(chunk), total_read, bytes_needed))
                     
                     remaining = b''.join(remaining_parts)
-                    print("DEBUG POST: Read additional {} bytes (expected {})".format(
-                        len(remaining), bytes_needed))
                     request = request[:header_end] + body_so_far + remaining.decode('utf-8')
-                
-                # ===== DEBUG: Print final body length =====
-                final_body = request[header_end:]
-                print("DEBUG POST: Final body length = {} bytes (expected {})".format(
-                    len(final_body), content_length))
-                print("DEBUG POST: First 100 chars = {}".format(final_body[:100]))
-                # ===== END DEBUG =====
 
             if 'POST /update' in request:
                 response = self._handle_update(request, sensors, ac_monitor, heater_monitor, schedule_monitor, config)
@@ -118,7 +101,6 @@ class TempWebServer:
                 for i in range(0, len(response_bytes), chunk_size):
                     chunk = response_bytes[i:i+chunk_size]
                     conn.sendall(chunk)
-                    print("DEBUG: Sent chunk {} ({} bytes)".format(i//chunk_size + 1, len(chunk)))
                 
                 conn.close()
                 print("DEBUG: Schedule editor page sent successfully ({} bytes total)".format(len(response_bytes)))
@@ -212,6 +194,8 @@ class TempWebServer:
                 print("ERROR: Failed to send response: {}".format(e))
             finally:
                 conn.close()
+                import gc  # type: ignore
+                gc.collect()
                 print("DEBUG: Client connection closed")
             # ===== END: Send response =====
 
@@ -284,7 +268,8 @@ class TempWebServer:
 
     def _handle_schedule_update(self, request, sensors, ac_monitor, heater_monitor, schedule_monitor, config):
         """Handle schedule form submission."""
-
+        import gc  # type: ignore
+        gc.collect()
         try:
             body = request.split('\r\n\r\n')[1] if '\r\n\r\n' in request else ''
             params = {}
@@ -298,6 +283,7 @@ class TempWebServer:
             mode_action = params.get('mode_action', '')
             
             if mode_action == 'resume':
+                gc.collect()
                 # Resume automatic scheduling
                 config['schedule_enabled'] = True
                 config['permanent_hold'] = False
@@ -331,6 +317,7 @@ class TempWebServer:
                 return redirect_response
             
             elif mode_action == 'temporary_hold':
+                gc.collect()
                 # Enter temporary hold (pause schedules temporarily)
                 config['schedule_enabled'] = False
                 config['permanent_hold'] = False
@@ -355,6 +342,7 @@ class TempWebServer:
                 return redirect_response
             
             elif mode_action == 'permanent_hold':
+                gc.collect()
                 # Enter permanent hold (disable schedules permanently)
                 config['schedule_enabled'] = False
                 config['permanent_hold'] = True
@@ -380,6 +368,7 @@ class TempWebServer:
                 return redirect_response
             
             elif mode_action == 'save_schedules':
+                gc.collect()
                 # Just fall through to schedule parsing below
                 pass
             # ===== END: Handle mode actions =====
@@ -389,12 +378,6 @@ class TempWebServer:
             prev_schedules = prev.get('schedules', [])
 
             # ===== START: Handle schedule configuration save =====
-            # DEBUG: Print what we received
-            print("DEBUG: Received POST body parameters:")
-            for key, value in params.items():
-                print("  {} = '{}'".format(key, value))
-            print("DEBUG: Total params received: {}".format(len(params)))
-            
             # Parse schedules (4 slots)
             schedules = []
             has_any_schedule_data = False
@@ -501,8 +484,6 @@ class TempWebServer:
                         'heater_target': heater_target
                     }
                     schedules.append(schedule)
-                    print("DEBUG: Parsed schedule {}: time='{}', name='{}', heater={}, ac={}".format(
-                        i, schedule_time, schedule_name, heater_target, ac_target))
             
             # Only update schedules if user submitted schedule form data
             if has_any_schedule_data:
@@ -556,7 +537,8 @@ class TempWebServer:
                 if heater_monitor:
                     heater_monitor.target_temp = config['heater_target']
                     heater_monitor.temp_swing = config['heater_swing']
-            
+            del params, prev_schedules, prev
+            gc.collect()
             # Send Discord notification
             try:
                 mode = "automatic" if config.get('schedule_enabled') else "hold"
@@ -567,7 +549,8 @@ class TempWebServer:
             except:
                 pass
             # ===== END: Handle schedule configuration save =====
-            
+            del schedules
+            gc.collect()
             # Redirect back to homepage with cache-busting headers
             redirect_response = 'HTTP/1.1 303 See Other\r\n'
             redirect_response += 'Location: /\r\n'
@@ -578,6 +561,7 @@ class TempWebServer:
             redirect_response += 'Expires: 0\r\n'
             redirect_response += '\r\n'
             print("DEBUG: Returning redirect to dashboard (with cache-busting)")
+            gc.collect()
             return redirect_response
             
         except Exception as e:
@@ -1361,6 +1345,8 @@ document.addEventListener('DOMContentLoaded', function() {{
     def _get_schedule_editor_page(self, sensors, ac_monitor, heater_monitor):
         """Generate schedule editor page (no auto-refresh, schedules only)."""
         # Get current temps (read if not cached)
+        import gc  # type: ignore
+        gc.collect()
         inside_temp = getattr(sensors.get('inside'), 'last_temp', None)
         if inside_temp is None:
             inside_temps = sensors['inside'].read_all_temps(unit='F')
@@ -1400,8 +1386,6 @@ document.addEventListener('DOMContentLoaded', function() {{
         # Build schedule inputs
         schedule_inputs = ""
         for i, schedule in enumerate(schedules[:4]):
-            print("DEBUG: Building HTML for schedule {}...".format(i))
-            
             time_value = schedule.get('time', '')
             name_value = schedule.get('name', '')
             heater_value = schedule.get('heater_target', config.get('heater_target'))
@@ -1430,8 +1414,6 @@ document.addEventListener('DOMContentLoaded', function() {{
             # Add required attribute to force validation
             schedule_inputs += "<input type=\"number\" name=\"schedule_" + str(i) + "_ac\" value=\"" + str(ac_value) + "\" step=\"0.5\" min=\"60\" max=\"90\" required oninput=\"schedSync(" + str(i) + ", 'ac')\" onchange=\"schedSync(" + str(i) + ", 'ac')\">\n"
             schedule_inputs += '</div>\n'
-            
-            print("DEBUG:   HTML generated, length now: {} bytes".format(len(schedule_inputs)))
         
         html = """
     <!DOCTYPE html>
@@ -1636,7 +1618,8 @@ document.addEventListener('DOMContentLoaded', function() {{
     def _get_settings_page(self, sensors, ac_monitor, heater_monitor):
         """Generate advanced settings page."""
         config = self._load_config()
-        
+        import gc  # type: ignore
+        gc.collect()
         # Get temperatures (read if not cached)
         inside_temp = getattr(sensors.get('inside'), 'last_temp', None)
         if inside_temp is None:
@@ -1811,6 +1794,8 @@ document.addEventListener('DOMContentLoaded', function() {{
 
     def _handle_settings_update(self, request, sensors, ac_monitor, heater_monitor, schedule_monitor, config):
         """Handle advanced settings update."""
+        import gc  # type: ignore
+        gc.collect()
         try:
             body = request.split('\r\n\r\n')[1] if '\r\n\r\n' in request else ''
             params = {}
@@ -1877,4 +1862,5 @@ document.addEventListener('DOMContentLoaded', function() {{
         redirect_response += 'Content-Length: 0\r\n'
         redirect_response += 'Connection: close\r\n'
         redirect_response += '\r\n'
+        gc.collect()
         return redirect_response

main.py

@@ -22,14 +22,6 @@ except Exception as e:
 # Import after WiFi reset
 from scripts.networking import connect_wifi
 
-from scripts.monitors import TemperatureMonitor, WiFiMonitor, ACMonitor, HeaterMonitor, run_monitors
-from scripts.temperature_sensor import TemperatureSensor
-from scripts.air_conditioning import ACController
-from scripts.heating import HeaterController
-from scripts.web_server import TempWebServer
-from scripts.scheduler import ScheduleMonitor  # NEW: Import scheduler for time-based temp changes
-from scripts.memory_check import check_memory_once  # Just the function
-
 # ===== NEW: NTP Sync Function (imports locally) =====
 def sync_ntp_time(timezone_offset):
     """
@@ -209,7 +201,7 @@ if wifi and wifi.isconnected():
     gc.collect()
     ram_free = gc.mem_free()
     print(f"DEBUG: Free RAM before Discord send: {ram_free // 1024} KB")
-    mem_ok = ram_free > 100000
+    mem_ok = ram_free > 95000
     if mem_ok:
         ok = discord_webhook.send_discord_message("Pico W online at http://{}".format(ifconfig[0]), debug=False)
         if ok:
@@ -224,6 +216,15 @@ if wifi and wifi.isconnected():
         pending_discord_message = "Pico W online at http://{}".format(ifconfig[0])
         discord_send_attempts = 1
     
+    # ===== Moved to later so discord could fire off startup message hopefully =====
+    from scripts.monitors import TemperatureMonitor, WiFiMonitor, ACMonitor, HeaterMonitor, run_monitors
+    from scripts.temperature_sensor import TemperatureSensor
+    from scripts.air_conditioning import ACController
+    from scripts.heating import HeaterController
+    from scripts.web_server import TempWebServer
+    from scripts.scheduler import ScheduleMonitor
+    from scripts.memory_check import check_memory_once
+    
     # Start web server early so page can load even if time sync is slow
     web_server = TempWebServer(port=80)
     web_server.start()
@@ -360,47 +361,6 @@ print("="*50 + "\n")
 check_memory_once()
 # ===== END: Startup Memory Check =====
 
-# ===== START: Monitor Setup =====
-# Set up all monitoring systems (run in order during main loop)
-monitors = [
-    # WiFi monitor: Checks connection, reconnects if needed, blinks LED
-    WiFiMonitor(wifi, led, interval=5, reconnect_cooldown=60, config=config),
-    
-    # Schedule monitor: Changes temp targets based on time of day
-    schedule_monitor,
-    
-    # AC monitor: Automatically turns AC on/off based on temperature
-    ac_monitor,
-    
-    # Heater monitor: Automatically turns heater on/off based on temperature
-    heater_monitor,
-    
-    # Inside temperature monitor: Logs temps, sends alerts if out of range
-    TemperatureMonitor(
-        sensor=sensors['inside'],
-        label=SENSOR_CONFIG['inside']['label'],
-        check_interval=10,                                  # Check temp every 10 seconds
-        report_interval=30,                                 # Log to CSV every 30 seconds
-        alert_high=SENSOR_CONFIG['inside']['alert_high'],  # High temp alert threshold
-        alert_low=SENSOR_CONFIG['inside']['alert_low'],    # Low temp alert threshold
-        log_file="/temp_logs.csv",                         # CSV file path
-        send_alerts_to_separate_channel=True               # Use separate Discord channel
-    ),
-    
-    # Outside temperature monitor: Logs temps, sends alerts if out of range
-    TemperatureMonitor(
-        sensor=sensors['outside'],
-        label=SENSOR_CONFIG['outside']['label'],
-        check_interval=10,                                   # Check temp every 10 seconds
-        report_interval=30,                                  # Log to CSV every 30 seconds
-        alert_high=SENSOR_CONFIG['outside']['alert_high'],  # High temp alert threshold
-        alert_low=SENSOR_CONFIG['outside']['alert_low'],    # Low temp alert threshold
-        log_file="/temp_logs.csv",                          # CSV file path
-        send_alerts_to_separate_channel=False               # Use main Discord channel
-    ),
-]
-# ===== END: Monitor Setup =====
-
 print("Starting monitoring loop...")
 print("Press Ctrl+C to stop\n")
 
@@ -409,77 +369,119 @@ retry_ntp_attempts = 0
 max_ntp_attempts = 5  # Try up to 5 times after initial failure
 last_ntp_sync = time.time()  # Track when we last synced
 
-# ===== START: Main Loop =====
+try:
-# Main monitoring loop (runs forever until Ctrl+C)
+    while True:
-while True:
+        
-    try:
+        # ===== START: Main Loop =====
-        # Try to send pending discord startup message when memory permits
+        # Main monitoring loop (runs forever until Ctrl+C)
-        if not discord_sent and pending_discord_message and discord_send_attempts < 3:
+        last_monitor_run = {
-            import gc as _gc  # type: ignore
+            "wifi": 0,
-            _gc.collect()
+            "schedule": 0,
-            _gc.collect()
+            "ac": 0,
-            mem_ok = getattr(_gc, 'mem_free', lambda: 0)() > 100000
+            "heater": 0,
-            if mem_ok:
+            "inside_temp": 0,
+            "outside_temp": 0,
+        }
+        
+        while True:
+            now = time.time()
+        
+            # WiFi monitor every 5 seconds (can be stateless)
+            if now - last_monitor_run["wifi"] >= 5:
+                from scripts.monitors import WiFiMonitor
+                wifi_monitor = WiFiMonitor(wifi, led, interval=5, reconnect_cooldown=60, config=config)
                 try:
-                    ok = discord_webhook.send_discord_message(pending_discord_message, debug=False)
+                    wifi_monitor.run()
-                    if ok:
+                except Exception as e:
-                        print("Discord startup notification sent")
+                    print("WiFiMonitor error:", e)
-                        discord_sent = True
+                del wifi_monitor
-                    else:
+                gc.collect()
-                        discord_send_attempts += 1
+                last_monitor_run["wifi"] = now
-                        if discord_send_attempts >= 3:
+        
-                            print("Discord startup notification failed after retries")
+            # Schedule monitor every 60 seconds (persistent)
-                            discord_sent = True
+            if now - last_monitor_run["schedule"] >= 60:
-                except Exception:
+                try:
-                    discord_send_attempts += 1
+                    schedule_monitor.run()
-                    if discord_send_attempts >= 3:
+                except Exception as e:
-                        discord_sent = True
+                    print("ScheduleMonitor error:", e)
-
+                last_monitor_run["schedule"] = now
-        # Run all monitors (each checks if it's time to run via should_run())
+        
-        run_monitors(monitors)
+            # AC monitor every 30 seconds (persistent)
-
+            if now - last_monitor_run["ac"] >= 30:
-        # Web requests
+                try:
-        web_server.check_requests(sensors, ac_monitor, heater_monitor, schedule_monitor, config)
+                    ac_monitor.run()
-
+                except Exception as e:
-        # ===== PERIODIC RE-SYNC (every 24 hours) =====
+                    print("ACMonitor error:", e)
-        if ntp_synced and (time.time() - last_ntp_sync) > 86400:
+                last_monitor_run["ac"] = now
-            print("24-hour re-sync due...")
+        
-            if sync_ntp_time(TIMEZONE_OFFSET):
+            # Heater monitor every 30 seconds (persistent)
-                last_ntp_sync = time.time()
+            if now - last_monitor_run["heater"] >= 30:
-                print("Daily NTP re-sync successful")
+                try:
-            else:
+                    heater_monitor.run()
-                print("Daily NTP re-sync failed (will retry tomorrow)")
+                except Exception as e:
-        # ===== END: PERIODIC RE-SYNC =====
+                    print("HeaterMonitor error:", e)
+                last_monitor_run["heater"] = now
+        
+            # Inside temperature monitor every 10 seconds (can be stateless)
+            if now - last_monitor_run["inside_temp"] >= 10:
+                from scripts.monitors import TemperatureMonitor
+                inside_monitor = TemperatureMonitor(
+                    sensor=sensors['inside'],
+                    label=SENSOR_CONFIG['inside']['label'],
+                    check_interval=10,
+                    report_interval=30,
+                    alert_high=SENSOR_CONFIG['inside']['alert_high'],
+                    alert_low=SENSOR_CONFIG['inside']['alert_low'],
+                    log_file="/temp_logs.csv",
+                    send_alerts_to_separate_channel=True
+                )
+                inside_monitor.run()
+                del inside_monitor
+                gc.collect()
+                last_monitor_run["inside_temp"] = now
+        
+            # Outside temperature monitor every 10 seconds (can be stateless)
+            if now - last_monitor_run["outside_temp"] >= 10:
+                from scripts.monitors import TemperatureMonitor
+                outside_monitor = TemperatureMonitor(
+                    sensor=sensors['outside'],
+                    label=SENSOR_CONFIG['outside']['label'],
+                    check_interval=10,
+                    report_interval=30,
+                    alert_high=SENSOR_CONFIG['outside']['alert_high'],
+                    alert_low=SENSOR_CONFIG['outside']['alert_low'],
+                    log_file="/temp_logs.csv",
+                    send_alerts_to_separate_channel=False
+                )
+                outside_monitor.run()
+                del outside_monitor
+                gc.collect()
+                last_monitor_run["outside_temp"] = now
+        
+            # Web requests (keep web server loaded if needed)
+            web_server.check_requests(sensors, ac_monitor, heater_monitor, schedule_monitor, config)
         
-        # Aggressive GC without frequent console noise
-        current_time = time.time()
-        if int(current_time) % 5 == 0:
             gc.collect()
-        # Print memory stats infrequently (every 10 minutes)
+            time.sleep(0.1)
-        if int(current_time) % 600 == 0:
+        # ===== END: Main Loop =====
-            print("Memory free: {} KB".format(gc.mem_free() // 1024))
+except KeyboardInterrupt:
-        # ===== END: AGGRESSIVE GC =====
+    print("\n" + "="*50)
-        time.sleep(0.1)
+    print("Shutting down gracefully...")
-        
+    print("="*50)
-    except KeyboardInterrupt:
+    try:
-        # Graceful shutdown on Ctrl+C
-        print("\n\n" + "="*50)
-        print("Shutting down gracefully...")
-        print("="*50)
         print("Turning off AC...")
         ac_controller.turn_off()
+    except Exception as e:
+        print("AC shutdown error:", e)
+    try:
         print("Turning off heater...")
         heater_controller.turn_off()
+    except Exception as e:
+        print("Heater shutdown error:", e)
+    try:
         print("Turning off LED...")
         led.low()
-        print("Shutdown complete!")
-        print("="*50 + "\n")
-        break
-        
     except Exception as e:
-        # If loop crashes, print error and keep running
+        print("LED shutdown error:", e)
-        print("❌ Main loop error: {}".format(e))
+    print("Shutdown complete!")
-        import sys
+    print("="*50)
-        sys.print_exception(e)
-        time.sleep(5)  # Brief pause before retrying
-# ===== END: Main Loop =====