| '; - }elsif( $val eq "armed" ){ - $res .= ' | '; - }else{ - $res .= ' | '; - } - } - $res.=' |
| '; + }elsif( $val eq "armwait" ){ + $res .= ' | '; + }elsif( $val eq "armed" ){ + $res .= ' | '; + }else{ + $res .= ' | '; + } + } + $res.=' |
| ";
+ $ret .= " ".Alarm_widget("name=".$name."&gstate=".$iconstate."&dstate=".$detailstate."&size=60x80")." "
+ if( AttrVal($name,"noicons",0)==0 );
+ $ret .= " | ";
+ $ret .= "{"setparms"}."\" onclick=\"javascript:alarm_set('$name')\"/> | ".
+ " ";
+ for( my $k=0;$k<$alarmno;$k++ ){
+ $ret .= "";
+ }
+ $ret .= " | ||||||||||||||||||||||
".$alarm_tt->{"settings"}." | ||||||||||||||||||||||||
| ||||||||||||||||||||||||
".$alarm_tt->{"sensors"}." | ||||||||||||||||||||||||
| ||||||||||||||||||||||||
".$alarm_tt->{"actors"}." | ||||||||||||||||||||||||
|
FHEM module to set up a house alarm system with 8 different alarm levels
define <name> Alarm
language to determine its output dataattr global language DE.set <name> save|restore
+
+ attr <name> testbutton 0|1
+ attr <name> testbutton 0|1
attr <name> statedisplay
simple,color,table,none
attr <name> noicons
+ 0|1
+ attr <name> iconmap list
+ attr <name> disarmcolor|armwaitcolor|armcolor|alarmcolor color
+ attr <name> armdelay mm:ss
attr <name> armwait action
@@ -1172,7 +1496,7 @@ sub Alarm_Html($)
level<level>start, level<level>end,
- level<level>msg, level<level>xec, level<level>onact,
+ level<level>msg, level<level>onact,
level<level>offact| ".YAAHM_statewidget($hash)." | ". "".$yaahm_tt->{"state"}." | ". "".ReadingsVal($name,"tr_housestate",undef).
- " | ".ReadingsVal($name,"sym_housestate",undef)." | ";
+ "".ReadingsVal($name,"sym_housestate",undef)." | ";
for( my $i=0; $i<$cols; $i++){
if( $i < int(@states)){
$ret .= "{$states[$i]}. @@ -3124,7 +3174,7 @@ sub YAAHM_toptable($){ #-- repeat manual next for every weekly table my $nval = ""; my $wupn; - $ret .= " |
| ".$yaahm_tt->{"manual"}." | "; + $ret .= "|||||
| ".$yaahm_tt->{"manual"}." | \n"; for (my $i=0;$i<$weeklyno;$i++){ if($i<$weeklyno-1){ $styl= "border-bottom:1px solid gray;border-top:1px solid gray"; @@ -3134,7 +3184,7 @@ sub YAAHM_toptable($){ $wupn = $hash->{DATA}{"WT"}[$i]{"name"}; $nval = ( defined($hash->{DATA}{"WT"}[$i]{"next"}) ) ? $hash->{DATA}{"WT"}[$i]{"next"} : ""; $ret .= sprintf("$wupn ". - " | ",$i,$i);
+ "\n",$i,$i,$i);
}
$ret .= "
language to determine its output dataattr global language DE.set <name> save|restore
- attr <name> noicons
0|1
attr <name> colorscheme
- 1|2
- attr <name> modecolor[0|1|2|3] color
+ attr <name> statecolor[0|1|2|3] color
+ attr <name> timeHelper <name of perl program>
attr <name> modeHelper <name of perl program>
diff --git a/fhem/www/pgm2/alarm.js b/fhem/www/pgm2/alarm.js
index cd71bf6fa..4de207149 100644
--- a/fhem/www/pgm2/alarm.js
+++ b/fhem/www/pgm2/alarm.js
@@ -1,10 +1,10 @@
//########################################################################################
// alarm.js
-// Version 2.81
+// Version 3.1
// See 95_Alarm for licensing
//########################################################################################
//# Prof. Dr. Peter A. Henning
-
+
function encodeParm(oldval) {
var newval;
newval = oldval.replace(/\+/g, '%2B');
@@ -13,134 +13,284 @@ function encodeParm(oldval) {
return newval;
}
-//var ah = new HashTable('l0s','','l0e','');
+//------------------------------------------------------------------------------------------------------
+// Animated Icon
+//------------------------------------------------------------------------------------------------------
+
+var bellfill;
+
+function blinkbell() {
+ var w = document.getElementById("alarmicon");
+ if (w) {
+ if (bellfill == alarmcolor) {
+ bellfill = "white";
+ w.getElementsByClassName("alarmst_b")[0].setAttribute("fill", "white");
+ w.getElementsByClassName("alarmst_sb")[0].setAttribute("fill", "white");
+ } else {
+ bellfill = alarmcolor;
+ w.getElementsByClassName("alarmst_b")[0].setAttribute("fill", alarmcolor);
+ w.getElementsByClassName("alarmst_sb")[0].setAttribute("fill", alarmcolor);
+ }
+ }
+}
+
+function updateIcon(name, alarmst) {
+ var w = document.getElementById(name);
+ if (w) {
+ switch (alarmst) {
+ case "disarmed":
+ w.getElementsByClassName("alarmst_b")[0].setAttribute("fill", "white");
+ w.getElementsByClassName("alarmst_sb")[0].setAttribute("fill", "white");
+ if (blinking == 1) {
+ clearInterval(blinker);
+ blinking = 0;
+ }
+ break;
+
+ case "mixed":
+ w.getElementsByClassName("alarmst_b")[0].setAttribute("fill", armwaitcolor);
+ w.getElementsByClassName("alarmst_sb")[0].setAttribute("fill", "white");
+ if (blinking == 1) {
+ clearInterval(blinker);
+ blinking = 0;
+ }
+ break;
+
+ case "armed":
+ w.getElementsByClassName("alarmst_b")[0].setAttribute("fill", armcolor);
+ w.getElementsByClassName("alarmst_sb")[0].setAttribute("fill", "white");
+ if (blinking == 1) {
+ clearInterval(blinker);
+ blinking = 0;
+ }
+ break;
+
+ default:
+ if (blinking == 0) {
+ blinker = setInterval('blinkbell()', 250);
+ blinking = 1;
+ }
+ }
+ }
+}
+
+$("body").on('DOMSubtreeModified', "#hid_levels", function () {
+ var w = document.getElementById("hid_levels");
+ var v = document.getElementById("alarmicon");
+ var t = v.getElementsByClassName("arec");
+ var ifnd;
+ var sfnd;
+ var col;
+ for (i = 0; i < alarmno; i++) {
+ var s = w.getElementsByClassName("hid_lx")[i].innerHTML;
+ if (ast[i] != s) {
+ switch(s){
+ case "disarmed":
+ col = disarmcolor;
+ break;
+ case "armwait":
+ col = armwaitcolor;
+ break;
+ case "armed":
+ col = armcolor;
+ break;
+ default:
+ col = alarmcolor
+ }
+ t[i].setAttribute("fill",col);
+ ast[i] = s;
+ ifnd = i;
+ sfnd = s;
+ }
+ }
+ if (ifnd && (iconmap.includes(ifnd))) {
+ var aan = true;
+ var adn = true;
+ var aln = "";
+ var atn = "";
+ for (i = 0; i < alarmno; i++) {
+ if (iconmap.includes(i)) {
+ var s = ast[i];
+ if (s != "disarmed" && s != "armwait" && s != "armed") {
+ aln = aln + i + ",";
+ atn = atn + s + ",";
+ } else {
+ adn = adn && ((s == "disarmed")||(s == "armwait"));
+ aan = aan && (s == "armed");
+ }
+ }
+ }
+
+ if (adn != ad || aan != aa || aln != al) {
+ aa = aan;
+ ad = adn;
+ al = aln;
+ at = atn;
+
+ var iconstate;
+ if (al != "") {
+ iconstate = al;
+ } else {
+ if (aa && (! ad)) {
+ iconstate = "armed";
+ } else {
+ if ((! aa) && ad) {
+ iconstate = "disarmed";
+ } else {
+ iconstate = "mixed";
+ }
+ }
+ }
+ updateIcon('alarmicon', iconstate);
+ }
+ }
+});
//------------------------------------------------------------------------------------------------------
// Write the Attribute Value
//------------------------------------------------------------------------------------------------------
-function alarm_setAttribute(name, attr, val) {//set Alarm Attribute
- var location = document.location.pathname;
- if (location.substr(location.length-1,1) == '/') {location = location.substr(0,location.length-1);}
- var url = document.location.protocol+"//"+document.location.host+location;
- FW_cmd(url+'?XHR=1&cmd.'+name+'=attr '+name+' '+encodeParm(attr)+' '+ encodeParm(val));
+
+function alarm_setAttribute(name, attr, val) {
+ //set Alarm Attribute
+ var location = document.location.pathname;
+ if (location.substr(location.length -1, 1) == '/') {
+ location = location.substr(0, location.length -1);
+ }
+ var url = document.location.protocol + "//" + document.location.host + location;
+ FW_cmd(url + '?XHR=1&cmd.' + name + '=attr ' + name + ' ' + encodeParm(attr) + ' ' + encodeParm(val));
}
-function alarm_cancel(name,level){
+function alarm_cancel(name, level) {
var val;
var nam;
-
+
var location = document.location.pathname;
- if (location.substr(location.length-1,1) == '/') {location = location.substr(0,location.length-1);}
- var url = document.location.protocol+"//"+document.location.host+location;
+ if (location.substr(location.length -1, 1) == '/') {
+ location = location.substr(0, location.length -1);
+ }
+ var url = document.location.protocol + "//" + document.location.host + location;
+
+ FW_cmd(url + '?XHR=1&cmd.' + name + '={Alarm_Exec("' + name + '",' + level + ',"web","button","off")}');
+}
- FW_cmd(url+'?XHR=1&cmd.'+name+'={Alarm_Exec("'+name+'",'+level+',"web","button","off")}');
- }
-
-function alarm_arm(name,level){
+function alarm_arm(name, level) {
var val;
var nam;
- var command = document.getElementById('l'+level+'x').checked;
- if (command == true){
- command="arm";
- }else{
- command="disarm";
+ var command = document.getElementById('l' + level + 'x').checked;
+ if (command == true) {
+ command = "arm";
+ } else {
+ command = "disarm";
}
var location = document.location.pathname;
- if (location.substr(location.length-1,1) == '/') {location = location.substr(0,location.length-1);}
- var url = document.location.protocol+"//"+document.location.host+location;
+ if (location.substr(location.length -1, 1) == '/') {
+ location = location.substr(0, location.length -1);
+ }
+ var url = document.location.protocol + "//" + document.location.host + location;
+
+ FW_cmd(url + '?XHR=1&cmd.' + name + '={Alarm_Arm("' + name + '",' + level + ',"web","button","' + command + '")}');
+}
- FW_cmd(url+'?XHR=1&cmd.'+name+'={Alarm_Arm("'+name+'",'+level+',"web","button","'+command+'")}');
- }
-
-function alarm_testaction(name,dev,type){
+function alarm_testaction(name, dev, type) {
var cmd;
var nam;
- if(type == 'set'){
- cmd = document.getElementById(dev).parentElement.children[2].children[0].value;
- }else{
- cmd = document.getElementById(dev).parentElement.children[3].children[0].value;
+ if (type == 'set') {
+ cmd = document.getElementById(dev).parentElement.children[2].children[0].value;
+ } else {
+ cmd = document.getElementById(dev).parentElement.children[3].children[0].value;
}
var cmds;
cmds = cmd.replace(/\\/g, '\\');
cmds = cmds.replace(/\'/g, '\"');
cmds = cmds.replace(/\$/g, '\\$');
- alert( cmds );
-
- var location = document.location.pathname;
- if (location.substr(location.length-1,1) == '/') {location = location.substr(0,location.length-1);}
- var url = document.location.protocol+"//"+document.location.host+location;
-
- FW_cmd(url+'?XHR=1&cmd.'+name+'={Alarm_Test("'+name+'","' + cmds + '")}');
- }
+ alert(cmds);
+ var location = document.location.pathname;
+ if (location.substr(location.length -1, 1) == '/') {
+ location = location.substr(0, location.length -1);
+ }
+ var url = document.location.protocol + "//" + document.location.host + location;
+
+ FW_cmd(url + '?XHR=1&cmd.' + name + '={Alarm_Test("' + name + '","' + cmds + '")}');
+}
-function alarm_set(name){
+
+function alarm_set(name) {
var val;
var nam;
-
+
var location = document.location.pathname;
- if (location.substr(location.length-1,1) == '/') {location = location.substr(0,location.length-1);}
- var url = document.location.protocol+"//"+document.location.host+location;
+ if (location.substr(location.length -1, 1) == '/') {
+ location = location.substr(0, location.length -1);
+ }
+ var url = document.location.protocol + "//" + document.location.host + location;
// saving arm data
- FW_cmd(url+'?XHR=1&cmd.'+name+'=attr '+name+' armdelay '+ document.getElementById('armdelay').value);
- FW_cmd(url+'?XHR=1&cmd.'+name+'=attr '+name+' armwait '+ encodeParm(document.getElementById('armwait').value));
- FW_cmd(url+'?XHR=1&cmd.'+name+'=attr '+name+' armact '+ encodeParm(document.getElementById('armaction').value));
- FW_cmd(url+'?XHR=1&cmd.'+name+'=attr '+name+' disarmact '+ encodeParm(document.getElementById('disarmaction').value));
- FW_cmd(url+'?XHR=1&cmd.'+name+'=attr '+name+' cancelact '+ encodeParm(document.getElementById('cancelaction').value));
+ FW_cmd(url + '?XHR=1&cmd.' + name + '=attr ' + name + ' armdelay ' + document.getElementById('armdelay').value);
+ FW_cmd(url + '?XHR=1&cmd.' + name + '=attr ' + name + ' armwait ' + encodeParm(document.getElementById('armwait').value));
+ FW_cmd(url + '?XHR=1&cmd.' + name + '=attr ' + name + ' armact ' + encodeParm(document.getElementById('armaction').value));
+ FW_cmd(url + '?XHR=1&cmd.' + name + '=attr ' + name + ' disarmact ' + encodeParm(document.getElementById('disarmaction').value));
+ FW_cmd(url + '?XHR=1&cmd.' + name + '=attr ' + name + ' cancelact ' + encodeParm(document.getElementById('cancelaction').value));
// saving start and end times
- for (var i = 0; i < alarmno; i++){
- FW_cmd(url+'?XHR=1&cmd.'+name+'=attr '+name+' level'+i+'start '+document.getElementById('l'+i+'s').value);
- FW_cmd(url+'?XHR=1&cmd.'+name+'=attr '+name+' level'+i+'end ' +document.getElementById('l'+i+'e').value);
- FW_cmd(url+'?XHR=1&cmd.'+name+'=attr '+name+' level'+i+'msg ' +document.getElementById('l'+i+'m').value);
- if (document.getElementById('l'+i+'x').checked == true ){
+ for (var i = 0;
+ i < alarmno;
+ i++) {
+ FW_cmd(url + '?XHR=1&cmd.' + name + '=attr ' + name + ' level' + i + 'start ' + document.getElementById('l' + i + 's').value);
+ FW_cmd(url + '?XHR=1&cmd.' + name + '=attr ' + name + ' level' + i + 'end ' + document.getElementById('l' + i + 'e').value);
+ FW_cmd(url + '?XHR=1&cmd.' + name + '=attr ' + name + ' level' + i + 'msg ' + document.getElementById('l' + i + 'm').value);
+ if (document.getElementById('l' + i + 'x').checked == true) {
val = "armed";
- }else{
+ } else {
val = "disarmed";
}
- FW_cmd(url+'?XHR=1&cmd.'+name+'=attr '+name+' level'+i+'xec ' + val);
- }
+ FW_cmd(url + '?XHR=1&cmd.' + name + '=attr ' + name + ' level' + i + 'xec ' + val);
+ }
//for (var k in ah.items) {
// ah.setItem(k,document.getElementById(k).value);
//}
// acquiring data for each sensor
- var sarr = document.getElementsByName('sensor');
- for (var k = 0; k < sarr.length; k++){
- nam = sarr[k].getAttribute('informId');
- val = "";
- for (var i = 0; i < alarmno; i++){
- if (sarr[k].children[1].children[i].checked == true ){
- val += "alarm"+i+",";
+ var sarr = document.getElementsByName('sensor');
+ for (var k = 0;
+ k < sarr.length;
+ k++) {
+ nam = sarr[k].getAttribute('informId');
+ val = "";
+ for (var i = 0;
+ i < alarmno;
+ i++) {
+ if (sarr[k].children[1].children[i].checked == true) {
+ val += "alarm" + i + ",";
}
}
- val += "|"+sarr[k].children[2].children[0].value;
- val += "|"+sarr[k].children[3].children[0].value;
- val += "|"+sarr[k].children[4].children[0].options[sarr[k].children[4].children[0].selectedIndex].value;
- FW_cmd(url+'?XHR=1&cmd.'+nam+'=attr '+nam+' alarmSettings ' + encodeParm(val));
+ val += "|" + sarr[k].children[2].children[0].value;
+ val += "|" + sarr[k].children[3].children[0].value;
+ val += "|" + sarr[k].children[4].children[0].options[sarr[k].children[4].children[0].selectedIndex].value;
+ FW_cmd(url + '?XHR=1&cmd.' + nam + '=attr ' + nam + ' alarmSettings ' + encodeParm(val));
}
// acquiring data for each actor
- var aarr = document.getElementsByName('actor');
- for (var k = 0; k < aarr.length; k++){
- nam = aarr[k].getAttribute('informId');
- val = "";
- for (var i = 0; i < alarmno; i++){
+ var aarr = document.getElementsByName('actor');
+ for (var k = 0;
+ k < aarr.length;
+ k++) {
+ nam = aarr[k].getAttribute('informId');
+ val = "";
+ for (var i = 0;
+ i < alarmno;
+ i++) {
//alert(" Checking "+k+" "+i)
- if (aarr[k].children[1].children[i].checked == true ){
- val += "alarm"+i+",";
+ if (aarr[k].children[1].children[i].checked == true) {
+ val += "alarm" + i + ",";
}
}
- val += "|"+aarr[k].children[2].children[0].value;
- val += "|"+aarr[k].children[3].children[0].value;
- val += "|"+aarr[k].children[4].children[0].value;
- FW_cmd(url+'?XHR=1&cmd.'+nam+'=attr '+nam+' alarmSettings ' + encodeParm(val));
+ val += "|" + aarr[k].children[2].children[0].value;
+ val += "|" + aarr[k].children[3].children[0].value;
+ val += "|" + aarr[k].children[4].children[0].value;
+ FW_cmd(url + '?XHR=1&cmd.' + nam + '=attr ' + nam + ' alarmSettings ' + encodeParm(val));
}
// creating notifiers
- FW_cmd(url+'?XHR=1&cmd.' + name + ' ={main::Alarm_CreateNotifiers("' + name + '")}');
-
-}
-
-
+ FW_cmd(url + '?XHR=1&cmd.' + name + ' ={main::Alarm_CreateNotifiers("' + name + '")}');
+}
\ No newline at end of file
diff --git a/fhem/www/pgm2/yaahm.js b/fhem/www/pgm2/yaahm.js
index 58682e45a..1c5b31462 100644
--- a/fhem/www/pgm2/yaahm.js
+++ b/fhem/www/pgm2/yaahm.js
@@ -98,10 +98,62 @@ function yaahm_setnext(name, i) {
FW_cmd(url + '?XHR=1&cmd.' + name + '={main::YAAHM_nextWeeklyTime("' + name + '","next_' + i + '","' + nval + '")}');
}
+//------------------------------------------------------------------------------------------------------
+// Write field value for next - first two here, the others dynamically
+//------------------------------------------------------------------------------------------------------
+
+$("body").on('DOMSubtreeModified', "#wt0_o",
+ function () {
+ nval = document.getElementById("wt0_o").innerHTML;
+ document.getElementById("wt0_n").value = nval;
+ })
+
+$("body").on('DOMSubtreeModified', "#wt1_o",
+ function () {
+ nval = document.getElementById("wt1_o").innerHTML;
+ document.getElementById("wt1_n").value = nval;
+ })
+
//------------------------------------------------------------------------------------------------------
// Animate housestate icon
//------------------------------------------------------------------------------------------------------
+var blinker;
+var hsfill;
+var hscolor;
+
+function blinkhs() {
+ var w = document.getElementById("wid_hs");
+ if (w) {
+ if (hsfill == hscolor) {
+ hsfill = "white";
+ w.getElementsByClassName("hs_is")[0].setAttribute("fill", "white");
+ } else {
+ hsfill = hscolor;
+ w.getElementsByClassName("hs_is")[0].setAttribute("fill", hscolor);
+ }
+ }
+}
+
+$("body").on('DOMSubtreeModified', "#sym_hs",
+function () {
+ var w = document.getElementById("wid_hs");
+ if (w) {
+ var symnew = document.getElementById("sym_hs").innerHTML;
+ if (blinking == 1 && symnew.includes("green")) {
+ clearInterval(blinker);
+ blinking = 0;
+ w.getElementsByClassName("hs_is")[0].setAttribute("fill", hscolor);
+ } else {
+ if (blinking == 0 && ! symnew.includes("green")) {
+ hscolor = w.getElementsByClassName("hs_is")[0].getAttribute("fill");
+ blinker = setInterval('blinkhs()', 1000);
+ blinking = 1;
+ }
+ }
+ }
+})
+
$("body").on('DOMSubtreeModified', "#hid_hs",
function () {
var hsnew = document.getElementById("hid_hs").innerHTML;
@@ -111,6 +163,7 @@ function () {
if (w) {
switch (hsnew) {
case "unsecured":
+ hscolor = csstate[0];
w.getElementsByClassName("hs_is")[0].setAttribute("fill", csstate[0]);
w.getElementsByClassName("hs_smb")[0].setAttribute("visibility", "hidden");
w.getElementsByClassName("hs_unlocked")[0].setAttribute("visibility", "visible");
@@ -118,6 +171,7 @@ function () {
w.getElementsByClassName("hs_eye")[0].setAttribute("visibility", "hidden");
break;
case "secured":
+ hscolor = csstate[1];
w.getElementsByClassName("hs_is")[0].setAttribute("fill", csstate[1]);
w.getElementsByClassName("hs_smb")[0].setAttribute("visibility", "hidden");
w.getElementsByClassName("hs_unlocked")[0].setAttribute("visibility", "hidden");
@@ -125,6 +179,7 @@ function () {
w.getElementsByClassName("hs_eye")[0].setAttribute("visibility", "hidden");
break;
case "protected":
+ hscolor = csstate[2];
w.getElementsByClassName("hs_is")[0].setAttribute("fill", csstate[2]);
w.getElementsByClassName("hs_smb")[0].setAttribute("visibility", "visible");
w.getElementsByClassName("hs_unlocked")[0].setAttribute("visibility", "hidden");
@@ -132,6 +187,7 @@ function () {
w.getElementsByClassName("hs_eye")[0].setAttribute("visibility", "hidden");
break;
case "guarded":
+ hscolor = csstate[3];
w.getElementsByClassName("hs_is")[0].setAttribute("fill", csstate[3]);
w.getElementsByClassName("hs_smb")[0].setAttribute("visibility", "visible");
w.getElementsByClassName("hs_unlocked")[0].setAttribute("visibility", "hidden");