Merge pull request #55 from zestysoft/Add_native_GAL_support

Add native gal support

Author: zestysoft

custom_components/sensus_analytics/manifest.json

@@ -1,7 +1,7 @@
 {
   "domain": "sensus_analytics",
   "name": "Sensus Analytics Integration",
-  "version": "1.6.12",
+  "version": "1.7.0",
   "documentation": "https://github.com/zestysoft/sensus_analytics_integration",
   "dependencies": [],
   "codeowners": ["@zestysoft"],

custom_components/sensus_analytics/sensor.py

@@ -42,19 +42,43 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry, async_add_e
 class UsageConversionMixin:
     """Mixin to provide usage conversion."""
 
+    # pylint: disable=too-many-return-statements
     def _convert_usage(self, usage, usage_unit=None):
         """Convert usage based on configuration and native unit."""
         if usage is None:
             return None
         if usage_unit is None:
             usage_unit = self.coordinator.data.get("usageUnit")
-        if usage_unit == "CF" and self.coordinator.config_entry.data.get("unit_type") == "gal":
+
+        config_unit_type = self.coordinator.config_entry.data.get("unit_type")
+
+        if usage_unit == "CF" and config_unit_type == "gal":
             try:
                 return round(float(usage) * CF_TO_GALLON)
             except (ValueError, TypeError):
                 return None
+        elif usage_unit == "GAL" and config_unit_type == "CF":
+            try:
+                return round(float(usage) / CF_TO_GALLON)
+            except (ValueError, TypeError):
+                return None
+        elif usage_unit == "GAL" and config_unit_type == "gal":
+            return usage
         return usage
 
+    def _get_usage_unit(self):
+        """Determine the unit of measurement for usage sensors."""
+        usage_unit = self.coordinator.data.get("usageUnit")
+        config_unit_type = self.coordinator.config_entry.data.get("unit_type")
+
+        if usage_unit == "CF" and config_unit_type == "gal":
+            return "gal"
+        if usage_unit == "GAL" and config_unit_type == "CF":
+            return "CF"
+        if usage_unit == "GAL" and config_unit_type == "gal":
+            return "gal"
+        return usage_unit
+
 
 class DynamicUnitSensorBase(UsageConversionMixin, CoordinatorEntity, SensorEntity):
     """Base class for sensors with dynamic units."""
@@ -72,13 +96,6 @@ def __init__(self, coordinator, entry):
             model="Water Meter",
         )
 
-    def _get_usage_unit(self):
-        """Determine the unit of measurement for usage sensors."""
-        usage_unit = self.coordinator.data.get("usageUnit")
-        if usage_unit == "CF" and self.coordinator.config_entry.data.get("unit_type") == "gal":
-            return "gal"
-        return usage_unit
-
     @property
     def native_unit_of_measurement(self):
         """Return the unit of measurement."""