Skip to content

Matter Switch: Update ST Energy Reporting Interval for Multi-Plugs #2803

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
hcarter-775 wants to merge 1 commit into
base: main
Choose a base branch
from
+20 −6
Open

Matter Switch: Update ST Energy Reporting Interval for Multi-Plugs #2803

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
1 change: 1 addition & 0 deletions drivers/SmartThings/matter-switch/src/switch_utils/fields.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@ SwitchFields.updated_fields = {
{ current_field_name = "__switch_intialized", updated_field_name = nil },
{ current_field_name = "__energy_management_endpoint", updated_field_name = nil },
{ current_field_name = "__total_imported_energy", updated_field_name = nil },
{ current_field_name = "__last_imported_report_timestamp", updated_field_name = nil },
Copy link
Contributor

@greens greens Feb 25, 2026

Choose a reason for hiding this comment

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

this is just to clear out the storage of no-longer-used fields?

Copy link
Contributor Author

@hcarter-775 hcarter-775 Feb 25, 2026

Choose a reason for hiding this comment

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

yes

}

SwitchFields.vendor_overrides = {
Expand Down
4 changes: 2 additions & 2 deletions drivers/SmartThings/matter-switch/src/switch_utils/utils.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -373,13 +373,13 @@ end

function utils.report_power_consumption_to_st_energy(device, endpoint_id, total_imported_energy_wh)
local current_time = os.time()
local last_time = device:get_field(fields.LAST_IMPORTED_REPORT_TIMESTAMP) or 0
local last_time = utils.get_field_for_endpoint(device, fields.LAST_IMPORTED_REPORT_TIMESTAMP, endpoint_id) or 0

-- Ensure that the previous report was sent at least 15 minutes ago
if fields.MINIMUM_ST_ENERGY_REPORT_INTERVAL >= (current_time - last_time) then
return
end
device:set_field(fields.LAST_IMPORTED_REPORT_TIMESTAMP, current_time, { persist = true })
utils.set_field_for_endpoint(device, fields.LAST_IMPORTED_REPORT_TIMESTAMP, endpoint_id, current_time, { persist = true })

local previous_imported_report = utils.get_latest_state_for_endpoint(device, endpoint_id, capabilities.powerConsumptionReport.ID,
capabilities.powerConsumptionReport.powerConsumption.NAME, { energy = total_imported_energy_wh }) -- default value if nil
Expand Down
21 changes: 17 additions & 4 deletions drivers/SmartThings/matter-switch/src/test/test_electrical_sensor_set.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -529,8 +529,14 @@ test.register_coroutine_test(
test.socket.capability:__expect_send(
mock_child:generate_test_message("main", capabilities.energyMeter.energy({ value = 19.0, unit = "Wh" }))
)
-- no powerConsumptionReport will be emitted now, since it has not been 15 minutes since the previous report (even though it was the parent).

test.socket.capability:__expect_send(
mock_child:generate_test_message("main", capabilities.powerConsumptionReport.powerConsumption({
start = "1970-01-01T00:00:00Z",
["end"] = "1970-01-01T00:15:00Z",
deltaEnergy = 0.0,
energy = 19.0
}))
)

test.wait_for_events()
test.mock_time.advance_time(1500)
Expand Down Expand Up @@ -565,7 +571,7 @@ test.register_coroutine_test(
mock_child:generate_test_message("main", capabilities.powerConsumptionReport.powerConsumption({
start = "1970-01-01T00:15:01Z",
["end"] = "1970-01-01T00:40:00Z",
deltaEnergy = 0.0,
deltaEnergy = 1.0,
energy = 20.0
}))
)
Expand All @@ -582,7 +588,14 @@ test.register_coroutine_test(
test.socket.capability:__expect_send(
mock_device:generate_test_message("main", capabilities.energyMeter.energy({ value = 20.0, unit = "Wh" }))
)
-- no powerConsumptionReport will be emitted now, since it has not been 15 minutes since the previous report (even though it was the child).
test.socket.capability:__expect_send(
mock_device:generate_test_message("main", capabilities.powerConsumptionReport.powerConsumption({
start = "1970-01-01T00:15:01Z",
["end"] = "1970-01-01T00:40:00Z",
deltaEnergy = 1.0,
energy = 20.0
}))
)
end,
{ test_init = test_init }
)
Expand Down
Loading