From b091f04a1bc64c3b6039551e9420b472659631a5 Mon Sep 17 00:00:00 2001 From: Patrick Niebeling Date: Thu, 5 Jun 2025 13:24:26 +0200 Subject: [PATCH] 2025-06-05 --- rules/Dienste.rules | 1 - rules/REMWEBIO001.rules | 70 ++++++++++++++++++++-------------------- sitemaps/default.sitemap | 25 +++++++------- 3 files changed, 47 insertions(+), 49 deletions(-) diff --git a/rules/Dienste.rules b/rules/Dienste.rules index 34b966b..4f963bb 100644 --- a/rules/Dienste.rules +++ b/rules/Dienste.rules @@ -2,7 +2,6 @@ rule "Abruf Dienste" when // Time cron "0 * * ? * *" or Time cron "0 0 19 ? * MON-FRI" or - Time cron "0 16 14 ? * MON-FRI" or Time cron "0 0 7 ? * SAT,SUN" then logInfo("HTTPGET", "Abfrage Erfolgt") diff --git a/rules/REMWEBIO001.rules b/rules/REMWEBIO001.rules index a9c8a1b..d635d85 100644 --- a/rules/REMWEBIO001.rules +++ b/rules/REMWEBIO001.rules @@ -6,6 +6,38 @@ then REMWEBIO001_Ausgang0.sendCommand(OFF) end +rule "Steuerung Tor 2" +when + Item REMWEBIO001_Ausgang1 changed to ON +then + Thread::sleep(1000) + REMWEBIO001_Ausgang1.sendCommand(OFF) +end + +rule "Steuerung Tor 3" +when + Item REMWEBIO001_Ausgang2 changed to ON +then + Thread::sleep(1000) + REMWEBIO001_Ausgang2.sendCommand(OFF) +end + +rule "Steuerung Tor 4" +when + Item REMWEBIO001_Ausgang3 changed to ON +then + Thread::sleep(1000) + REMWEBIO001_Ausgang3.sendCommand(OFF) +end + +rule "Steuerung Tor 5" +when + Item REMWEBIO001_Ausgang4 changed to ON +then + Thread::sleep(1000) + REMWEBIO001_Ausgang4.sendCommand(OFF) +end + rule "MTF 1 (3-19-1) - Status 2" when Item FFStatus67641319 received update @@ -15,18 +47,10 @@ then logInfo("REMWEBIO001.rules", "FunctioncheckSwitch: " + FunctioncheckSwitch.state.toString) if( StartupSwitch.state == ON && FFStatus67641319.state == 2) { logInfo("REMWEBIO001.rules", "Tor 1 öffnen") - REMWEBIO001_Ausgang0.sendCommand(ON) + // REMWEBIO001_Ausgang0.sendCommand(ON) } end -rule "Steuerung Tor 2" -when - Item REMWEBIO001_Ausgang1 changed to ON -then - Thread::sleep(1000) - REMWEBIO001_Ausgang1.sendCommand(OFF) -end - rule "LF 8/6-1 (3-42-1) - Status 2" when Item FFStatus67641342 received update @@ -36,18 +60,10 @@ then logInfo("REMWEBIO001.rules", "FunctioncheckSwitch: " + FunctioncheckSwitch.state.toString) if( StartupSwitch.state == ON && FFStatus67641342.state == 2) { logInfo("REMWEBIO001.rules", "Tor 2 öffnen") - REMWEBIO001_Ausgang1.sendCommand(ON) + REMWEBIO001_Ausgang2.sendCommand(ON) } end -rule "Steuerung Tor 3" -when - Item REMWEBIO001_Ausgang2 changed to ON -then - Thread::sleep(1000) - REMWEBIO001_Ausgang2.sendCommand(OFF) -end - rule "LF 8/6-2 (3-42-2) - Status 2" when Item FFStatus67641349 received update @@ -57,18 +73,10 @@ then logInfo("REMWEBIO001.rules", "FunctioncheckSwitch: " + FunctioncheckSwitch.state.toString) if( StartupSwitch.state == ON && FFStatus67641349.state == 2) { logInfo("REMWEBIO001.rules", "Tor 3 öffnen") - REMWEBIO001_Ausgang2.sendCommand(ON) + REMWEBIO001_Ausgang0.sendCommand(ON) } end -rule "Steuerung Tor 4" -when - Item REMWEBIO001_Ausgang3 changed to ON -then - Thread::sleep(1000) - REMWEBIO001_Ausgang3.sendCommand(OFF) -end - rule "MTF 2 (3-19-2) - Status 2" when Item FFStatus67641317 received update @@ -82,14 +90,6 @@ then } end -rule "Steuerung Tor 5" -when - Item REMWEBIO001_Ausgang4 changed to ON -then - Thread::sleep(1000) - REMWEBIO001_Ausgang4.sendCommand(OFF) -end - rule "RW1 (3-51-1) - Status 2" when Item FFStatus67641351 received update diff --git a/sitemaps/default.sitemap b/sitemaps/default.sitemap index 2e8bd41..9f9aa71 100644 --- a/sitemaps/default.sitemap +++ b/sitemaps/default.sitemap @@ -29,7 +29,7 @@ sitemap default label="Feuerwehr Rembrücken" { Text item=FFStatus67641219 label="MTF (2-19-1) [MAP(status.map):%s]" icon="" visibility=[FFStatus67641219==3] Text item=FFStatus67641230 label="DLK (2-30-1) [MAP(status.map):%s]" icon="" visibility=[FFStatus67641230==3] Text item=FFStatus67641240 label="StLF 20/25 (2-40-1) [MAP(status.map):%s]" icon="" visibility=[FFStatus67641240==3] - Text item=FFStatus67641244 label="LF 16/12 (2-44-1) [MAP(status.map):%s]" icon="" visibility=[FFStatus67641244==3] + Text item=FFStatus67641246 label="LF 20 (2-46-1) [MAP(status.map):%s]" icon="" visibility=[FFStatus67641246==3] Text item=FFStatus67641259 label="GW-U (2-59-1) [MAP(status.map):%s]" icon="" visibility=[FFStatus67641259==3] Text item=FFStatus67641272 label="GW-N (2-64-1) [MAP(status.map):%s]" icon="" visibility=[FFStatus67641272==3] } @@ -44,7 +44,7 @@ sitemap default label="Feuerwehr Rembrücken" { Text item=FFStatus67641219 label="MTF (2-19-1) [MAP(status.map):%s]" icon="" visibility=[FFStatus67641219==4] Text item=FFStatus67641230 label="DLK (2-30-1) [MAP(status.map):%s]" icon="" visibility=[FFStatus67641230==4] Text item=FFStatus67641240 label="StLF 20/25 (2-40-1) [MAP(status.map):%s]" icon="" visibility=[FFStatus67641240==4] - Text item=FFStatus67641244 label="LF 16/12 (2-44-1) [MAP(status.map):%s]" icon="" visibility=[FFStatus67641244==4] + Text item=FFStatus67641246 label="LF 20 (2-46-1) [MAP(status.map):%s]" icon="" visibility=[FFStatus67641246==4] Text item=FFStatus67641259 label="GW-U (2-59-1) [MAP(status.map):%s]" icon="" visibility=[FFStatus67641259==4] Text item=FFStatus67641272 label="GW-N (2-64-1) [MAP(status.map):%s]" icon="" visibility=[FFStatus67641272==4] } @@ -75,7 +75,7 @@ sitemap default label="Feuerwehr Rembrücken" { Text item=FFStatus67641219 label="MTF (2-19-1) [MAP(status.map):%s]" icon="" valuecolor=["1"="#31CF31", "2"="#31CF31", "3"="#FF8E00", "4"="#840000", "6"="#000000"] Text item=FFStatus67641230 label="DLK (2-30-1) [MAP(status.map):%s]" icon="" valuecolor=["1"="#31CF31", "2"="#31CF31", "3"="#FF8E00", "4"="#840000", "6"="#000000"] Text item=FFStatus67641240 label="StLF 20/25 (2-40-1) [MAP(status.map):%s]" icon="" valuecolor=["1"="#31CF31", "2"="#31CF31", "3"="#FF8E00", "4"="#840000", "6"="#000000"] - Text item=FFStatus67641244 label="LF 16/12 (2-44-1) [MAP(status.map):%s]" icon="" valuecolor=["1"="#31CF31", "2"="#31CF31", "3"="#FF8E00", "4"="#840000", "6"="#000000"] + Text item=FFStatus67641246 label="LF 20 (2-46-1) [MAP(status.map):%s]" icon="" valuecolor=["1"="#31CF31", "2"="#31CF31", "3"="#FF8E00", "4"="#840000", "6"="#000000"] Text item=FFStatus67641259 label="GW-U (2-59-1) [MAP(status.map):%s]" icon="" valuecolor=["1"="#31CF31", "2"="#31CF31", "3"="#FF8E00", "4"="#840000", "6"="#000000"] Text item=FFStatus67641272 label="GW-N (2-64-1) [MAP(status.map):%s]" icon="" valuecolor=["1"="#31CF31", "2"="#31CF31", "3"="#FF8E00", "4"="#840000", "6"="#000000"] } @@ -88,20 +88,20 @@ sitemap default label="Feuerwehr Rembrücken" { Switch item=REMWEBIO001_Ausgang4 icon=garagedoor } - Text label="Dienste" icon="kalender" { - Text item=FFDienstZVD - Text item=FFDienstIUK2 - Text item=FFDienstIUK3 - Text item=FFDienstIUKN visibility=[FFDienstIUKN!=""] - } + // Text label="Dienste" icon="kalender" { + // Text item=FFDienstZVD + // Text item=FFDienstIUK2 + // Text item=FFDienstIUK3 + // Text item=FFDienstIUKN visibility=[FFDienstIUKN!=""] + // } } Frame label="Sonstiges" { Text label="Webcams" icon="camera" { Frame label="Anzeige" { Switch item=CamSelection label="Auswahl" mappings=[0="Vorne", 1="Hinten"] - Video url="http://admin:rt8qff8ppkma82bzxq2vcy3m3@10.112.30.31/record/current.jpg" encoding="mjpeg" visibility=[CamSelection==0, CamSelection=="Uninitialized"] + Video url="http://admin:rt8qff8ppkma82bzxq2vcy3m3@10.112.30.31/control/faststream.jpg?stream=full&fps=10&quality=75&size=1280&preview" encoding="mjpeg" visibility=[CamSelection==0, CamSelection=="Uninitialized"] - Video url="http://admin:pdgqa62v4f4bd9trmvp7z7t88@10.112.30.32/record/current.jpg" encoding="mjpeg" visibility=[CamSelection==1] + Video url="http://admin:pdgqa62v4f4bd9trmvp7z7t88@10.112.30.32/control/faststream.jpg?stream=full&fps=10&quality=75&size=1280&preview" encoding="mjpeg" visibility=[CamSelection==1] } Frame label="Sound" { Switch item=CamSoundLocSelection label="Auswahl" mappings=[0="Vorne", 1="Hinten", 2="Beide"] @@ -115,8 +115,7 @@ sitemap default label="Feuerwehr Rembrücken" { } Frame label="Wetter" { Text label="Blitzkarte" icon="lightning" { - Image url="http://www.blids.de/spion/bilder/aktkartegergrau.jpg" refresh=60000 - Image url="https://www.industry.siemens.com/services/global/de/portfolio/plant-data-services/blids/PublishingImages/BLIDS-Spion_Legende.png" refresh=60000 + Image url="https://service.aldis.at/iframe/blids/spion/spion_de.gif" refresh=60000 } Text label="Regenradar" icon="rain" { // Image url="https://www.dwd.de/DWD/wetter/radar/rad_brd_akt.jpg" refresh=900000 -- 2.49.0