Skip to content

Matter Sensor: Fix Global defintion and adjust unit tests #3125

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ctowns wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Matter Sensor: Fix Global defintion and adjust unit tests #3125

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion drivers/SmartThings/matter-sensor/src/embedded_clusters/Global/types/MeasurementTypeEnum.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ local data_types = require "st.matter.data_types"
local UintABC = require "st.matter.data_types.base_defs.UintABC"

local MeasurementTypeEnum = {}
local new_mt = UintABC.new_mt({NAME = "MeasurementTypeEnum", ID = data_types.name_to_id_map["Uint8"]}, 1)
local new_mt = UintABC.new_mt({NAME = "MeasurementTypeEnum", ID = data_types.name_to_id_map["Uint16"]}, 2)
new_mt.__index.pretty_print = function(self)
local name_lookup = {
[self.UNSPECIFIED] = "UNSPECIFIED",
Expand Down
14 changes: 11 additions & 3 deletions drivers/SmartThings/matter-sensor/src/sensor_handlers/attribute_handlers.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,12 @@ if version.api < 13 then
clusters.Global = require "embedded_clusters.Global"
end

-- The SOIL_MOISTURE MeasurementTypeEnum variant was added to the Global MeasurementTypeEnum
-- def in lua libs in api version 21 as a part of the fix for Shared and Global types.
if version.api < 21 then
clusters.Global.types.MeasurementTypeEnum = require "embedded_clusters.Global.types.MeasurementTypeEnum"
end

local AttributeHandlers = {}


Expand Down Expand Up @@ -84,8 +90,10 @@ function AttributeHandlers.soil_moisture_measured_value_handler(driver, device,
end

function AttributeHandlers.soil_moisture_measurement_limits_handler(driver, device, ib, response)
local MeasurementAccuracyStruct = require "embedded_clusters.Global.types.MeasurementAccuracyStruct"
MeasurementAccuracyStruct:augment_type(ib.data)
if version.api < 13 then
local MeasurementAccuracyStruct = require "embedded_clusters.Global.types.MeasurementAccuracyStruct"
MeasurementAccuracyStruct:augment_type(ib.data)
end
local min_val = ib.data.elements and ib.data.elements.min_measured_value and ib.data.elements.min_measured_value.value
local max_val = ib.data.elements and ib.data.elements.max_measured_value and ib.data.elements.max_measured_value.value
if not (min_val and max_val) or (min_val >= max_val) or (min_val < sensor_utils.SOIL_MOISTURE_MIN) or (max_val > sensor_utils.SOIL_MOISTURE_MAX) then
Expand Down Expand Up @@ -229,4 +237,4 @@ function AttributeHandlers.flow_measured_value_bounds_factory(minOrMax)
end
end

return AttributeHandlers
return AttributeHandlers
10 changes: 9 additions & 1 deletion drivers/SmartThings/matter-sensor/src/test/test_matter_soil_sensor.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,15 @@ local t_utils = require "integration_test.utils"
local test = require "integration_test"
local version = require "version"

clusters.Global = require "embedded_clusters.Global"
if version.api < 13 then
clusters.Global = require "embedded_clusters.Global"
end

if version.api < 21 then
clusters.SoilMeasurement = require "embedded_clusters.SoilMeasurement"

@hcarter-775 hcarter-775 Jul 16, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should we be removing the soil version check?

@ctowns ctowns Jul 16, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Whoops, must've deleted this while I was moving things around, added back

-- The SOIL_MOISTURE MeasurementTypeEnum variant was added to the Global MeasurementTypeEnum
-- def in lua libs in api version 21.
clusters.Global.types.MeasurementTypeEnum = require "embedded_clusters.Global.types.MeasurementTypeEnum"
end

local mock_device = test.mock_device.build_test_matter_device({
Expand Down Expand Up @@ -157,6 +162,9 @@ test.register_coroutine_test(
)

local function build_soil_moisture_limits(min_value, max_value)
if version.api < 21 then
clusters.Global.types.MeasurementTypeEnum = require "embedded_clusters.Global.types.MeasurementTypeEnum"
end
return clusters.Global.types.MeasurementAccuracyStruct({
measurement_type = clusters.Global.types.MeasurementTypeEnum.SOIL_MOISTURE,
measured = true,
Expand Down
Loading