extra fixes

Author: logan-han

app.py

@@ -349,11 +349,13 @@ def scheduler_loop():
             # Get free energy TOU params
             free_energy_start, free_energy_end, free_energy_soc = get_free_energy_tou_params()
 
-            logger.info(f"Check: in_window={in_window}, soc={soc}, cutoff={cutoff_soc}, reserve={min_soc_reserve}, weather_skip={weather_skip}, free_energy={in_free_energy_window}")
+            # Check if force discharge is enabled
+            force_discharge_enabled = schedule.get("enabled", True)
+            logger.info(f"Check: enabled={force_discharge_enabled}, in_window={in_window}, soc={soc}, cutoff={cutoff_soc}, reserve={min_soc_reserve}, weather_skip={weather_skip}, free_energy={in_free_energy_window}")
 
             # Determine if we should be in force discharge mode
-            # Force discharge when: in window AND SoC above cutoff AND NOT weather skip
-            should_force_discharge = in_window and (soc is None or soc > cutoff_soc) and not weather_skip
+            # 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
 
             if weather_skip and in_window:
                 logger.info(f"Skipping discharge due to weather: {weather_reason}")

config.json

@@ -8,6 +8,7 @@
     "device_sn": "YOUR_DEVICE_SN"
   },
   "schedule": {
+    "enabled": true,
     "force_discharge_start": "17:30",
     "force_discharge_end": "19:30",
     "min_soc_reserve": 20,

templates/index.html

@@ -774,7 +774,7 @@ <h2>Inverter TOU Settings</h2>
                     <tr><td colspan="4" style="text-align: center; color: #888;">Loading...</td></tr>
                 </tbody>
             </table>
-            <div class="tou-legend"><span style="color: #4ecca3;">*</span> Force discharge &nbsp; <span style="color: #3498db;">⚡</span> Free energy</div>
+            <div class="tou-legend">💰 Force discharge &nbsp; ⚡ Free energy</div>
         </div>
 
         <!-- Weather Forecast -->
@@ -835,7 +835,12 @@ <h2>Schedule Settings</h2>
             <div class="schedule-grid">
                 <!-- Force Discharge Window -->
                 <div class="schedule-section">
-                    <div class="schedule-section-title"><span style="color: #4ecca3;">*</span> Force Discharge</div>
+                    <div class="schedule-section-title">
+                        <label style="display: flex; align-items: center; gap: 6px; cursor: pointer;">
+                            <input type="checkbox" id="forceDischargeEnabled" checked>
+                            💰 Force Discharge
+                        </label>
+                    </div>
                     <form id="scheduleForm" class="schedule-form">
                         <div class="schedule-row">
                             <div class="setting-item">
@@ -849,12 +854,12 @@ <h2>Schedule Settings</h2>
                         </div>
                         <div class="schedule-row">
                             <div class="setting-item">
-                                <label>Normal SoC</label>
-                                <input type="number" id="minSocReserve" min="5" max="100" value="20">
+                                <label>Min Reserve %</label>
+                                <input type="number" id="minSocReserve" min="5" max="100" value="20" title="Battery reserve - system stops using battery at this level">
                             </div>
                             <div class="setting-item">
-                                <label>Discharge SoC</label>
-                                <input type="number" id="cutoffSoc" min="5" max="100" value="50">
+                                <label>Stop Discharge %</label>
+                                <input type="number" id="cutoffSoc" min="5" max="100" value="50" title="Force discharge stops when battery reaches this level">
                             </div>
                         </div>
                         <button type="submit" class="btn btn-primary btn-sm">Save</button>
@@ -865,7 +870,7 @@ <h2>Schedule Settings</h2>
                     <div class="schedule-section-title">
                         <label style="display: flex; align-items: center; gap: 6px; cursor: pointer;">
                             <input type="checkbox" id="freeEnergyEnabled">
-                            <span style="color: #3498db;">⚡</span> Free Energy Charge
+                            ⚡ Free Energy Charge
                         </label>
                     </div>
                     <form id="freeEnergySettingsForm" class="schedule-form">
@@ -1217,7 +1222,7 @@ <h2>Schedule Settings</h2>
                 let timeDisplay = `${startTime} - ${endTime}`;
                 let rowClass = '';
                 if (isDischargeWindow) {
-                    timeDisplay = `* ${startTime} - ${endTime}`;
+                    timeDisplay = `💰 ${startTime} - ${endTime}`;
                     rowClass = 'tou-target';
                 } else if (isFreeEnergyWindow) {
                     timeDisplay = `⚡ ${startTime} - ${endTime}`;
@@ -1336,6 +1341,7 @@ <h2>Schedule Settings</h2>
 
                 // Update form only if user is not actively editing
                 if (!isEditingSettings) {
+                    document.getElementById('forceDischargeEnabled').checked = schedule.enabled !== false;
                     document.getElementById('startTime').value = schedule.force_discharge_start || '17:30';
                     document.getElementById('endTime').value = schedule.force_discharge_end || '19:30';
                     document.getElementById('minSocReserve').value = schedule.min_soc_reserve || 20;
@@ -1377,6 +1383,7 @@ <h2>Schedule Settings</h2>
         document.getElementById('scheduleForm').addEventListener('submit', async (e) => {
             e.preventDefault();
             const schedule = {
+                enabled: document.getElementById('forceDischargeEnabled').checked,
                 force_discharge_start: document.getElementById('startTime').value,
                 force_discharge_end: document.getElementById('endTime').value,
                 min_soc_reserve: parseInt(document.getElementById('minSocReserve').value),

weather_client.py

@@ -211,8 +211,8 @@ def estimate_solar_output_hourly(self, panel_capacity_kw: float, date_str: str)
             total_kwh += period_kwh
             logger.debug(f"Hour {hour}: clouds={clouds}, cond={condition}, weather_factor={weather_factor:.2f}, kwh={period_kwh:.1f}")
 
-        # If we don't have enough data points, return None to fall back to simple calc
-        if len(hours_with_data) < 3:
+        # Need at least 1 data point to make any estimate
+        if len(hours_with_data) < 1:
             return None
 
         return round(total_kwh, 1) if total_kwh > 0 else None