Matter Sensor: Improve error handling for unit conversion (#2602)

Author: hcarter-775

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

@@ -3,7 +3,6 @@
 
 local st_utils = require "st.utils"
 local capabilities = require "st.capabilities"
-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 AirQualitySensorAttributeHandlers = {}
@@ -25,20 +24,18 @@ end
 
 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 = aqs_fields.unit_default[capability_name]
-      device:set_field(capability_name.."_unit", reporting_unit, {persist = true})
-    end
-
-    if reporting_unit then
-      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 = aqs_fields.unit_strings[target_unit]}))
+    if ib.data.value then
+      local reporting_unit = device:get_field(capability_name.."_unit") or aqs_fields.unit_default[capability_name]
+      local conversion_function = aqs_fields.conversion_tables[reporting_unit][target_unit]
+      if conversion_function then
+        local converted_value = conversion_function(ib.data.value)
+        device:emit_event_for_endpoint(ib.endpoint_id, attribute({value = converted_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 = converted_value, unit = aqs_fields.unit_strings[target_unit]}))
+        end
+      else
+        device.log.info_with({hub_logs=true}, string.format("Unsupported unit conversion from %s to %s", aqs_fields.unit_strings[reporting_unit], aqs_fields.unit_strings[target_unit]))
       end
     end
   end

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

@@ -40,20 +40,6 @@ 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}