Get rid of deps

This commit is contained in:
2026-07-06 23:21:42 +02:00
parent a426b62d4a
commit b176c7705d
21 changed files with 262 additions and 528 deletions
+18 -1
View File
@@ -23,6 +23,20 @@ do
}
local responding = false
local throttlingRead = false
function class:Read()
if throttlingRead == false then
C3C.KnxProxy.Read(class.GA)
end
throttlingRead = true
C3C.OneShotTimer.Add(10000, function()
throttlingRead = false
C3C.KnxProxy.Read(class.GA)
end, "GroupAddressReadThrottle" .. class.GA)
end
---@param v number
function class:Send(v)
@@ -31,6 +45,7 @@ do
end
function class:RespondToRead()
C3C.KnxAddresses.Watch(class.Name)
responding = true
end
@@ -99,7 +114,7 @@ do
---@param onValueChange nil|fun(current: GroupAddress, state: { newVal: number, prevVal: number? })
Watch = function(n, onValueReceive, onValueChange)
if namedRegistry[n] == nil then
C3C.Logger.Error(W
C3C.Logger.Error(
"error accessing non existing group address name to Listen, this should never happen...never",
{ name = n }
)
@@ -180,6 +195,8 @@ do
if addr ~= nil and addr.Value ~= nil and addr:isResponding() then
addr:Send(addr.Value)
end
return
end
if strCommand ~= "DATA_FROM_KNX" then
+6 -9
View File
@@ -12,6 +12,7 @@
---|"Control LF Hallway Presence"
---|"Control LF Hallway Presence Enable"
---|"Control LF Hallway Presence Enable Workaround"
---|"Control LF Hallway Presence End"
---|"Control LF Hallway Presence Alarm"
---|"Control LF Hallway Presence Alarm State"
---|"Control LF Study LED Brightness Night"
@@ -408,7 +409,7 @@
---|"Heat Temperature Setpoint"
--- HAS UNKNOWN DPT
---|"Heat Temperature Setpoint State"
---|"Heat Heating Off lock"
---|"Heat Heating Off Lock"
---|"Heat UF+LF Heating Circulation Pump"
---|"Heat UF+LF Heating Circulation Pump State"
@@ -581,6 +582,8 @@
--- Study Primary
---|"Switch LF Study Primary Light 2"
--- Study Primary
---|"Switch LF Study Primary Light Table"
--- Study Primary
---|"Switch LF Study Primary FB"
--- Study Primary
---|"Switch LF Study Primary CTRL FB"
@@ -588,6 +591,8 @@
---|"Switch LF Study Primary Light 1 FB"
--- Study Primary
---|"Switch LF Study Primary Light 2 FB"
--- Study Primary
---|"Switch LF Study Primary Light Table State"
--- Study Ambient
---|"Switch LF Study Ambient"
--- Study Ambient
@@ -651,17 +656,9 @@
---|"Switch UF Hallway Entry"
---|"Switch UF Hallway Isle"
---|"Switch UF Hallway CTRL"
---|"Switch UF Hallway Entry 1"
---|"Switch UF Hallway Entry 2"
---|"Switch UF Hallway Isle 1"
---|"Switch UF Hallway Isle 2"
---|"Switch UF Hallway Entry FB"
---|"Switch UF Hallway Isle FB"
---|"Switch UF Hallway CTRL FB"
---|"Switch UF Hallway Entry 1 FB"
---|"Switch UF Hallway Entry 2 FB"
---|"Switch UF Hallway Isle 1 FB"
---|"Switch UF Hallway Isle 2 FB"
---|"Switch UF Bathroom Primary"
---|"Switch UF Bathroom Primary CTRL"
---|"Switch UF Bathroom Primary Light 1"
@@ -1,7 +1,6 @@
---@return table<number,GroupAddress>
function C3CKnxCreateGroupAddresses()
return {
return {
C3C.KnxGroupAddress("Entry", "0/0/1", "DPT_1"),
C3C.KnxGroupAddress("Exit", "0/0/2", "DPT_1"),
C3C.KnxGroupAddress("Present", "0/0/3", "DPT_1"),
@@ -95,10 +94,12 @@ function C3CKnxCreateGroupAddresses()
C3C.KnxGroupAddress("Switch LF Study Primary CTRL", "1/0/141", "DPT_1"),
C3C.KnxGroupAddress("Switch LF Study Primary Light 1", "1/0/142", "DPT_1"),
C3C.KnxGroupAddress("Switch LF Study Primary Light 2", "1/0/143", "DPT_1"),
C3C.KnxGroupAddress("Switch LF Study Primary Light Table", "1/0/144", "DPT_1"),
C3C.KnxGroupAddress("Switch LF Study Primary FB", "1/0/147", "DPT_1"),
C3C.KnxGroupAddress("Switch LF Study Primary CTRL FB", "1/0/148", "DPT_1"),
C3C.KnxGroupAddress("Switch LF Study Primary Light 1 FB", "1/0/149", "DPT_1"),
C3C.KnxGroupAddress("Switch LF Study Primary Light 2 FB", "1/0/150", "DPT_1"),
C3C.KnxGroupAddress("Switch LF Study Primary Light Table State", "1/0/151", "DPT_1"),
C3C.KnxGroupAddress("Switch LF Study Ambient", "1/0/155", "DPT_1"),
C3C.KnxGroupAddress("Switch LF Study Ambient CTRL", "1/0/156", "DPT_1"),
C3C.KnxGroupAddress("Switch LF Study Ambient Light 1", "1/0/157", "DPT_1"),
@@ -136,17 +137,9 @@ function C3CKnxCreateGroupAddresses()
C3C.KnxGroupAddress("Switch UF Hallway Entry", "1/1/0", "DPT_1"),
C3C.KnxGroupAddress("Switch UF Hallway Isle", "1/1/1", "DPT_1"),
C3C.KnxGroupAddress("Switch UF Hallway CTRL", "1/1/2", "DPT_1"),
C3C.KnxGroupAddress("Switch UF Hallway Entry 1", "1/1/3", "DPT_1"),
C3C.KnxGroupAddress("Switch UF Hallway Entry 2", "1/1/4", "DPT_1"),
C3C.KnxGroupAddress("Switch UF Hallway Isle 1", "1/1/5", "DPT_1"),
C3C.KnxGroupAddress("Switch UF Hallway Isle 2", "1/1/6", "DPT_1"),
C3C.KnxGroupAddress("Switch UF Hallway Entry FB", "1/1/7", "DPT_1"),
C3C.KnxGroupAddress("Switch UF Hallway Isle FB", "1/1/8", "DPT_1"),
C3C.KnxGroupAddress("Switch UF Hallway CTRL FB", "1/1/9", "DPT_1"),
C3C.KnxGroupAddress("Switch UF Hallway Entry 1 FB", "1/1/10", "DPT_1"),
C3C.KnxGroupAddress("Switch UF Hallway Entry 2 FB", "1/1/11", "DPT_1"),
C3C.KnxGroupAddress("Switch UF Hallway Isle 1 FB", "1/1/12", "DPT_1"),
C3C.KnxGroupAddress("Switch UF Hallway Isle 2 FB", "1/1/13", "DPT_1"),
C3C.KnxGroupAddress("Switch UF Bathroom Primary", "1/1/20", "DPT_1"),
C3C.KnxGroupAddress("Switch UF Bathroom Primary CTRL", "1/1/21", "DPT_1"),
C3C.KnxGroupAddress("Switch UF Bathroom Primary Light 1", "1/1/22", "DPT_1"),
@@ -503,7 +496,7 @@ function C3CKnxCreateGroupAddresses()
C3C.KnxGroupAddress("Heat Heating-Cooling State", "3/7/1", "DPT_1"),
C3C.KnxGroupAddress("Heat Temperature Setpoint", "3/7/2", "DPT_1"),
C3C.KnxGroupAddress("Heat Temperature Setpoint State", "3/7/3", "DPT_1"),
C3C.KnxGroupAddress("Heat Heating Off lock", "3/7/4", "DPT_1"),
C3C.KnxGroupAddress("Heat Heating Off Lock", "3/7/4", "DPT_1"),
C3C.KnxGroupAddress("Heat UF+LF Heating Circulation Pump", "3/7/20", "DPT_1"),
C3C.KnxGroupAddress("Heat UF+LF Heating Circulation Pump State", "3/7/21", "DPT_1"),
C3C.KnxGroupAddress("Vent LF PLACEHOLDER Hallway", "4/0/0", "DPT_1"),
@@ -616,6 +609,7 @@ function C3CKnxCreateGroupAddresses()
C3C.KnxGroupAddress("Control LF Hallway Presence", "6/0/0", "DPT_1"),
C3C.KnxGroupAddress("Control LF Hallway Presence Enable", "6/0/1", "DPT_1"),
C3C.KnxGroupAddress("Control LF Hallway Presence Enable Workaround", "6/0/2", "DPT_3"),
C3C.KnxGroupAddress("Control LF Hallway Presence End", "6/0/5", "DPT_1"),
C3C.KnxGroupAddress("Control LF Hallway Presence Alarm", "6/0/10", "DPT_1"),
C3C.KnxGroupAddress("Control LF Hallway Presence Alarm State", "6/0/11", "DPT_1"),
C3C.KnxGroupAddress("Control LF Study LED Brightness Night", "6/0/146", "DPT_5"),
@@ -625,4 +619,3 @@ function C3CKnxCreateGroupAddresses()
C3C.KnxGroupAddress("Control UF Bathroom Brightness", "6/1/35", "DPT_9"),
}
end