Skip to content

Matter Energy: Fix non- JSON serializable fields #2418

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
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Matter Energy: Fix non- JSON serializable fields #2418

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
54 changes: 33 additions & 21 deletions drivers/SmartThings/matter-energy/src/init.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ if version.api < 12 then
end

local COMPONENT_TO_ENDPOINT_MAP = "__component_to_endpoint_map"
local SUPPORTED_EVSE_MODES_MAP = "__supported_evse_modes_map"
local SUPPORTED_DEVICE_ENERGY_MANAGEMENT_MODES_MAP = "__supported_device_energy_management_modes_map"
local SUPPORTED_EVSE_MODES = "__supported_evse_modes"
local SUPPORTED_DEVICE_ENERGY_MANAGEMENT_MODES = "__supported_device_energy_management_modes"

local CUMULATIVE_REPORTS_NOT_SUPPORTED = "__cumulative_reports_not_supported"
local LAST_IMPORTED_REPORT_TIMESTAMP = "__last_imported_report_timestamp"
Expand All @@ -47,6 +47,11 @@ local TOTAL_CUMULATIVE_ENERGY_IMPORTED = "__total_cumulative_energy_imported"
local TOTAL_CUMULATIVE_ENERGY_EXPORTED = "__total_cumulative_energy_exported"
local TOTAL_ACTIVE_POWER = "__total_active_power"

local updated_fields = {
{ current_field_name = "__supported_evse_modes_map", updated_field_name = nil },
{ current_field_name = "__supported_device_energy_management_modes_map", updated_field_name = nil }
}

local MAX_CHARGING_CURRENT_CONSTRAINT = 80000 -- In v1.3 release of stack, this check for 80 A is performed.

local EVSE_DEVICE_TYPE_ID = 0x050C
Expand All @@ -55,7 +60,6 @@ local BATTERY_STORAGE_DEVICE_TYPE_ID = 0x0018
local ELECTRICAL_SENSOR_DEVICE_TYPE_ID = 0x0510
local DEVICE_ENERGY_MANAGEMENT_DEVICE_TYPE_ID = 0x050D


local function get_endpoints_for_dt(device, device_type)
local endpoints = {}
for _, ep in ipairs(device.endpoints) do
Expand Down Expand Up @@ -100,6 +104,25 @@ local function component_to_endpoint(device, component)
end
end

local function get_field_for_endpoint(device, field, endpoint)
return device:get_field(string.format("%s_%d", field, endpoint))
end

local function set_field_for_endpoint(device, field, endpoint, value, additional_params)
device:set_field(string.format("%s_%d", field, endpoint), value, additional_params)
end

local function check_field_name_updates(device)
for _, field in ipairs(updated_fields) do
if device:get_field(field.current_field_name) then
if field.updated_field_name ~= nil then
device:set_field(field.updated_field_name, device:get_field(field.current_field_name), {persist = true})
end
device:set_field(field.current_field_name, nil)
end
end
end

