minor tweaks

Author: logan-han

README.md

@@ -36,14 +36,14 @@ The scheduler monitors the current time, battery SoC, and weather forecast, cont
 
 The system can automatically skip battery discharge when bad weather is forecasted. This helps preserve battery charge for cloudy/rainy days when solar generation will be insufficient.
 
-**Why this matters:** During consecutive bad weather days, solar panels will not generate enough power to recharge the battery. By skipping discharge before bad weather, the battery retains enough charge to cover household needs without importing from the grid.
+**Why this matters:** During bad weather, solar panels will not generate enough power to recharge the battery. By skipping discharge before bad weather, the battery retains enough charge to cover household needs without importing from the grid.
 
 **How it works:**
-- Fetches 7-day weather forecast from Open-Meteo (free, no API key required)
+- Fetches 4-day weather forecast from Open-Meteo (free, no API key required)
 - Gets solar production forecasts from forecast.solar for accurate predictions
-- Analyses conditions: rain, thunderstorms, drizzle, snow, high cloud cover (>70%)
-- If bad weather is expected for X consecutive days (configurable, default 2), discharge is skipped
-- Displayed in the web UI with forecast cards showing good/bad days
+- Compares tomorrow's solar forecast against your minimum threshold (configurable)
+- If solar production is expected to be below threshold, discharge is skipped
+- Displayed in the web UI with forecast cards showing solar estimates
 
 ## Solar Output Estimates
 

app.py

@@ -167,9 +167,9 @@ def init_weather_client():
         if panel_kw and panel_kw > 0:
             kwp = panel_kw
         elif inverter_kw and inverter_kw > 0:
-            kwp = inverter_kw * 1.25  # Common panel oversizing ratio
+            kwp = int(inverter_kw * 1.25)  # Match Android app behavior
         elif api_inverter_kw and api_inverter_kw > 0:
-            kwp = api_inverter_kw * 1.25
+            kwp = int(api_inverter_kw * 1.25)
         else:
             kwp = 5.0  # Default fallback
 
@@ -365,6 +365,7 @@ def scheduler_loop():
             # Get SoC settings
             min_soc_reserve = schedule.get("min_soc_reserve", 20)
             cutoff_soc = schedule.get("force_discharge_cutoff_soc", 50)
+            reactivation_margin = schedule.get("reactivation_margin", 5)  # Hysteresis buffer
             max_power = current_state.get("inverter_capacity") or 10000
 
             # Get current battery info
@@ -393,10 +394,22 @@ def scheduler_loop():
             # Check if force discharge is enabled
             force_discharge_enabled = schedule.get("enabled", True)
 
-            # Determine if we should be in force discharge mode
-            # Force discharge when: enabled AND in window AND SoC above cutoff AND NOT weather skip
-            should_force_discharge = force_discharge_enabled and in_window and (soc is None or soc > cutoff_soc) and not weather_skip
-            logger.debug(f"Scheduler check: discharge={'active' if should_force_discharge else 'inactive'}")
+            # Determine if we should be in force discharge mode with hysteresis
+            # - If already discharging: keep going until SoC <= cutoff
+            # - If not discharging: only start if SoC > (cutoff + margin)
+            # This prevents rapid cycling when SoC hovers around the cutoff threshold
+            currently_discharging = current_state.get("force_discharge_active", False)
+
+            if currently_discharging:
+                # Keep discharging until we reach the cutoff
+                soc_allows_discharge = soc is None or soc > cutoff_soc
+            else:
+                # Only start discharging if SoC is above cutoff + margin
+                activation_threshold = cutoff_soc + reactivation_margin
+                soc_allows_discharge = soc is None or soc > activation_threshold
+
+            should_force_discharge = force_discharge_enabled and in_window and soc_allows_discharge and not weather_skip
+            logger.debug(f"Scheduler check: discharge={'active' if should_force_discharge else 'inactive'}, SoC={soc}, threshold={cutoff_soc if currently_discharging else cutoff_soc + reactivation_margin}")
 
             if weather_skip and in_window:
                 logger.debug("Skipping discharge due to weather conditions")
@@ -896,72 +909,80 @@ def get_soc():
 @app.route('/api/weather')
 def get_weather():
     """Get weather forecast"""
-    weather_config = config.get("weather", {})
+    try:
+        weather_config = config.get("weather", {})
 
