Implement sliding-window smoothing for production, consumption, and battery with battery recharge reserve

README-fr.md

@@ -52,6 +52,11 @@
 - [Les contributions sont les bienvenues !](#les-contributions-sont-les-bienvenues)
 
 > ![Nouveau](https://github.com/jmcollin78/solar_optimizer/blob/main/images/new-icon.png?raw=true) _*Nouveautés*_
+> * **release 3.6.0** :
+>   - **Calcul de puissance simplifié** : L'algorithme attend maintenant la consommation de base de la maison (en watts positifs), offrant une optimisation plus précise
+>   - **Configuration mise à jour** : `power_consumption_entity_id` doit maintenant représenter la consommation de la maison, pas la mesure nette. Voir [Créer des capteurs template pour votre installation](#créer-des-capteurs-template-pour-votre-installation) pour le guide de migration
+>   - **Amélioration de la gestion de la batterie** : Le capteur de puissance de charge de la batterie est maintenant optionnel (utilisé uniquement pour les diagnostics). La réserve et le SOC de la batterie sont gérés plus efficacement
+>   - **Lissage par défaut mis à jour** : Le lissage de production PV est maintenant par défaut à 15 minutes pour une meilleure stabilité. Lissage de la consommation et de la batterie désactivé par défaut
 > * **release 3.5.0** :
 >   - ajout d'une gestion de la priorité. Cf. [la gestion de la priorité](#la-gestion-de-la-priorité)
 > * **release 3.2.0** :

README.md

@@ -53,6 +53,11 @@
 
 
 >![New](https://github.com/jmcollin78/solar_optimizer/blob/main/images/new-icon.png?raw=true) _*News*_
+> * **release 3.6.0**:
+>   - **Simplified power calculation**: The algorithm now expects household base consumption (positive watts) as input, providing more accurate optimization
+>   - **Updated configuration**: `power_consumption_entity_id` should now represent household consumption, not net metering. See [Creating Sensor Templates](#creating-sensor-templates-for-your-installation) for migration guidance
+>   - **Battery handling improvements**: Battery charge power sensor is now optional (used for diagnostics only). Battery reserve and SOC are handled more efficiently
+>   - **Default smoothing updated**: PV production smoothing now defaults to 15 minutes for better stability. Consumption and battery smoothing disabled by default
 > * **release 3.5.0**:
 >   - added support for priority management. See [Priority Management](#priority-management)
 > * **release 3.2.0** :
@@ -584,7 +589,36 @@ data: {}
 
 Your setup may require the creation of specific sensors that need to be configured [here](README-en.md#configure-the-integration-for-the-first-time). The rules for these sensors are crucial and must be strictly followed to ensure the proper functioning of Solar Optimizer.
 
-Below are my sensor templates (applicable only for an Enphase installation):
+## Important: Household Consumption Sensor
+
+**As of version 3.6.0**, Solar Optimizer expects the `power_consumption_entity_id` to represent **positive household base consumption in watts**. This is the power consumed by your home, excluding the managed devices controlled by Solar Optimizer.
+
+### What this means:
+- The sensor should report **positive values** representing actual household consumption
+- It should **not** include the power of devices managed by Solar Optimizer (they are tracked separately)
+- If you use a **net-metering sensor** (where negative values indicate export to grid), you should create a template sensor to convert it to positive household consumption
+
+### Example scenarios:
+1. **If you have a direct household consumption sensor**: Use it directly
+2. **If you have a net-metering sensor**: Create a template sensor like:
+   ```yaml
+   - sensor:
+       - name: "Household Base Consumption (W)"
+         unit_of_measurement: "W"
+         device_class: power
+         state_class: measurement
+         state: >
+           {% set net_power = states('sensor.your_net_power_sensor') | float(default=0) %}
+           {{ [0, net_power] | max }}
+   ```
+
+### Battery handling:
+- Battery state of charge (SOC) is used for device usability rules
+- Battery reserve can be configured to prioritize battery charging over devices
+- Battery charge power sensor is now **optional** and used only for diagnostics
+- The algorithm automatically accounts for battery behavior through the configured reserve
+
+Below are example sensor templates (applicable for an Enphase installation):
 
 ### File `configuration.yaml`:
 ```

custom_components/solar_optimizer/config_schema.py

@@ -53,6 +53,12 @@
             selector.EntitySelectorConfig(domain=[SENSOR_DOMAIN, INPUT_NUMBER_DOMAIN])
         ),
         vol.Optional(CONF_SMOOTH_PRODUCTION, default=True): cv.boolean,
+        vol.Optional(CONF_SMOOTHING_PRODUCTION_WINDOW_MIN, default=DEFAULT_SMOOTHING_PRODUCTION_WINDOW_MIN): vol.Coerce(int),
+        vol.Optional(CONF_SMOOTHING_CONSUMPTION_WINDOW_MIN, default=DEFAULT_SMOOTHING_CONSUMPTION_WINDOW_MIN): vol.Coerce(int),
+        vol.Optional(CONF_SMOOTHING_HOUSEHOLD_WINDOW_MIN, default=DEFAULT_SMOOTHING_HOUSEHOLD_WINDOW_MIN): vol.Coerce(int),
+        vol.Optional(CONF_BATTERY_RECHARGE_RESERVE_W, default=DEFAULT_BATTERY_RECHARGE_RESERVE_W): vol.Coerce(float),
+        vol.Optional(CONF_BATTERY_RECHARGE_RESERVE_BEFORE_SMOOTHING, default=DEFAULT_BATTERY_RECHARGE_RESERVE_BEFORE_SMOOTHING): cv.boolean,
+        vol.Optional(CONF_MIN_EXPORT_MARGIN_W, default=DEFAULT_MIN_EXPORT_MARGIN_W): vol.Coerce(float),
         vol.Optional(CONF_BATTERY_SOC_ENTITY_ID): selector.EntitySelector(
             selector.EntitySelectorConfig(domain=[SENSOR_DOMAIN, INPUT_NUMBER_DOMAIN])
         ),

custom_components/solar_optimizer/const.py

@@ -19,6 +19,12 @@
 
 DEFAULT_REFRESH_PERIOD_SEC = 300
 DEFAULT_RAZ_TIME = "05:00"
+DEFAULT_SMOOTHING_PRODUCTION_WINDOW_MIN = 15
+DEFAULT_SMOOTHING_CONSUMPTION_WINDOW_MIN = 0
+DEFAULT_SMOOTHING_HOUSEHOLD_WINDOW_MIN = 0
+DEFAULT_BATTERY_RECHARGE_RESERVE_W = 0.0
+DEFAULT_BATTERY_RECHARGE_RESERVE_BEFORE_SMOOTHING = False
+DEFAULT_MIN_EXPORT_MARGIN_W = 0.0
 
 CONF_ACTION_MODE_ACTION = "action_call"
 CONF_ACTION_MODE_EVENT = "event"
@@ -55,6 +61,12 @@
 CONF_BUY_COST_ENTITY_ID = "buy_cost_entity_id"
 CONF_SELL_TAX_PERCENT_ENTITY_ID = "sell_tax_percent_entity_id"
 CONF_SMOOTH_PRODUCTION = "smooth_production"
+CONF_SMOOTHING_PRODUCTION_WINDOW_MIN = "smoothing_production_window_min"
+CONF_SMOOTHING_CONSUMPTION_WINDOW_MIN = "smoothing_consumption_window_min"
+CONF_SMOOTHING_HOUSEHOLD_WINDOW_MIN = "smoothing_household_window_min"
+CONF_BATTERY_RECHARGE_RESERVE_W = "battery_recharge_reserve_w"
+CONF_BATTERY_RECHARGE_RESERVE_BEFORE_SMOOTHING = "battery_recharge_reserve_before_smoothing"
+CONF_MIN_EXPORT_MARGIN_W = "min_export_margin_w"
 CONF_REFRESH_PERIOD_SEC = "refresh_period_sec"
 CONF_NAME = "name"
 CONF_ENTITY_ID = "entity_id"