release prep

Author: 0xAHA

custom_components/growatt_modbus/__init__.py

@@ -6,6 +6,8 @@
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.typing import ConfigType
+from homeassistant.helpers import config_validation as cv
+
 
 from .const import DOMAIN
 from .coordinator import GrowattModbusCoordinator
@@ -14,7 +16,7 @@
 
 CONFIG_SCHEMA = cv.config_entry_only_config_schema(DOMAIN)
 
-PLATFORMS: list[Platform] = [Platform.SENSOR]
+PLATFORMS: list[Platform] = [Platform.SENSOR, Platform.BINARY_SENSOR]
 
 
 async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:

custom_components/growatt_modbus/binary_sensor.py

@@ -0,0 +1,80 @@
+"""Binary sensor platform for Growatt Modbus Integration."""
+import logging
+from datetime import datetime, timedelta
+from typing import Any
+
+from homeassistant.components.binary_sensor import (
+    BinarySensorDeviceClass,
+    BinarySensorEntity,
+)
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.update_coordinator import CoordinatorEntity
+
+from .const import DOMAIN
+from .coordinator import GrowattModbusCoordinator
+
+_LOGGER = logging.getLogger(__name__)
+
+
+async def async_setup_entry(
+    hass: HomeAssistant,
+    config_entry: ConfigEntry,
+    async_add_entities: AddEntitiesCallback,
+) -> None:
+    """Set up Growatt Modbus binary sensors."""
+    coordinator = hass.data[DOMAIN][config_entry.entry_id]
+    
+    entities = [
+        GrowattInverterOnlineSensor(coordinator, config_entry),
+    ]
+    
+    async_add_entities(entities)
+
+
+class GrowattInverterOnlineSensor(CoordinatorEntity, BinarySensorEntity):
+    """Binary sensor for inverter online status."""
+
+    _attr_device_class = BinarySensorDeviceClass.CONNECTIVITY
+
+    def __init__(
+        self,
+        coordinator: GrowattModbusCoordinator,
+        config_entry: ConfigEntry,
+    ) -> None:
+        """Initialize the binary sensor."""
+        super().__init__(coordinator)
+        
+        self._config_entry = config_entry
+        self._attr_name = f"{config_entry.data['name']} Inverter Online"
+        self._attr_unique_id = f"{config_entry.entry_id}_inverter_online"
+        self._attr_icon = "mdi:solar-power-variant"
+
+    @property
+    def device_info(self) -> dict[str, Any]:
+        """Return device information."""
+        return self.coordinator.device_info
+
+    @property
+    def is_on(self) -> bool:
+        """Return true if inverter is online (responding to Modbus)."""
+        if self.coordinator.last_successful_update is None:
+            return False
+        
+        # Consider online if last update was within 5 minutes
+        time_since_update = datetime.now() - self.coordinator.last_successful_update
+        return time_since_update < timedelta(minutes=5)
+
+    @property
+    def extra_state_attributes(self) -> dict[str, Any] | None:
+        """Return additional state attributes."""
+        if self.coordinator.last_successful_update is None:
+            return None
+        
+        time_since_update = datetime.now() - self.coordinator.last_successful_update
+        
+        return {
+            "last_successful_update": self.coordinator.last_successful_update.isoformat(),
+            "seconds_since_update": int(time_since_update.total_seconds()),
+        }

custom_components/growatt_modbus/config_flow.py

@@ -34,14 +34,14 @@
     vol.Required(CONF_HOST): str,
     vol.Required(CONF_PORT, default=DEFAULT_PORT): int,
     vol.Required(CONF_SLAVE_ID, default=DEFAULT_SLAVE_ID): int,
-    vol.Required(CONF_REGISTER_MAP, default="MIN_10000_VARIANT_A"): vol.In(list(REGISTER_MAPS.keys())),
+    vol.Required(CONF_REGISTER_MAP, default="MIN_10000_TL_X_OFFICIAL"): vol.In(list(REGISTER_MAPS.keys())),  # ← Changed here
 })
 
 STEP_SERIAL_DATA_SCHEMA = vol.Schema({
     vol.Required(CONF_DEVICE_PATH, default="/dev/ttyUSB0"): str,
     vol.Required(CONF_BAUDRATE, default=DEFAULT_BAUDRATE): int,
     vol.Required(CONF_SLAVE_ID, default=DEFAULT_SLAVE_ID): int,
-    vol.Required(CONF_REGISTER_MAP, default="MIN_10000_VARIANT_A"): vol.In(list(REGISTER_MAPS.keys())),
+    vol.Required(CONF_REGISTER_MAP, default="MIN_10000_TL_X_OFFICIAL"): vol.In(list(REGISTER_MAPS.keys())),  # ← Changed here
 })
 
 

