move unit_conversion to utils

Author: hcarter-775

drivers/SmartThings/matter-sensor/src/sub_drivers/air_quality_sensor/air_quality_sensor_handlers/attribute_handlers.lua

@@ -3,55 +3,42 @@
 
 local st_utils = require "st.utils"
 local capabilities = require "st.capabilities"
-local fields = require "sub_drivers.air_quality_sensor.air_quality_sensor_utils.fields"
+local aqs_utils = require "sub_drivers.air_quality_sensor.air_quality_sensor_utils.utils"
+local aqs_fields = require "sub_drivers.air_quality_sensor.air_quality_sensor_utils.fields"
 
-local AirQualityServerAttributeHandlers = {}
+local AirQualitySensorAttributeHandlers = {}
 
 
 -- [[ GENERIC CONCENTRATION MEASUREMENT CLUSTER ATTRIBUTES ]]
 
-function AirQualityServerAttributeHandlers.measurement_unit_factory(capability_name)
+function AirQualitySensorAttributeHandlers.measurement_unit_factory(capability_name)
   return function(driver, device, ib, response)
     device:set_field(capability_name.."_unit", ib.data.value, {persist = true})
   end
 end
 
-function AirQualityServerAttributeHandlers.level_value_factory(attribute)
+function AirQualitySensorAttributeHandlers.level_value_factory(attribute)
   return function(driver, device, ib, response)
-    device:emit_event_for_endpoint(ib.endpoint_id, attribute(fields.level_strings[ib.data.value]))
+    device:emit_event_for_endpoint(ib.endpoint_id, attribute(aqs_fields.level_strings[ib.data.value]))
   end
 end
 
-local function unit_conversion(device, value, from_unit, to_unit)
-  local conversion_function = fields.conversion_tables[from_unit][to_unit]
-  if conversion_function == nil then
-    device.log.info_with( {hub_logs = true} , string.format("Unsupported unit conversion from %s to %s", fields.unit_strings[from_unit], fields.unit_strings[to_unit]))
-    return 1
-  end
-
-  if value == nil then
-    device.log.info_with( {hub_logs = true} , "unit conversion value is nil")
-    return 1
-  end
-  return conversion_function(value)
-end
-
-function AirQualityServerAttributeHandlers.measured_value_factory(capability_name, attribute, target_unit)
+function AirQualitySensorAttributeHandlers.measured_value_factory(capability_name, attribute, target_unit)
   return function(driver, device, ib, response)
     local reporting_unit = device:get_field(capability_name.."_unit")
 
     if reporting_unit == nil then
-      reporting_unit = fields.unit_default[capability_name]
+      reporting_unit = aqs_fields.unit_default[capability_name]
       device:set_field(capability_name.."_unit", reporting_unit, {persist = true})
     end
 
     if reporting_unit then
-      local value = unit_conversion(device, ib.data.value, reporting_unit, target_unit)
-      device:emit_event_for_endpoint(ib.endpoint_id, attribute({value = value, unit = fields.unit_strings[target_unit]}))
+      local value = aqs_utils.unit_conversion(device, ib.data.value, reporting_unit, target_unit)
+      device:emit_event_for_endpoint(ib.endpoint_id, attribute({value = value, unit = aqs_fields.unit_strings[target_unit]}))
 
       -- handle case where device profile supports both fineDustLevel and dustLevel
       if capability_name == capabilities.fineDustSensor.NAME and device:supports_capability(capabilities.dustSensor) then
-        device:emit_event_for_endpoint(ib.endpoint_id, capabilities.dustSensor.fineDustLevel({value = value, unit = fields.unit_strings[target_unit]}))
+        device:emit_event_for_endpoint(ib.endpoint_id, capabilities.dustSensor.fineDustLevel({value = value, unit = aqs_fields.unit_strings[target_unit]}))
       end
     end
   end
@@ -60,7 +47,7 @@ end
 
 -- [[ AIR QUALITY CLUSTER ATTRIBUTES ]] --
 
-function AirQualityServerAttributeHandlers.air_quality_handler(driver, device, ib, response)
+function AirQualitySensorAttributeHandlers.air_quality_handler(driver, device, ib, response)
   local state = ib.data.value
   if state == 0 then -- Unknown
     device:emit_event_for_endpoint(ib.endpoint_id, capabilities.airQualityHealthConcern.airQualityHealthConcern.unknown())
@@ -82,9 +69,9 @@ end
 
 -- [[ PRESSURE MEASUREMENT CLUSTER ATTRIBUTES ]] --
 
-function AirQualityServerAttributeHandlers.pressure_measured_value_handler(driver, device, ib, response)
+function AirQualitySensorAttributeHandlers.pressure_measured_value_handler(driver, device, ib, response)
   local pressure = st_utils.round(ib.data.value / 10.0)
   device:emit_event_for_endpoint(ib.endpoint_id, capabilities.atmosphericPressureMeasurement.atmosphericPressure(pressure))
 end
 
-return AirQualityServerAttributeHandlers
+return AirQualitySensorAttributeHandlers

drivers/SmartThings/matter-sensor/src/sub_drivers/air_quality_sensor/air_quality_sensor_utils/utils.lua

@@ -40,6 +40,20 @@ function AirQualitySensorUtils.supports_capability_by_id_modular(device, capabil
   return false
 end
 
+function AirQualitySensorUtils.unit_conversion(device, value, from_unit, to_unit)
+  local conversion_function = fields.conversion_tables[from_unit][to_unit]
+  if conversion_function == nil then
+    device.log.info_with( {hub_logs = true} , string.format("Unsupported unit conversion from %s to %s", fields.unit_strings[from_unit], fields.unit_strings[to_unit]))
+    return 1
+  end
+
+  if value == nil then
+    device.log.info_with( {hub_logs = true} , "unit conversion value is nil")
+    return 1
+  end
+  return conversion_function(value)
+end
+
 local function get_supported_health_concern_values_for_air_quality(device)
   local health_concern_datatype = capabilities.airQualityHealthConcern.airQualityHealthConcern
   local supported_values = {health_concern_datatype.unknown.NAME, health_concern_datatype.good.NAME, health_concern_datatype.unhealthy.NAME}