Merge pull request #204 from fboundy/dev

Dev

README.md

@@ -1,4 +1,4 @@
-# PV Opt: Home Assistant Solar/Battery Optimiser v3.13.2
+# PV Opt: Home Assistant Solar/Battery Optimiser v3.14.0
 
 Solar / Battery Charging Optimisation for Home Assistant. This appDaemon application attempts to optimise charging and discharging of a home solar/battery system to minimise cost electricity cost on a daily basis using freely available solar forecast data from SolCast. This is particularly beneficial for Octopus Agile but is also benefeficial for other time-of-use tariffs such as Octopus Flux or simple Economy 7.
 

apps/pv_opt/config/config.yaml

@@ -20,14 +20,13 @@ pv_opt:
 
   log: pv_opt_log
   prefix: pvopt
-  # debug: True
-
+  debug: false
 
 # User configuration ---  EDIT AWAY! ---
-  inverter_type: "SOLIS_SOLAX_MODBUS"
-  # inverter_type: "SOLIS_CORE_MODBUS"
-  # inverter_type: SOLIS_SOLARMAN
-  device_name: solis
+  # ========================================
+  # System parameters
+  # ========================================
+
 
   # If true the current config in HA will be over-written with that in the config.yaml. 
   overwrite_ha_on_restart: true
@@ -57,6 +56,7 @@ pv_opt:
   # charger_power_watts: 3500
   # inverter_power_watts: 3600
   # inverter_loss_watts: 100
+  # battery_current_limit_amps: 50
 
   # ========================================
   # Solcast configuration
@@ -72,7 +72,7 @@ pv_opt:
   # ========================================
   #
   # use_consumption_history: true
-  consumption_history_days: 2
+  consumption_history_days: 6
   #
   # daily_consumption_kwh: 17
   # shape_consumption_profile: true
@@ -104,11 +104,18 @@ pv_opt:
   #
   # These are the default entities used with the Solis Solax Modbus integration. You can change them here and over-ride the defaults
 
+  # inverter_type: SOLIS_SOLAX_MODBUS
+  # device_name: solis
+
   # battery_voltage: sensor.{device_name}_battery_voltage
   # update_cycle_seconds: 15
   # maximum_dod_percent: number.{device_name}_battery_minimum_soc 
 
-  # id_consumption_today: sensor.{device_name}_consumption_today
+  id_consumption_today: sensor.{device_name}_consumption_today
+  id_consumption:
+    - sensor.{device_name}_house_load
+    - sensor.{device_name}_bypass_load
+
   # id_grid_import_today: sensor.{device_name}_grid_import_today
   # id_grid_export_today: sensor.{device_name}_grid_export_today
 
@@ -134,12 +141,18 @@ pv_opt:
   #
   # These are the default entities used with the Solis Core Modbus integration. You can change them here and over-ride the defaults
 
+  # inverter_type: SOLIS_CORE_MODBUS
+  # device_name: solis
+
   # modbus_hub: "{device_name}"
   # modbus_slave: 1
   # battery_voltage: sensor.{device_name}_battery_voltage
   # maximum_dod_percent: sensor.{device_name}_overdischarge_soc
   # update_cycle_seconds: 60
   # id_consumption_today: sensor.{device_name}_daily_consumption
+  # id_consumption:
+  #   - sensor.{device_name}_house_load_power
+  #   - sensor.{device_name}_backup_load_power
 
   # id_grid_power: sensor.{device_name}_grid_active_power
   # id_inverter_ac_power: sensor.{device_name}_inverter_ac_power
@@ -165,6 +178,9 @@ pv_opt:
   #
   # These are the default entities used with the Solis Solarman integration. You can change them here and over-ride the defaults
 
+  # inverter_type: SOLIS_SOLARMAN
+  # device_name: solis
+
   # battery_voltage: sensor.{device_name}_battery_voltage
   # maximum_dod_percent: 15
   # update_cycle_seconds: 60
@@ -190,9 +206,28 @@ pv_opt:
 
   # id_inverter_mode: sensor.{device_name}_storage_control_mode
 
+  # ===============================================================================================================
+  # Brand / Integration Specific Config: SUNSYNK_SOLARSYNK2: 
+  # ===============================================================================================================
+  #
+  #
+  # These are the default entities used with the Sunsynk Solarsynk2 integration. You can change them here and over-ride the defaults
+
+  # inverter_type: SUNSYNK_SOLARSYNK2
+  # device_name: solarsynk
+  # inverter_sn: 000000  # enter {sunsynk_serial} from solarsynk2 addon
+
+  # maximum_dod_percent:  20
+  # id_battery_soc:  sensor.{device_name}_{inverter_sn}_battery_soc
+  # id_consumption_today: sensor.{device_name}_{inverter_sn}_day_load_energy
+  # id_grid_import_today: sensor.{device_name}_{inverter_sn}_day_grid_import
+  # id_grid_export_today: sensor.{device_name}_{inverter_sn}_day_grid_export
+  # supports_hold_soc: false
+  # update_cycle_seconds: 300
 
 # Tariff comparison
-  id_daily_solar: sensor.{device_name}_power_generation_today
+  # id_daily_solar: sensor.{device_name}_power_generation_today
+  id_solar_power: sensor.{device_name}_pv_total_power
   alt_tariffs:
     - name: Agile_Fix
       octopus_import_tariff_code: E-1R-AGILE-23-12-06-G
@@ -201,6 +236,7 @@ pv_opt:
     - name: Eco7_Fix
       octopus_import_tariff_code: E-2R-VAR-22-11-01-G
       octopus_export_tariff_code: E-1R-OUTGOING-FIX-12M-19-05-13-G
+
     - name: Flux
       octopus_import_tariff_code: E-1R-FLUX-IMPORT-23-02-14-G
       octopus_export_tariff_code: E-1R-FLUX-EXPORT-23-02-14-G

apps/pv_opt/pv_opt.code-workspace

@@ -0,0 +1,11 @@
+{
+	"folders": [
+		{
+			"path": "../.."
+		},
+		{
+			"path": "W:/logs"
+		}
+	],
+	"settings": {}
+}