Skip to content

Matter Switch: Refactor Driver File Organization #2401

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

Merged
merged 7 commits into from
Sep 25, 2025
Merged

Matter Switch: Refactor Driver File Organization #2401

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f1dbbe4
refactor matter switch driver
hcarter-775 Sep 12, 2025
4b71fdd
remove trailing whitespace
hcarter-775 Sep 16, 2025
8cfffd2
add copyright statement to appropriate files
hcarter-775 Sep 17, 2025
eaba018
convert all sub folders and files to snakecase
hcarter-775 Sep 18, 2025
0bf8794
remove doubly defined field
hcarter-775 Sep 18, 2025
03d5f69
update embedded_cluster requires
hcarter-775 Sep 24, 2025
eee6f89
move local function into single caller
hcarter-775 Sep 25, 2025
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
4 changes: 2 additions & 2 deletions .../src/ElectricalEnergyMeasurement/init.lua → ...ters/ElectricalEnergyMeasurement/init.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
local cluster_base = require "st.matter.cluster_base"
local ElectricalEnergyMeasurementServerAttributes = require "ElectricalEnergyMeasurement.server.attributes"
local ElectricalEnergyMeasurementTypes = require "ElectricalEnergyMeasurement.types"
local ElectricalEnergyMeasurementServerAttributes = require "embedded_clusters.ElectricalEnergyMeasurement.server.attributes"
local ElectricalEnergyMeasurementTypes = require "embedded_clusters.ElectricalEnergyMeasurement.types"
local ElectricalEnergyMeasurement = {}

ElectricalEnergyMeasurement.ID = 0x0091
Expand Down
2 changes: 1 addition & 1 deletion ...r/attributes/CumulativeEnergyImported.lua → ...r/attributes/CumulativeEnergyImported.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ local TLVParser = require "st.matter.TLV.TLVParser"
local CumulativeEnergyImported = {
ID = 0x0001,
NAME = "CumulativeEnergyImported",
base_type = require "ElectricalEnergyMeasurement.types.EnergyMeasurementStruct",
base_type = require "embedded_clusters.ElectricalEnergyMeasurement.types.EnergyMeasurementStruct",
}

function CumulativeEnergyImported:new_value(...)
Expand Down
2 changes: 1 addition & 1 deletion ...ver/attributes/PeriodicEnergyImported.lua → ...ver/attributes/PeriodicEnergyImported.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ local TLVParser = require "st.matter.TLV.TLVParser"
local PeriodicEnergyImported = {
ID = 0x0003,
NAME = "PeriodicEnergyImported",
base_type = require "ElectricalEnergyMeasurement.types.EnergyMeasurementStruct",
base_type = require "embedded_clusters.ElectricalEnergyMeasurement.types.EnergyMeasurementStruct",
}

function PeriodicEnergyImported:new_value(...)
Expand Down
2 changes: 1 addition & 1 deletion ...rgyMeasurement/server/attributes/init.lua → ...rgyMeasurement/server/attributes/init.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ local attr_mt = {}
attr_mt.__attr_cache = {}
attr_mt.__index = function(self, key)
if attr_mt.__attr_cache[key] == nil then
local req_loc = string.format("ElectricalEnergyMeasurement.server.attributes.%s", key)
local req_loc = string.format("embedded_clusters.ElectricalEnergyMeasurement.server.attributes.%s", key)
local raw_def = require(req_loc)
local cluster = rawget(self, "_cluster")
raw_def:set_parent_cluster(cluster)
Expand Down
0 ...urement/types/EnergyMeasurementStruct.lua → ...urement/types/EnergyMeasurementStruct.lua
View file
Open in desktop
File renamed without changes.
0 ...tricalEnergyMeasurement/types/Feature.lua → ...tricalEnergyMeasurement/types/Feature.lua
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...lectricalEnergyMeasurement/types/init.lua → ...lectricalEnergyMeasurement/types/init.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ local types_mt = {}
types_mt.__types_cache = {}
types_mt.__index = function(self, key)
if types_mt.__types_cache[key] == nil then
types_mt.__types_cache[key] = require("ElectricalEnergyMeasurement.types." .. key)
types_mt.__types_cache[key] = require("embedded_clusters.ElectricalEnergyMeasurement.types." .. key)
end
return types_mt.__types_cache[key]
end
Expand Down
4 changes: 2 additions & 2 deletions ...h/src/ElectricalPowerMeasurement/init.lua → ...sters/ElectricalPowerMeasurement/init.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
local cluster_base = require "st.matter.cluster_base"
local ElectricalPowerMeasurementServerAttributes = require "ElectricalPowerMeasurement.server.attributes"
local ElectricalPowerMeasurementTypes = require "ElectricalPowerMeasurement.types"
local ElectricalPowerMeasurementServerAttributes = require "embedded_clusters.ElectricalPowerMeasurement.server.attributes"
local ElectricalPowerMeasurementTypes = require "embedded_clusters.ElectricalPowerMeasurement.types"

local ElectricalPowerMeasurement = {}

