diff --git a/rules/Dienste.rules b/rules/Dienste.rules index 43ece05..34b966b 100644 --- a/rules/Dienste.rules +++ b/rules/Dienste.rules @@ -2,13 +2,14 @@ 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") NotificationPatrickPushover.sendCommand("Abfrage Erfolgt") var String jsonString = sendHttpGetRequest("https://fms.ffhstm.de/dienste_lesen_json.php") postUpdate(FFDienstZVD,transform("JSONPATH", "$.DIENSTE.C", jsonString)) - postUpdate(FFDienstIUK2,transform("JSONPATH", "$.DIENSTE.D1", jsonString)) + postUpdate(FFDienstIUK2,transform("JSONPATH", "$.DIENSTE.D", jsonString)) postUpdate(FFDienstIUK3,transform("JSONPATH", "$.DIENSTE.E", jsonString)) var String IUKN = transform("JSONPATH", "$.DIENSTE.F", jsonString) if (!IUKN.contains("DIENSTE")) { diff --git a/rules/FFRAlarm.rules b/rules/FFRAlarm.rules index f44996a..1df22d5 100644 --- a/rules/FFRAlarm.rules +++ b/rules/FFRAlarm.rules @@ -1,6 +1,7 @@ import java.util.concurrent.locks.ReentrantLock var ReentrantLock lockState = new ReentrantLock() var Timer FFAlarmTimer = null +var Timer FFAlarmSoundTimer = null rule "Auswertung Alarm JSON" when @@ -47,8 +48,22 @@ then postUpdate(FHZPush,"ON") REMWEBIO001_Ausgang5.sendCommand(ON) REMWEBIO001_Ausgang6.sendCommand(ON) - sendHttpGetRequest("http://admin:rt8qff8ppkma82bzxq2vcy3m3@10.112.30.31/control/rcontrol?action=sound&soundfile=q96_feuer2&speakerlevel=30") - sendHttpGetRequest("http://admin:pdgqa62v4f4bd9trmvp7z7t88@10.112.30.32/control/rcontrol?action=sound&soundfile=q96_feuer2&speakerlevel=30") + sendHttpGetRequest("http://admin:rt8qff8ppkma82bzxq2vcy3m3@10.112.30.31/control/rcontrol?action=sound&soundfile=FirehouseAlarmGongEinsatz&speakerlevel=30") + sendHttpGetRequest("http://admin:pdgqa62v4f4bd9trmvp7z7t88@10.112.30.32/control/rcontrol?action=sound&soundfile=FirehouseAlarmGongEinsatz&speakerlevel=30") + FFAlarmSound.sendCommand(ON) + FFAlarmSoundTimer = createTimer(now.plusSeconds(30)) [| + sendHttpGetRequest("http://admin:rt8qff8ppkma82bzxq2vcy3m3@10.112.30.31/control/rcontrol?action=sound&soundfile=FirehouseAlarmGongEinsatz&speakerlevel=30") + sendHttpGetRequest("http://admin:pdgqa62v4f4bd9trmvp7z7t88@10.112.30.32/control/rcontrol?action=sound&soundfile=FirehouseAlarmGongEinsatz&speakerlevel=30") + if (FFAlarmSound.state = ON) { + logInfo("FFRAlarm.rules", "Rescheduling timer") + FFAlarmSoundTimer.reschedule(now.plusSeconds(30)) + } else { + logInfo("FFRAlarm.rules", "All done") + FFAlarmSoundTimer.cancel() + FFAlarmSoundTimer = null + } + + ] FFAlarmTimer = createTimer(now.plusMinutes(60)) [| postUpdate(FFAlarmTrigger,"OFF") postUpdate(FHZPush,"OFF") diff --git a/sitemaps/default.sitemap b/sitemaps/default.sitemap index b7d3b93..2e8bd41 100644 --- a/sitemaps/default.sitemap +++ b/sitemaps/default.sitemap @@ -94,17 +94,6 @@ sitemap default label="Feuerwehr Rembrücken" { Text item=FFDienstIUK3 Text item=FFDienstIUKN visibility=[FFDienstIUKN!=""] } - Text label="Straßensperrung" icon="road_closed" { - Text item=FFSperrungen - } - Text item=availability icon=parents_1_1 { - Text item=Available_Gesamt - Text item=Available_Zugfuhrer valuecolor=[<1="red", >=1="green"] - Text item=Available_Gruppenfuhrer valuecolor=[<2="red", >=2="green"] - Text item=Available_Maschinisten valuecolor=[<1="red", >=1="green"] - Text item=Available_PATrager valuecolor=[<4="red", >=4="green"] - Text item=Available_CSATrager valuecolor=[<2="red", >=2="green"] - } } Frame label="Sonstiges" { Text label="Webcams" icon="camera" { @@ -116,7 +105,7 @@ sitemap default label="Feuerwehr Rembrücken" { } Frame label="Sound" { Switch item=CamSoundLocSelection label="Auswahl" mappings=[0="Vorne", 1="Hinten", 2="Beide"] - Selection item=CamSoundTone label="Ton" mappings=["Alarm"="Alarm", "AnsKeyNoFunction"="AnsKeyNoFunction", "AnsMsgBell"="AnsMsgBell", "AnsMsgKeypad"="AnsMsgKeypad", "AnsMsgNoAnswer"="AnsMsgNoAnswer", "Beep"="Beep", "Busy"="Busy", "Cuckooclock"="Cuckooclock", "Default"="Default", "DoorBell"="DoorBell", "Phonering"="Phonering", "Standard"="Standard", "q96_feuer2"="Q96"] + Selection item=CamSoundTone label="Ton" mappings=["Alarm"="Alarm", "AnsKeyNoFunction"="AnsKeyNoFunction", "AnsMsgBell"="AnsMsgBell", "AnsMsgKeypad"="AnsMsgKeypad", "AnsMsgNoAnswer"="AnsMsgNoAnswer", "Beep"="Beep", "Busy"="Busy", "Cuckooclock"="Cuckooclock", "Default"="Default", "DoorBell"="DoorBell", "Phonering"="Phonering", "Standard"="Standard", "q96_feuer2"="Q96", "FirehouseAlarmGong"="Alarmgong","FirehouseAlarmGongEinsatz"="Alarmgong Einsatz"] Setpoint item=CamSoundVolume label="Lautstärke" minValue=0 maxValue=30 step=1 Slider item=CamSoundVolume label="Lautstärke" switchSupport minValue=0 maxValue=30 step=1 Switch item=CamPlaySound label="Auswahl" mappings=[ON="Abspielen"]