-    if not weather_config.get("enabled", False):
-        return jsonify({
+        if not weather_config.get("enabled", False):
+            return jsonify({
+                "success": True,
+                "enabled": False,
+                "message": "Weather feature is disabled"
+            })
+
+        if not weather_client:
+            return jsonify({
+                "success": False,
+                "enabled": True,
+                "error": "Weather client not initialised - check API key and location"
+            })
+
+        forecast = get_weather_forecast()
+        if not forecast or not forecast.get("success", False):
+            return jsonify({
+                "success": False,
+                "enabled": True,
+                "error": "Failed to fetch weather forecast"
+            })
+
+        skip_active, _ = should_skip_discharge_for_weather()
+
+        # Sanitize skip_reason to avoid exposing internal details
+        safe_skip_reason = "Weather conditions unfavorable" if skip_active else "Weather OK"
+
+        # Sanitize forecast to only include UI-safe fields
+        safe_forecast = {
             "success": True,
-            "enabled": False,
-            "message": "Weather feature is disabled"
-        })
+            "daily": []
+        }
+        for day in forecast.get("daily", []):
+            safe_day = {
+                "date": day.get("date"),
+                "day_name": day.get("day_name"),
+                "condition": day.get("condition"),
+                "icon": day.get("icon"),
+                "temp_max": day.get("temp_max"),
+                "temp_min": day.get("temp_min"),
+                "cloud_cover": day.get("cloud_cover"),
+                "precipitation_probability": day.get("precipitation_probability"),
+                "is_bad_weather": day.get("is_bad_weather", False),
+                "estimated_solar_kwh": day.get("estimated_solar_kwh"),
+                "solar_source": day.get("solar_source")
+            }
+            safe_forecast["daily"].append(safe_day)
 
-    if not weather_client:
         return jsonify({
-            "success": False,
+            "success": True,
             "enabled": True,
-            "error": "Weather client not initialised - check API key and location"
+            "forecast": safe_forecast,
+            "skip_discharge": skip_active,
+            "skip_reason": safe_skip_reason,
+            "min_solar_threshold_kwh": weather_config.get("min_solar_threshold_kwh", 0),
+            "last_update": weather_forecast_cache.get("last_update").isoformat() if weather_forecast_cache.get("last_update") else None
         })
-
-    forecast = get_weather_forecast()
-    if not forecast:
+    except Exception as e:
+        logger.error(f"Error getting weather forecast: {e}")
         return jsonify({
             "success": False,
             "enabled": True,
-            "error": "Failed to fetch weather forecast"
-        })
-
-    skip_active, skip_reason = should_skip_discharge_for_weather()
-
-    # Sanitize skip_reason to avoid exposing internal details
-    safe_skip_reason = "Weather conditions unfavorable" if skip_active else "Weather OK"
-
-    # Sanitize forecast to only include UI-safe fields
-    safe_forecast = {
-        "success": True,
-        "daily": [],
-        "consecutive_bad_days": forecast.get("consecutive_bad_days", 0)
-    }
-    for day in forecast.get("daily", []):
-        safe_day = {
-            "date": day.get("date"),
-            "day_name": day.get("day_name"),
-            "condition": day.get("condition"),
-            "icon": day.get("icon"),
-            "temp_max": day.get("temp_max"),
-            "temp_min": day.get("temp_min"),
-            "cloud_cover": day.get("cloud_cover"),
-            "precipitation_probability": day.get("precipitation_probability"),
-            "is_bad_weather": day.get("is_bad_weather", False),
-            "estimated_solar_kwh": day.get("estimated_solar_kwh"),
-            "solar_source": day.get("solar_source")
-        }
-        safe_forecast["daily"].append(safe_day)
-
-    return jsonify({
-        "success": True,
-        "enabled": True,
-        "forecast": safe_forecast,
-        "skip_discharge": skip_active,
-        "skip_reason": safe_skip_reason,
-        "min_solar_threshold_kwh": weather_config.get("min_solar_threshold_kwh", 0),
-        "last_update": weather_forecast_cache.get("last_update").isoformat() if weather_forecast_cache.get("last_update") else None
-    })
+            "error": "Failed to get weather forecast. Check logs for details."
+        }), 500
 
 
 @app.route('/api/weather/config')
 def get_weather_config():
     """Get weather configuration"""
     weather_config = config.get("weather", {})
+    solar_config = weather_config.get("solar", {})
     return jsonify({
         "enabled": weather_config.get("enabled", False),
         "city_name": weather_config.get("city_name", ""),
@@ -973,6 +994,8 @@ def get_weather_config():
         "min_cloud_cover_percent": weather_config.get("min_cloud_cover_percent", 70),
         "inverter_capacity_kw": weather_config.get("inverter_capacity_kw", 0),
         "panel_capacity_kw": weather_config.get("panel_capacity_kw", 0),
+        "panel_tilt": solar_config.get("declination"),
+        "panel_azimuth": solar_config.get("azimuth"),
         "location_configured": weather_config.get("latitude") is not None and weather_config.get("longitude") is not None
     })
 
