Merge pull request #79 from Monitor-My-Solar/monitormysolarDEV

Bug fix on energy dash for some users, added more combined entities f…

Author: zakery292

custom_components/monitormysolar/config_flow.py

@@ -14,6 +14,30 @@ class InverterMQTTFlowHandler(config_entries.ConfigFlow, domain=DOMAIN):
 
     VERSION = 1
 
+    def _normalize_dongle_id(self, dongle_id):
+        """Normalize dongle ID to format: dongle-XX:XX:XX:XX:XX:XX."""
+        if not dongle_id:
+            return ""
+        
+        # Remove any whitespace
+        dongle_id = dongle_id.strip()
+        
+        # Extract MAC address part (everything after 'dongle-' or the whole string if no prefix)
+        if dongle_id.lower().startswith("dongle-"):
+            mac_part = dongle_id[7:]  # Remove 'dongle-' prefix
+        else:
+            mac_part = dongle_id
+        
+        # Normalize MAC address: remove non-alphanumeric chars and ensure uppercase
+        mac_part = ''.join(c for c in mac_part if c.isalnum()).upper()
+        
+        # Insert colons if not present (assuming 12 character MAC)
+        if len(mac_part) == 12 and ':' not in mac_part:
+            mac_part = ':'.join(mac_part[i:i+2] for i in range(0, 12, 2))
+        
+        # Return normalized format
+        return f"dongle-{mac_part}"
+    
     def _get_inverter_title(self, brand, dongle_count=1):
         """Generate a proper title based on brand and number of dongles."""
         # Map brand codes to proper names
@@ -40,6 +64,9 @@ async def async_step_user(self, user_input=None):
         if user_input is not None:
             _LOGGER.debug("User input received: %s", user_input)
 
+            # Normalize the dongle ID
+            user_input["dongle_id"] = self._normalize_dongle_id(user_input["dongle_id"])
+            
             # If parallel inverters is selected, store the data and move to the parallel step
             if user_input.get("parallel_inverters", False):
                 self.initial_data = user_input
@@ -90,7 +117,9 @@ async def async_step_parallel(self, user_input=None):
             for i in range(1, 4):  # Check for dongle_id_2, dongle_id_3, dongle_id_4
                 additional_dongle = user_input.get(f"dongle_id_{i+1}")
                 if additional_dongle and additional_dongle.strip():
-                    dongle_ids.append(additional_dongle)
+                    # Normalize the additional dongle ID
+                    normalized_dongle = self._normalize_dongle_id(additional_dongle)
+                    dongle_ids.append(normalized_dongle)
                     # Get corresponding IP or empty string
                     additional_ip = user_input.get(f"dongle_ip_{i+1}", "")
                     dongle_ips.append(additional_ip)
@@ -141,6 +170,30 @@ def config_entry(self):
         """Return the config entry."""
         return self._config_entry
 
+    def _normalize_dongle_id(self, dongle_id):
+        """Normalize dongle ID to format: dongle-XX:XX:XX:XX:XX:XX."""
+        if not dongle_id:
+            return ""
+        
+        # Remove any whitespace
+        dongle_id = dongle_id.strip()
+        
+        # Extract MAC address part (everything after 'dongle-' or the whole string if no prefix)
+        if dongle_id.lower().startswith("dongle-"):
+            mac_part = dongle_id[7:]  # Remove 'dongle-' prefix
+        else:
+            mac_part = dongle_id
+        
+        # Normalize MAC address: remove non-alphanumeric chars and ensure uppercase
+        mac_part = ''.join(c for c in mac_part if c.isalnum()).upper()
+        
+        # Insert colons if not present (assuming 12 character MAC)
+        if len(mac_part) == 12 and ':' not in mac_part:
+            mac_part = ':'.join(mac_part[i:i+2] for i in range(0, 12, 2))
+        
+        # Return normalized format
+        return f"dongle-{mac_part}"
+    
     def _get_inverter_title(self, brand, dongle_count=1):
         """Generate a proper title based on brand and number of dongles."""
         # Map brand codes to proper names
@@ -198,7 +251,8 @@ async def async_step_add_dongle(self, user_input=None):
         errors = {}
 
         if user_input is not None:
-            new_dongle_id = user_input["dongle_id"]
+            # Normalize the new dongle ID
+            new_dongle_id = self._normalize_dongle_id(user_input["dongle_id"])
             new_dongle_ip = user_input.get("dongle_ip", "")
 
             # Get current data

custom_components/monitormysolar/const.py