local function time_zone_offset()
return os.difftime(os.time(), os.time(os.date("!*t", os.time())))
end
Expand Down Expand Up @@ -193,6 +216,7 @@ local BATTERY_CHARGING_STATE_MAP = {

-- Lifecycle Handlers --
local function device_init(driver, device)
check_field_name_updates(device)
device:subscribe()
device:set_endpoint_to_component_fn(endpoint_to_component)
device:set_component_to_endpoint_fn(component_to_endpoint)
Expand Down Expand Up @@ -386,27 +410,22 @@ local function power_mode_handler(driver, device, ib, response)
end

local function energy_evse_supported_modes_attr_handler(driver, device, ib, response)
local supportedEvseModesMap = device:get_field(SUPPORTED_EVSE_MODES_MAP) or {}
local supportedEvseModes = {}
for _, mode in ipairs(ib.data.elements) do
if version.api < 11 then
clusters.EnergyEvseMode.types.ModeOptionStruct:augment_type(mode)
end
table.insert(supportedEvseModes, mode.elements.label.value)
end
supportedEvseModesMap[ib.endpoint_id] = supportedEvseModes
device:set_field(SUPPORTED_EVSE_MODES_MAP, supportedEvseModesMap, { persist = true })
set_field_for_endpoint(device, SUPPORTED_EVSE_MODES, ib.endpoint_id, supportedEvseModes, { persist = true })
local event = capabilities.mode.supportedModes(supportedEvseModes, { visibility = { displayed = false } })
device:emit_event_for_endpoint(ib.endpoint_id, event)
event = capabilities.mode.supportedArguments(supportedEvseModes, { visibility = { displayed = false } })
device:emit_event_for_endpoint(ib.endpoint_id, event)
end

local function energy_evse_mode_attr_handler(driver, device, ib, response)
device.log.info(string.format("energy_evse_modes_attr_handler currentMode: %s", ib.data.value))

local supportedEvseModesMap = device:get_field(SUPPORTED_EVSE_MODES_MAP) or {}
local supportedEvseModes = supportedEvseModesMap[ib.endpoint_id] or {}
local supportedEvseModes = get_field_for_endpoint(device, SUPPORTED_EVSE_MODES, ib.endpoint_id) or {}
local currentMode = ib.data.value
for i, mode in ipairs(supportedEvseModes) do
if i - 1 == currentMode then
Expand All @@ -417,27 +436,22 @@ local function energy_evse_mode_attr_handler(driver, device, ib, response)
end

local function device_energy_mgmt_supported_modes_attr_handler(driver, device, ib, response)
local supportedDeviceEnergyMgmtModesMap = device:get_field(SUPPORTED_DEVICE_ENERGY_MANAGEMENT_MODES_MAP) or {}
local supportedDeviceEnergyMgmtModes = {}
for _, mode in ipairs(ib.data.elements) do
if version.api < 12 then
clusters.DeviceEnergyManagementMode.types.ModeOptionStruct:augment_type(mode)
end
table.insert(supportedDeviceEnergyMgmtModes, mode.elements.label.value)
end
supportedDeviceEnergyMgmtModesMap[ib.endpoint_id] = supportedDeviceEnergyMgmtModes
device:set_field(SUPPORTED_DEVICE_ENERGY_MANAGEMENT_MODES_MAP, supportedDeviceEnergyMgmtModesMap, { persist = true })
set_field_for_endpoint(device, SUPPORTED_DEVICE_ENERGY_MANAGEMENT_MODES, ib.endpoint_id, supportedDeviceEnergyMgmtModes, { persist = true })
local event = capabilities.mode.supportedModes(supportedDeviceEnergyMgmtModes, { visibility = { displayed = false } })
device:emit_event_for_endpoint(ib.endpoint_id, event)
event = capabilities.mode.supportedArguments(supportedDeviceEnergyMgmtModes, { visibility = { displayed = false } })
device:emit_event_for_endpoint(ib.endpoint_id, event)
end

local function device_energy_mgmt_mode_attr_handler(driver, device, ib, response)
device.log.info(string.format("device_energy_mgmt_mode_attr_handler currentMode: %s", ib.data.value))

local supportedDeviceEnergyMgmtModesMap = device:get_field(SUPPORTED_DEVICE_ENERGY_MANAGEMENT_MODES_MAP) or {}
local supportedDeviceEnergyMgmtModes = supportedDeviceEnergyMgmtModesMap[ib.endpoint_id] or {}
local supportedDeviceEnergyMgmtModes = get_field_for_endpoint(device, SUPPORTED_DEVICE_ENERGY_MANAGEMENT_MODES, ib.endpoint_id) or {}
local currentMode = ib.data.value
for i, mode in ipairs(supportedDeviceEnergyMgmtModes) do
if i - 1 == currentMode then
Expand Down Expand Up @@ -603,8 +617,7 @@ local function handle_set_mode_command(driver, device, cmd)
local set_mode_handlers = {
["main"] = function( ... )
local ep = component_to_endpoint(device, cmd.component)
local supportedEvseModesMap = device:get_field(SUPPORTED_EVSE_MODES_MAP)
local supportedEvseModes = supportedEvseModesMap[ep] or {}
local supportedEvseModes = get_field_for_endpoint(device, SUPPORTED_EVSE_MODES, ep) or {}
for i, mode in ipairs(supportedEvseModes) do
if cmd.args.mode == mode then
device:send(clusters.EnergyEvseMode.commands.ChangeToMode(device, ep, i - 1))
Expand All @@ -615,8 +628,7 @@ local function handle_set_mode_command(driver, device, cmd)
end,
["deviceEnergyManagement"] = function( ... )
local ep = component_to_endpoint(device, cmd.component)
local supportedDeviceEnergyMgmtModesMap = device:get_field(SUPPORTED_DEVICE_ENERGY_MANAGEMENT_MODES_MAP)
local supportedDeviceEnergyMgmtModes = supportedDeviceEnergyMgmtModesMap[ep] or {}
local supportedDeviceEnergyMgmtModes = get_field_for_endpoint(device, SUPPORTED_DEVICE_ENERGY_MANAGEMENT_MODES, ep) or {}
for i, mode in ipairs(supportedDeviceEnergyMgmtModes) do
if cmd.args.mode == mode then
device:send(clusters.DeviceEnergyManagementMode.commands.ChangeToMode(device, ep, i - 1))
Expand Down
Loading