Skip to content

Commit 4c273ca

Browse files
authored
Matter Switch: Refactor Driver File Organization (#2401)
1 parent 697c1d0 commit 4c273ca

File tree

36 files changed

+1845
-1532
lines changed

36 files changed

+1845
-1532
lines changed

drivers/SmartThings/matter-switch/src/ElectricalEnergyMeasurement/init.lua renamed to drivers/SmartThings/matter-switch/src/embedded_clusters/ElectricalEnergyMeasurement/init.lua

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
local cluster_base = require "st.matter.cluster_base"
2-
local ElectricalEnergyMeasurementServerAttributes = require "ElectricalEnergyMeasurement.server.attributes"
3-
local ElectricalEnergyMeasurementTypes = require "ElectricalEnergyMeasurement.types"
2+
local ElectricalEnergyMeasurementServerAttributes = require "embedded_clusters.ElectricalEnergyMeasurement.server.attributes"
3+
local ElectricalEnergyMeasurementTypes = require "embedded_clusters.ElectricalEnergyMeasurement.types"
44
local ElectricalEnergyMeasurement = {}
55

66
ElectricalEnergyMeasurement.ID = 0x0091
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ local TLVParser = require "st.matter.TLV.TLVParser"
55
local CumulativeEnergyImported = {
66
ID = 0x0001,
77
NAME = "CumulativeEnergyImported",
8-
base_type = require "ElectricalEnergyMeasurement.types.EnergyMeasurementStruct",
8+
base_type = require "embedded_clusters.ElectricalEnergyMeasurement.types.EnergyMeasurementStruct",
99
}
1010

1111
function CumulativeEnergyImported:new_value(...)
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ local TLVParser = require "st.matter.TLV.TLVParser"
55
local PeriodicEnergyImported = {
66
ID = 0x0003,
77
NAME = "PeriodicEnergyImported",
8-
base_type = require "ElectricalEnergyMeasurement.types.EnergyMeasurementStruct",
8+
base_type = require "embedded_clusters.ElectricalEnergyMeasurement.types.EnergyMeasurementStruct",
99
}
1010

1111
function PeriodicEnergyImported:new_value(...)

drivers/SmartThings/matter-switch/src/ElectricalEnergyMeasurement/server/attributes/init.lua renamed to drivers/SmartThings/matter-switch/src/embedded_clusters/ElectricalEnergyMeasurement/server/attributes/init.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ local attr_mt = {}
22
attr_mt.__attr_cache = {}
33
attr_mt.__index = function(self, key)
44
if attr_mt.__attr_cache[key] == nil then
5-
local req_loc = string.format("ElectricalEnergyMeasurement.server.attributes.%s", key)
5+
local req_loc = string.format("embedded_clusters.ElectricalEnergyMeasurement.server.attributes.%s", key)
66
local raw_def = require(req_loc)
77
local cluster = rawget(self, "_cluster")
88
raw_def:set_parent_cluster(cluster)

drivers/SmartThings/matter-switch/src/ElectricalEnergyMeasurement/types/init.lua renamed to drivers/SmartThings/matter-switch/src/embedded_clusters/ElectricalEnergyMeasurement/types/init.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ local types_mt = {}
22
types_mt.__types_cache = {}
33
types_mt.__index = function(self, key)
44
if types_mt.__types_cache[key] == nil then
5-
types_mt.__types_cache[key] = require("ElectricalEnergyMeasurement.types." .. key)
5+
types_mt.__types_cache[key] = require("embedded_clusters.ElectricalEnergyMeasurement.types." .. key)
66
end
77
return types_mt.__types_cache[key]
88
end

drivers/SmartThings/matter-switch/src/ElectricalPowerMeasurement/init.lua renamed to drivers/SmartThings/matter-switch/src/embedded_clusters/ElectricalPowerMeasurement/init.lua

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
local cluster_base = require "st.matter.cluster_base"
2-
local ElectricalPowerMeasurementServerAttributes = require "ElectricalPowerMeasurement.server.attributes"
3-
local ElectricalPowerMeasurementTypes = require "ElectricalPowerMeasurement.types"
2+
local ElectricalPowerMeasurementServerAttributes = require "embedded_clusters.ElectricalPowerMeasurement.server.attributes"
3+
local ElectricalPowerMeasurementTypes = require "embedded_clusters.ElectricalPowerMeasurement.types"
44

55
local ElectricalPowerMeasurement = {}
66

drivers/SmartThings/matter-switch/src/ElectricalPowerMeasurement/server/attributes/init.lua renamed to drivers/SmartThings/matter-switch/src/embedded_clusters/ElectricalPowerMeasurement/server/attributes/init.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ local attr_mt = {}
22
attr_mt.__attr_cache = {}
33
attr_mt.__index = function(self, key)
44
if attr_mt.__attr_cache[key] == nil then
5-
local req_loc = string.format("ElectricalPowerMeasurement.server.attributes.%s", key)
5+
local req_loc = string.format("embedded_clusters.ElectricalPowerMeasurement.server.attributes.%s", key)
66
local raw_def = require(req_loc)
77
local cluster = rawget(self, "_cluster")
88
raw_def:set_parent_cluster(cluster)

0 commit comments

Comments
 (0)