@@ -473,6 +473,11 @@
                 ,
                 "combined": [
                     {"name": "Combined PV Power Total", "type": "sensor", "unique_id": "combined_pv_power", "state_class": SensorStateClass.MEASUREMENT, "device_class": SensorDeviceClass.POWER, "unit_of_measurement": UnitOfPower.WATT, "calculation": {"operation": "addition", "source_entity": "pall"}},
+                    {"name": "Combined House Power Load", "type": "sensor", "unique_id": "combined_house_power_load", "state_class": SensorStateClass.MEASUREMENT, "device_class": SensorDeviceClass.POWER, "unit_of_measurement": UnitOfPower.WATT, "calculation": {"operation": "addition", "source_entity": "pload"}},
+                    {"name": "Combined Energy To Grid Day", "type": "sensor", "unique_id": "combined_energy_to_grid_day", "state_class": SensorStateClass.TOTAL_INCREASING, "unit_of_measurement": UnitOfEnergy.KILO_WATT_HOUR, "device_class": SensorDeviceClass.ENERGY, "calculation": {"operation": "addition", "source_entity": "etogrid_day"}},
+                    {"name": "Combined Energy To User Day", "type": "sensor", "unique_id": "combined_energy_to_user_day", "state_class": SensorStateClass.TOTAL_INCREASING, "unit_of_measurement": UnitOfEnergy.KILO_WATT_HOUR, "device_class": SensorDeviceClass.ENERGY, "calculation": {"operation": "addition", "source_entity": "etouser_day"}},
+                    {"name": "Combined Energy To Grid (live)", "type": "sensor", "unique_id": "combined_energy_to_grid_live", "state_class": SensorStateClass.MEASUREMENT, "device_class": SensorDeviceClass.POWER, "unit_of_measurement": UnitOfPower.WATT, "calculation": {"operation": "addition", "source_entity": "ptogrid"}},
+                    {"name": "Combined Energy To User (live)", "type": "sensor", "unique_id": "combined_energy_to_user_live", "state_class": SensorStateClass.MEASUREMENT, "device_class": SensorDeviceClass.POWER, "unit_of_measurement": UnitOfPower.WATT, "calculation": {"operation": "addition", "source_entity": "ptouser"}},
                     {"name": "Combined Discharge", "type": "sensor", "unique_id": "combined_discharge", "state_class": SensorStateClass.MEASUREMENT, "device_class": SensorDeviceClass.POWER, "unit_of_measurement": UnitOfPower.WATT, "calculation": {"operation": "addition", "source_entity": "pdischarge"}},
                     {"name": "Combined Charge", "type": "sensor", "unique_id": "combined_charge", "state_class": SensorStateClass.MEASUREMENT, "device_class": SensorDeviceClass.POWER, "unit_of_measurement": UnitOfPower.WATT, "calculation": {"operation": "addition", "source_entity": "pcharge"}},
                     {"name": "Combined SOC", "type": "sensor", "unique_id": "combined_soc", "state_class": SensorStateClass.MEASUREMENT, "device_class": SensorDeviceClass.BATTERY, "unit_of_measurement": PERCENTAGE, "calculation": {"operation": "average", "source_entity": "soc"}},

custom_components/monitormysolar/manifest.json

@@ -10,6 +10,6 @@
   "issue_tracker": "https://github.com/Monitor-My-Solar/monitormysolar",
   "loggers": [],
   "requirements": [],    
-  "version": "3.0.3"
+  "version": "3.0.4"
 }
 

custom_components/monitormysolar/sensor.py

@@ -168,6 +168,13 @@ def unit_of_measurement(self):
     @property
     def device_class(self):
         return self.sensor_info.get("device_class")
+    
+    @property
+    def suggested_display_precision(self):
+        """Return the suggested display precision for energy sensors."""
+        if self.device_class == SensorDeviceClass.ENERGY:
+            return 2
+        return None
 
     @property
     def last_reset(self):
@@ -305,6 +312,13 @@ def unit_of_measurement(self):
     @property
     def device_class(self):
         return self.sensor_info.get("device_class")
+    
+    @property
+    def suggested_display_precision(self):
+        """Return the suggested display precision for energy sensors."""
+        if self.device_class == SensorDeviceClass.ENERGY:
+            return 2
+        return None
 
     @property
     def extra_state_attributes(self):
@@ -382,6 +396,13 @@ def unit_of_measurement(self):
     @property
     def device_class(self):
         return self.sensor_info.get("device_class")
+    
+    @property
+    def suggested_display_precision(self):
+        """Return the suggested display precision for energy sensors."""
+        if self.device_class == SensorDeviceClass.ENERGY:
+            return 2
+        return None
 
 
     @property
@@ -459,6 +480,13 @@ def unit_of_measurement(self):
     @property
     def device_class(self):
         return self.sensor_info.get("device_class")
+    
+    @property
+    def suggested_display_precision(self):
+        """Return the suggested display precision for energy sensors."""
+        if self.device_class == SensorDeviceClass.ENERGY:
+            return 2
+        return None
 
 
     @property
@@ -531,6 +559,13 @@ def state(self):
     @property
     def device_class(self):
         return self.sensor_info.get("device_class")
+    
+    @property
+    def suggested_display_precision(self):
+        """Return the suggested display precision for energy sensors."""
+        if self.device_class == SensorDeviceClass.ENERGY:
+            return 2
+        return None
 
     @property
     def extra_state_attributes(self):
@@ -711,6 +746,13 @@ def unit_of_measurement(self):
     @property
     def device_class(self):
         return self.sensor_info.get("device_class")
+    
+    @property
+    def suggested_display_precision(self):
+        """Return the suggested display precision for energy sensors."""
+        if self.device_class == SensorDeviceClass.ENERGY:
+            return 2
+        return None
 
     @property
     def device_info(self):
@@ -840,6 +882,13 @@ def unit_of_measurement(self):
     @property
     def device_class(self):
         return self.sensor_info.get("device_class")
+    
+    @property
+    def suggested_display_precision(self):
+        """Return the suggested display precision for energy sensors."""
+        if self.device_class == SensorDeviceClass.ENERGY:
+            return 2
+        return None
 
     @property
     def last_reset(self):
@@ -1004,6 +1053,13 @@ def unit_of_measurement(self):
     @property
     def device_class(self):
         return self.sensor_info.get("device_class")
+    
+    @property
+    def suggested_display_precision(self):
+        """Return the suggested display precision for energy sensors."""
+        if self.device_class == SensorDeviceClass.ENERGY:
+            return 2
+        return None
 
     @property
     def available(self):