@@ -1023,6 +1046,14 @@ def update_weather_config():
         if "panel_capacity_kw" in body:
             config["weather"]["panel_capacity_kw"] = body["panel_capacity_kw"]
 
+        # Solar panel configuration (tilt/azimuth)
+        if "solar" not in config["weather"]:
+            config["weather"]["solar"] = {}
+        if "panel_tilt" in body:
+            config["weather"]["solar"]["declination"] = body["panel_tilt"]
+        if "panel_azimuth" in body:
+            config["weather"]["solar"]["azimuth"] = body["panel_azimuth"]
+
         save_config()
 
         # Reinitialise weather client with new config

templates/index.html

@@ -813,6 +813,18 @@ <h2>
                             <small style="color: #666; font-size: 0.8em;">Leave blank to auto-estimate (inverter × 1.25)</small>
                         </div>
                     </div>
+                    <div class="weather-settings-row">
+                        <div class="setting-item">
+                            <label>Panel Tilt (°)</label>
+                            <input type="number" id="weatherPanelTilt" min="0" max="90" step="1" value="" placeholder="Default: 25">
+                            <small style="color: #666; font-size: 0.8em;">Roof angle (0=flat, 90=vertical)</small>
+                        </div>
+                        <div class="setting-item">
+                            <label>Panel Azimuth (°)</label>
+                            <input type="number" id="weatherPanelAzimuth" min="-180" max="180" step="1" value="" placeholder="Auto from location">
+                            <small style="color: #666; font-size: 0.8em;">Direction: 0=North, 90=East, 180=South, -90=West</small>
+                        </div>
+                    </div>
                     <button type="submit" class="btn btn-primary btn-sm">Save Weather Settings</button>
                 </form>
             </div>
@@ -850,6 +862,10 @@ <h2>Schedule Settings</h2>
                                 <label>Discharge SoC %</label>
                                 <input type="number" id="cutoffSoc" min="5" max="100" value="50" title="During discharge window - stop when battery reaches this level">
                             </div>
+                            <div class="setting-item">
+                                <label>Reactivation %</label>
+                                <input type="number" id="reactivationMargin" min="0" max="20" value="5" title="Buffer above cutoff to restart discharge - prevents cycling">
+                            </div>
                         </div>
                         <button type="submit" class="btn btn-primary btn-sm">Save</button>
                     </form>
@@ -1327,6 +1343,7 @@ <h2>Schedule Settings</h2>
                     document.getElementById('endTime').value = schedule.force_discharge_end || '19:30';
                     document.getElementById('minSocReserve').value = schedule.min_soc_reserve || 20;
                     document.getElementById('cutoffSoc').value = schedule.force_discharge_cutoff_soc || 50;
+                    document.getElementById('reactivationMargin').value = schedule.reactivation_margin || 5;
                 }
 
                 // TOU table
@@ -1368,7 +1385,8 @@ <h2>Schedule Settings</h2>
                 force_discharge_start: document.getElementById('startTime').value,
                 force_discharge_end: document.getElementById('endTime').value,
                 min_soc_reserve: parseInt(document.getElementById('minSocReserve').value),