Expand Down
0 ...urement/server/attributes/ActivePower.lua → ...urement/server/attributes/ActivePower.lua
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...werMeasurement/server/attributes/init.lua → ...werMeasurement/server/attributes/init.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ local attr_mt = {}
attr_mt.__attr_cache = {}
attr_mt.__index = function(self, key)
if attr_mt.__attr_cache[key] == nil then
local req_loc = string.format("ElectricalPowerMeasurement.server.attributes.%s", key)
local req_loc = string.format("embedded_clusters.ElectricalPowerMeasurement.server.attributes.%s", key)
local raw_def = require(req_loc)
local cluster = rawget(self, "_cluster")
raw_def:set_parent_cluster(cluster)
Expand Down
0 ...ctricalPowerMeasurement/types/Feature.lua → ...ctricalPowerMeasurement/types/Feature.lua
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...ElectricalPowerMeasurement/types/init.lua → ...ElectricalPowerMeasurement/types/init.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ local types_mt = {}
types_mt.__types_cache = {}
types_mt.__index = function(self, key)
if types_mt.__types_cache[key] == nil then
types_mt.__types_cache[key] = require("ElectricalPowerMeasurement.types." .. key)
types_mt.__types_cache[key] = require("embedded_clusters.ElectricalPowerMeasurement.types." .. key)
end
return types_mt.__types_cache[key]
end
Expand Down
6 changes: 3 additions & 3 deletions ...src/ValveConfigurationAndControl/init.lua → ...ers/ValveConfigurationAndControl/init.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
local cluster_base = require "st.matter.cluster_base"
local ValveConfigurationAndControlServerAttributes = require "ValveConfigurationAndControl.server.attributes"
local ValveConfigurationAndControlServerCommands = require "ValveConfigurationAndControl.server.commands"
local ValveConfigurationAndControlTypes = require "ValveConfigurationAndControl.types"
local ValveConfigurationAndControlServerAttributes = require "embedded_clusters.ValveConfigurationAndControl.server.attributes"
local ValveConfigurationAndControlServerCommands = require "embedded_clusters.ValveConfigurationAndControl.server.commands"
local ValveConfigurationAndControlTypes = require "embedded_clusters.ValveConfigurationAndControl.types"
local ValveConfigurationAndControl = {}

ValveConfigurationAndControl.ID = 0x0081
Expand Down
0 ...ontrol/server/attributes/CurrentLevel.lua → ...ontrol/server/attributes/CurrentLevel.lua
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...ontrol/server/attributes/CurrentState.lua → ...ontrol/server/attributes/CurrentState.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ local TLVParser = require "st.matter.TLV.TLVParser"
local CurrentState = {
ID = 0x0004,
NAME = "CurrentState",
base_type = require "ValveConfigurationAndControl.types.ValveStateEnum",
base_type = require "embedded_clusters.ValveConfigurationAndControl.types.ValveStateEnum",
}

function CurrentState:new_value(...)
Expand Down
2 changes: 1 addition & 1 deletion ...tionAndControl/server/attributes/init.lua → ...tionAndControl/server/attributes/init.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ local attr_mt = {}
attr_mt.__attr_cache = {}
attr_mt.__index = function(self, key)
if attr_mt.__attr_cache[key] == nil then
local req_loc = string.format("ValveConfigurationAndControl.server.attributes.%s", key)
local req_loc = string.format("embedded_clusters.ValveConfigurationAndControl.server.attributes.%s", key)
local raw_def = require(req_loc)
local cluster = rawget(self, "_cluster")
raw_def:set_parent_cluster(cluster)
Expand Down
0 ...ationAndControl/server/commands/Close.lua → ...ationAndControl/server/commands/Close.lua
View file
Open in desktop
File renamed without changes.
0 ...rationAndControl/server/commands/Open.lua → ...rationAndControl/server/commands/Open.lua
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...rationAndControl/server/commands/init.lua → ...rationAndControl/server/commands/init.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ local command_mt = {}
command_mt.__command_cache = {}
command_mt.__index = function(self, key)
if command_mt.__command_cache[key] == nil then
local req_loc = string.format("ValveConfigurationAndControl.server.commands.%s", key)
local req_loc = string.format("embedded_clusters.ValveConfigurationAndControl.server.commands.%s", key)
local raw_def = require(req_loc)
local cluster = rawget(self, "_cluster")
command_mt.__command_cache[key] = raw_def:set_parent_cluster(cluster)
Expand Down
0 ...ConfigurationAndControl/types/Feature.lua → ...ConfigurationAndControl/types/Feature.lua
View file
Open in desktop
File renamed without changes.
0 ...rationAndControl/types/ValveStateEnum.lua → ...rationAndControl/types/ValveStateEnum.lua
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...lveConfigurationAndControl/types/init.lua → ...lveConfigurationAndControl/types/init.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ local types_mt = {}
types_mt.__types_cache = {}
types_mt.__index = function(self, key)
if types_mt.__types_cache[key] == nil then
types_mt.__types_cache[key] = require("ValveConfigurationAndControl.types." .. key)
types_mt.__types_cache[key] = require("embedded_clusters.ValveConfigurationAndControl.types." .. key)
end
return types_mt.__types_cache[key]
end
Expand Down
Loading
Loading