diff --git a/package-lock.json b/package-lock.json index e22632f..bba2854 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "c3c-knx-presence", - "version": "0.0.228", + "version": "0.0.232", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "c3c-knx-presence", - "version": "0.0.228", + "version": "0.0.232", "hasInstallScript": true, "license": "GPL-3.0-only", "devDependencies": { diff --git a/package.json b/package.json index fccf54b..5deab82 100644 --- a/package.json +++ b/package.json @@ -35,5 +35,5 @@ "postinstall": "npm run install-control4-utils && npm run driver-manager", "test": "busted tests/test.lua" }, - "version": "0.0.228" + "version": "0.0.232" } diff --git a/src/lib/presence/LF/Hallway.lua b/src/lib/presence/LF/Hallway.lua index 6e0928a..219aade 100644 --- a/src/lib/presence/LF/Hallway.lua +++ b/src/lib/presence/LF/Hallway.lua @@ -12,10 +12,13 @@ if state.newVal == 1 then time = os.date("*t") - if C3C.Lib.State.DayTime.IsDay() or (time.hour >= 7 and time.hour <= 22) then + if C3C.Lib.State.DayTime.IsDay() or (time.hour >= 7 and time.hour <= 19) then C3C.Logger.Debug("Switching on primary light", ctx) C3C.KnxAddresses.Get("Switch LF Hallway CTRL"):Send(1) - else + elseif time.hour == 20 then + C3C.Logger.Debug("Switching on primary light with dimmed control during evening", ctx) + C3C.KnxAddresses.Get("Dimmer LF Hallway"):Send(10) + else C3C.Logger.Debug("Switching on primary light with dimmed control during nighttime", ctx) C3C.KnxAddresses.Get("Dimmer LF Hallway"):Send(2) end diff --git a/src/lib/presence/UF/Bathroom.lua b/src/lib/presence/UF/Bathroom.lua index 118894e..432953f 100644 --- a/src/lib/presence/UF/Bathroom.lua +++ b/src/lib/presence/UF/Bathroom.lua @@ -120,16 +120,18 @@ time = os.date("*t") if lux < 50 then - if C3C.Lib.State.DayTime.IsDay() or (time.hour >= 7 and time.hour <= 19) then - C3C.Logger.Debug("Switching on primary light", ctx) - C3C.KnxAddresses.Get("Switch UF Bathroom Primary CTRL"):Send(1) + if C3C.Lib.State.DayTime.IsDay() or (time.hour >= 7 and time.hour <= 19) then + C3C.Logger.Debug("Switching on primary light", ctx) + C3C.KnxAddresses.Get("Switch UF Bathroom Primary CTRL"):Send(1) C3C.KnxAddresses.Get("Switch UF Bathroom Primary Light 1"):Send(1) C3C.KnxAddresses.Get("Switch UF Bathroom Primary Light 2"):Send(1) - elseif time.hour > 19 and time.hour <= 20 then - C3C.Logger.Debug("Switching on primary light with dimmed control during nighttime", ctx) - C3C.KnxAddresses.Get("Switch UF Bathroom Primary CTRL"):Send(1) + elseif time.hour == 20 then + C3C.Logger.Debug("Switching on primary light with dimmed control during evening", ctx) C3C.KnxAddresses.Get("Dimmer UF Bathroom Primary"):Send(12) - end + else + C3C.Logger.Debug("Switching on primary light with dimmed control during nighttime", ctx) + C3C.KnxAddresses.Get("Dimmer UF Bathroom Primary"):Send(2) + end end C3C.Logger.Debug("Firing event: UpperFloorBathroomMediaStart", ctx)