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

@@ -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")
@@ -913,7 +926,7 @@ def get_weather():
         })
 
     forecast = get_weather_forecast()
-    if not forecast:
+    if not forecast or not forecast.get("success", False):
         return jsonify({
             "success": False,
             "enabled": True,
@@ -928,8 +941,7 @@ def get_weather():
     # Sanitize forecast to only include UI-safe fields
     safe_forecast = {
         "success": True,
-        "daily": [],
-        "consecutive_bad_days": forecast.get("consecutive_bad_days", 0)
+        "daily": []
     }
     for day in forecast.get("daily", []):
         safe_day = {

templates/index.html

@@ -850,6 +850,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 +1331,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 +1373,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 +1478,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');

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')

tests/test_weather_client.py

@@ -279,34 +279,6 @@ def test_is_bad_weather_day_partly_cloudy(self):
         day = {"condition": "Clouds", "clouds": 40, "pop": 10}
         assert self.analyser._is_bad_weather_day(day) is False
 
-    def test_count_consecutive_bad_days_none(self):
-        """Test consecutive bad days count with no bad days"""
-        daily = [
-            {"is_bad_weather": False},
-            {"is_bad_weather": False},
-            {"is_bad_weather": False}
-        ]
-        assert self.analyser._count_consecutive_bad_days(daily) == 0
-
-    def test_count_consecutive_bad_days_all(self):
-        """Test consecutive bad days count with all bad days"""
-        daily = [
-            {"is_bad_weather": True},
-            {"is_bad_weather": True},
-            {"is_bad_weather": True}
-        ]
-        assert self.analyser._count_consecutive_bad_days(daily) == 3
-
-    def test_count_consecutive_bad_days_mixed(self):
-        """Test consecutive bad days count with mixed days"""
-        daily = [
-            {"is_bad_weather": True},
-            {"is_bad_weather": True},
-            {"is_bad_weather": False},
-            {"is_bad_weather": True}
-        ]
-        assert self.analyser._count_consecutive_bad_days(daily) == 2
-
     def test_should_skip_discharge_low_solar(self):
         """Test skip discharge when solar forecast is below threshold"""
         forecast = {

weather_client.py

@@ -176,7 +176,7 @@ def _make_request_with_retry(self, url: str, params: dict, max_retries: int = 2)
 
     def get_forecast(self) -> Dict[str, Any]:
         """
-        Get 7-day weather forecast with hourly data for solar predictions.
+        Get 4-day weather forecast with hourly data for solar predictions.
         Uses Open-Meteo free API (no API key required).
         """
         if self._is_cache_valid() and "forecast" in self._cache:
@@ -190,7 +190,7 @@ def get_forecast(self) -> Dict[str, Any]:
                 "hourly": "temperature_2m,cloud_cover,precipitation_probability,precipitation,weather_code",
                 "daily": "temperature_2m_max,temperature_2m_min,weather_code,precipitation_sum,precipitation_probability_max",
                 "timezone": self.timezone_str,
-                "forecast_days": 7
+                "forecast_days": 4
             }
 
             logger.info("Fetching weather forecast from Open-Meteo")
@@ -270,7 +270,7 @@ def _parse_forecast(self, data: Dict) -> Dict[str, Any]:
 
         today = datetime.now().strftime("%Y-%m-%d")
 
-        for i, date_str in enumerate(dates[:7]):
+        for i, date_str in enumerate(dates[:4]):
             dt = datetime.strptime(date_str, "%Y-%m-%d")
             weather_code = weather_codes[i] if i < len(weather_codes) else 0
             condition = self._weather_code_to_condition(weather_code)
@@ -465,12 +465,10 @@ def __init__(self, latitude: float, longitude: float, declination: int = None,
     @staticmethod
     def _calculate_optimal_tilt(latitude: float) -> int:
         """
-        Calculate optimal panel tilt angle based on latitude.
-        Rule of thumb: tilt angle ~ latitude for year-round optimization.
+        Default panel tilt angle.
+        Most residential installs follow roof pitch (typically 15-25 degrees).
         """
-        # Use absolute latitude, clamped between 10-60 degrees
-        optimal = abs(latitude)
-        return int(max(10, min(60, optimal)))
+        return 25
 
     @staticmethod
     def _calculate_optimal_azimuth(latitude: float) -> int:
@@ -560,7 +558,7 @@ def _parse_forecast(self, data: Dict) -> Dict[str, Any]:
         daily_forecasts = []
         today = datetime.now().strftime("%Y-%m-%d")
 
-        for date_str, wh in sorted(daily_wh.items())[:7]:
+        for date_str, wh in sorted(daily_wh.items())[:4]:
             dt = datetime.strptime(date_str, "%Y-%m-%d")
             kwh = wh / 1000.0
 
@@ -696,7 +694,6 @@ def analyse_forecast(
                 bad_weather_days.append(day["date"])
 
         forecast["bad_weather_days"] = bad_weather_days
-        forecast["consecutive_bad_days"] = self._count_consecutive_bad_days(daily)
 
         return forecast
 
@@ -717,16 +714,6 @@ def _is_bad_weather_day(self, day: Dict) -> bool:
 
         return False
 
-    def _count_consecutive_bad_days(self, daily: List[Dict]) -> int:
-        """Count consecutive bad weather days starting from today"""
-        count = 0
-        for day in daily:
-            if day.get("is_bad_weather"):
-                count += 1
-            else:
-                break
-        return count
-
     def should_skip_discharge(
         self,
         forecast: Dict[str, Any],