-                force_discharge_cutoff_soc: parseInt(document.getElementById('cutoffSoc').value)
+                force_discharge_cutoff_soc: parseInt(document.getElementById('cutoffSoc').value),
+                reactivation_margin: parseInt(document.getElementById('reactivationMargin').value) || 5
             };
 
             try {
@@ -1472,9 +1490,9 @@ <h2>Schedule Settings</h2>
                 `;
             }
 
-            // Forecast cards
+            // Forecast cards - limit to 4 days for better mobile display
             let forecastHtml = '<div class="weather-container">';
-            daily.forEach((day, index) => {
+            daily.slice(0, 4).forEach((day, index) => {
                 const classes = ['weather-day'];
                 // Only highlight future days for bad weather (not today) since discharge decision is based on future forecasts
                 if (!day.is_today && day.is_bad_weather) classes.push('bad-weather');
@@ -1530,6 +1548,8 @@ <h2>Schedule Settings</h2>
                 document.getElementById('weatherSolarThreshold').value = config.min_solar_threshold_kwh || 15;
                 document.getElementById('weatherInverterCapacity').value = config.inverter_capacity_kw || '';
                 document.getElementById('weatherPanelCapacity').value = config.panel_capacity_kw || '';
+                document.getElementById('weatherPanelTilt').value = config.panel_tilt || '';
+                document.getElementById('weatherPanelAzimuth').value = config.panel_azimuth !== null ? config.panel_azimuth : '';
             } catch (error) {
                 console.error('Error loading weather config:', error);
             }
@@ -1599,6 +1619,9 @@ <h2>Schedule Settings</h2>
             const lat = document.getElementById('weatherLatitude').value;
             const lon = document.getElementById('weatherLongitude').value;
 
+            const tiltVal = document.getElementById('weatherPanelTilt').value;
+            const azimuthVal = document.getElementById('weatherPanelAzimuth').value;
+
             const payload = {
                 enabled: document.getElementById('weatherEnabled').checked,
                 city_name: document.getElementById('weatherCityName').value || '',
@@ -1607,7 +1630,9 @@ <h2>Schedule Settings</h2>
                 timezone: document.getElementById('weatherTimezone').value || 'auto',
                 min_solar_threshold_kwh: parseFloat(document.getElementById('weatherSolarThreshold').value) || 15,
                 inverter_capacity_kw: parseFloat(document.getElementById('weatherInverterCapacity').value) || 0,
-                panel_capacity_kw: parseFloat(document.getElementById('weatherPanelCapacity').value) || 0
+                panel_capacity_kw: parseFloat(document.getElementById('weatherPanelCapacity').value) || 0,
+                panel_tilt: tiltVal ? parseInt(tiltVal) : null,
+                panel_azimuth: azimuthVal !== '' ? parseInt(azimuthVal) : null
             };
 
             try {

tests/conftest.py

@@ -84,7 +84,6 @@ def sample_forecast_good():
                 "is_bad_weather": False
             }
         ],
-        "consecutive_bad_days": 0,
         "bad_weather_days": []
     }
 
@@ -142,6 +141,5 @@ def sample_forecast_bad():
                 "is_bad_weather": True
             }
         ],
-        "consecutive_bad_days": 3,
         "bad_weather_days": ["2023-12-22", "2023-12-23", "2023-12-24"]
     }

tests/test_app.py

@@ -90,8 +90,7 @@ def test_weather_api_success(self, mock_forecast, app_client):
             "success": True,
             "daily": [
                 {"date": "2023-12-22", "condition": "Clear", "is_bad_weather": False}
-            ],
-            "consecutive_bad_days": 0
+            ]
         }
 
         # Initialise weather client
@@ -272,21 +271,20 @@ def test_skip_no_forecast(self, mock_forecast):
     def test_skip_bad_weather(self, mock_forecast):
         """Test skip check triggers for bad weather"""
         mock_forecast.return_value = {
-            "success": True,
-            "consecutive_bad_days": 3
+            "success": True
         }
 
         with patch('app.DeyeCloudClient'):
             import app as app_module
             app_module.config = {"weather": {"enabled": True, "min_solar_threshold_kwh": 5.0}}
             app_module.weather_client = Mock()
             app_module.weather_analyser = Mock()
-            app_module.weather_analyser.should_skip_discharge.return_value = (True, "3 bad days")
+            app_module.weather_analyser.should_skip_discharge.return_value = (True, "Low solar forecast")
 
             should_skip, reason = app_module.should_skip_discharge_for_weather()
 
             assert should_skip is True
-            assert "3 bad days" in reason
+            assert "Low solar" in reason
 
 
 class TestGetWeatherForecast:
@@ -391,7 +389,7 @@ class TestSchedulerWeatherIntegration:
     def test_scheduler_skips_for_weather(self, mock_window, mock_weather_skip):
         """Test scheduler skips discharge when weather is bad"""
         mock_window.return_value = True
-        mock_weather_skip.return_value = (True, "Bad weather for 3 days")
+        mock_weather_skip.return_value = (True, "Low solar forecast")
 
         with patch('app.DeyeCloudClient') as mock_deye:
             mock_client = Mock()
@@ -1295,7 +1293,7 @@ def stop_after_one(*args):
     def test_scheduler_weather_skip_logs(self, mock_weather, mock_window, mock_sleep):
         """Test scheduler logs weather skip"""
         mock_window.return_value = True
-        mock_weather.return_value = (True, "Bad weather for 3 days")
+        mock_weather.return_value = (True, "Low solar forecast")
 
         with patch('app.DeyeCloudClient') as mock_deye:
             mock_client = Mock()
@@ -1336,7 +1334,7 @@ def stop_after_one(*args):
             app_module.scheduler_loop()
 
             assert app_module.current_state["weather_skip_active"] is True
-            assert app_module.current_state["weather_skip_reason"] == "Bad weather for 3 days"
+            assert app_module.current_state["weather_skip_reason"] == "Low solar forecast"
 
     @patch('app.time.sleep')
     @patch('app.is_within_discharge_window')