Merge conflict

emhass/CHANGELOG.md

@@ -1,13 +1,17 @@
 # Changelog
 
-## [0.3.12] - 2023-06-03
+## [0.3.13] - 2023-06-03
 Improvements and fixes following update of EMHASS code v0.4.12
 ### Improvement
 - Added forecasts for unit_prod_price and unit_load_cost.
 - Improved documentation.
 ### Fix
 - Bump skforecast from 0.8.0 to 0.8.1
 
+## [0.3.12] - 2023-05-30
+### Fix
+- Updated the EMHASS config.yaml template with missing entries.
+
 ## [0.3.11] - 2023-05-29
 ### Fix
 - Fixed error in type entry on add-on config.yaml.

emhass/config.yml

@@ -1,7 +1,7 @@
 name: EMHASS
 description: Energy Management for Home Assistant
 url: https://github.com/davidusb-geek/emhass
-version: 0.3.12
+version: 0.3.13
 slug: emhass
 arch:
   - aarch64
@@ -101,7 +101,7 @@ schema:
   set_nodischarge_to_grid: bool
   set_battery_dynamic: bool
   battery_dynamic_max: float(0.0,1.0)
-  battery_dynamic_min: "float(-1.0,0.0)"
+  battery_dynamic_min: float
   load_forecast_method: str
   sensor_power_photovoltaics: str
   sensor_power_load_no_var_loads: str

emhass/config_emhass.yaml

@@ -48,6 +48,10 @@ optim_conf:
   - lp_solver: 'PULP_CBC_CMD' # set the name of the linear programming solver that will be used
   - lp_solver_path: 'empty' # set the path to the LP solver
   - set_nocharge_from_grid: False # avoid battery charging from the grid
+  - set_nodischarge_to_grid: True # avoid battery discharging to the grid
+  - set_battery_dynamic: False # add a constraint to limit the dynamic of the battery power in power per time unit
+  - battery_dynamic_max: 0.9 # maximum dynamic positive power variation in percentage of battery maximum power
+  - battery_dynamic_min: -0.9 # minimum dynamic negative power variation in percentage of battery maximum power
 
 plant_conf:
   - P_grid_max: 9000 # The maximum power that can be supplied by the utility grid in Watts