custom_components/growatt_modbus/const.py

@@ -33,7 +33,7 @@
 MIN_10000_TL_X_OFFICIAL = {
     'name': 'MIN-10000-TL-X Official (Protocol V1.39)',
     'description': 'Official register mapping from Growatt Protocol V1.39 documentation',
-    'notes': 'Power registers are 32-bit pairs (HIGH/LOW). Grid frequency uses raw register 37.',
+    'notes': 'Power registers are 32-bit pairs (HIGH/LOW). Supports PV1-PV3 strings.',
     'input_registers': {
         # System Status
         3000: {'name': 'inverter_status', 'scale': 1, 'unit': '', 'desc': '0=Waiting, 1=Normal, 3=Fault'},
@@ -54,6 +54,12 @@
         3009: {'name': 'pv2_power_high', 'scale': 1, 'unit': '', 'desc': 'PV2 power HIGH word', 'pair': 3010},
         3010: {'name': 'pv2_power_low', 'scale': 1, 'unit': '', 'desc': 'PV2 power LOW word', 'pair': 3009, 'combined_scale': 0.1, 'combined_unit': 'W'},
 
+        # PV String 3 (if available on model)
+        3011: {'name': 'pv3_voltage', 'scale': 0.1, 'unit': 'V', 'desc': 'PV3 DC voltage'},
+        3012: {'name': 'pv3_current', 'scale': 0.1, 'unit': 'A', 'desc': 'PV3 DC current'},
+        3013: {'name': 'pv3_power_high', 'scale': 1, 'unit': '', 'desc': 'PV3 power HIGH word', 'pair': 3014},
+        3014: {'name': 'pv3_power_low', 'scale': 1, 'unit': '', 'desc': 'PV3 power LOW word', 'pair': 3013, 'combined_scale': 0.1, 'combined_unit': 'W'},
+        
         # System Output Power (32-bit)
         3019: {'name': 'system_output_power_high', 'scale': 1, 'unit': '', 'desc': 'System output power HIGH', 'pair': 3020},
         3020: {'name': 'system_output_power_low', 'scale': 1, 'unit': '', 'desc': 'System output power LOW', 'pair': 3019, 'combined_scale': 0.1, 'combined_unit': 'W'},
@@ -159,6 +165,10 @@
         8: {'name': 'pv2_current', 'scale': 0.1, 'unit': 'A'},
         9: {'name': 'pv2_power_high', 'scale': 1, 'unit': '', 'pair': 10},
         10: {'name': 'pv2_power_low', 'scale': 1, 'unit': '', 'pair': 9, 'combined_scale': 0.1, 'combined_unit': 'W'},
+        11: {'name': 'pv3_voltage', 'scale': 0.1, 'unit': 'V'},
+        12: {'name': 'pv3_current', 'scale': 0.1, 'unit': 'A'},
+        13: {'name': 'pv3_power_high', 'scale': 1, 'unit': '', 'pair': 14},
+        14: {'name': 'pv3_power_low', 'scale': 1, 'unit': '', 'pair': 13, 'combined_scale': 0.1, 'combined_unit': 'W'},
         35: {'name': 'output_power_high', 'scale': 1, 'unit': '', 'pair': 36},
         36: {'name': 'output_power_low', 'scale': 1, 'unit': '', 'pair': 35, 'combined_scale': 0.1, 'combined_unit': 'W'},
         37: {'name': 'grid_frequency', 'scale': 0.01, 'unit': 'Hz'},

custom_components/growatt_modbus/growatt_modbus.py

@@ -62,6 +62,9 @@ class GrowattData:
     pv2_voltage: float = 0.0          # V
     pv2_current: float = 0.0          # A
     pv2_power: float = 0.0            # W
+    pv3_voltage: float = 0.0          # V
+    pv3_current: float = 0.0          # A
+    pv3_power: float = 0.0            # W
     pv_total_power: float = 0.0       # W
 
     # AC Output
@@ -401,45 +404,46 @@ def read_all_data(self) -> Optional[GrowattData]:
             # PV String 1
             pv1_voltage_addr = self._find_register_by_name('pv1_voltage')
             pv1_current_addr = self._find_register_by_name('pv1_current')
-            pv1_power_addr = self._find_register_by_name('pv1_power')
+            pv1_power_low_addr = self._find_register_by_name('pv1_power_low')
 
             if pv1_voltage_addr:
                 data.pv1_voltage = self._get_register_value(pv1_voltage_addr) or 0.0
             if pv1_current_addr:
                 data.pv1_current = self._get_register_value(pv1_current_addr) or 0.0
-            if pv1_power_addr:
-                # For 32-bit power, read the LOW word (which has combined_scale)
-                pv1_power_low_addr = self._find_register_by_name('pv1_power_low')
-                if pv1_power_low_addr:
-                    data.pv1_power = self._get_register_value(pv1_power_low_addr) or 0.0
-                else:
-                    # Fallback for single register power
-                    data.pv1_power = self._get_register_value(pv1_power_addr) or 0.0
+            if pv1_power_low_addr:
+                data.pv1_power = self._get_register_value(pv1_power_low_addr) or 0.0
 
             # PV String 2
             pv2_voltage_addr = self._find_register_by_name('pv2_voltage')
             pv2_current_addr = self._find_register_by_name('pv2_current')
-            pv2_power_addr = self._find_register_by_name('pv2_power')
+            pv2_power_low_addr = self._find_register_by_name('pv2_power_low')
 
             if pv2_voltage_addr:
                 data.pv2_voltage = self._get_register_value(pv2_voltage_addr) or 0.0
             if pv2_current_addr:
                 data.pv2_current = self._get_register_value(pv2_current_addr) or 0.0
-            if pv2_power_addr:
-                # For 32-bit power, read the LOW word
-                pv2_power_low_addr = self._find_register_by_name('pv2_power_low')
-                if pv2_power_low_addr:
-                    data.pv2_power = self._get_register_value(pv2_power_low_addr) or 0.0
-                else:
-                    data.pv2_power = self._get_register_value(pv2_power_addr) or 0.0
+            if pv2_power_low_addr:
+                data.pv2_power = self._get_register_value(pv2_power_low_addr) or 0.0
+            
+            # PV String 3 (if available)
+            pv3_voltage_addr = self._find_register_by_name('pv3_voltage')
+            pv3_current_addr = self._find_register_by_name('pv3_current')
+            pv3_power_low_addr = self._find_register_by_name('pv3_power_low')
+            
+            if pv3_voltage_addr:
+                data.pv3_voltage = self._get_register_value(pv3_voltage_addr) or 0.0
+            if pv3_current_addr:
+                data.pv3_current = self._get_register_value(pv3_current_addr) or 0.0
+            if pv3_power_low_addr:
+                data.pv3_power = self._get_register_value(pv3_power_low_addr) or 0.0
 
             # Total PV Power
             pv_total_addr = self._find_register_by_name('pv_total_power_low')
             if pv_total_addr:
                 data.pv_total_power = self._get_register_value(pv_total_addr) or 0.0
             else:
                 # Calculate from strings if not available
-                data.pv_total_power = data.pv1_power + data.pv2_power
+                data.pv_total_power = data.pv1_power + data.pv2_power + data.pv3_power
 
             # AC Output
             ac_voltage_addr = self._find_register_by_name('ac_voltage')
@@ -505,7 +509,7 @@ def read_all_data(self) -> Optional[GrowattData]:
             if warning_addr:
                 data.warning_code = int(self._get_register_value(warning_addr) or 0)
 
-            logger.debug(f"Read data: PV={data.pv_total_power}W, AC={data.ac_power}W, Temp={data.inverter_temp}°C")
+            logger.debug(f"Read data: PV={data.pv_total_power}W (PV1={data.pv1_power}W, PV2={data.pv2_power}W, PV3={data.pv3_power}W), AC={data.ac_power}W, Temp={data.inverter_temp}°C")
 
         except Exception as e:
             logger.error(f"Error parsing register data: {e}", exc_info=True)