From ab861a3e1873ca43ff0e55de95aebc754ede1da8 Mon Sep 17 00:00:00 2001 From: rudolfkoenig <> Date: Mon, 16 Apr 2012 13:54:20 +0000 Subject: [PATCH] FHEMWEB AttrList dropdown mods git-svn-id: https://svn.fhem.de/fhem/trunk/fhem@1460 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- CHANGED | 1 + FHEM/10_CUL_HM.pm | 13 ++++++------- FHEM/10_FS20.pm | 2 +- FHEM/10_IT.pm | 2 +- FHEM/11_FHT.pm | 11 +++++++---- FHEM/12_HMS.pm | 2 +- FHEM/61_EMWZ.pm | 2 +- FHEM/62_EMEM.pm | 2 +- FHEM/63_EMGZ.pm | 2 +- FHEM/81_M232Counter.pm | 2 +- FHEM/82_M232Voltage.pm | 2 +- fhem.pl | 3 +-- 12 files changed, 23 insertions(+), 21 deletions(-) diff --git a/CHANGED b/CHANGED index 0a683001e..a86040d27 100644 --- a/CHANGED +++ b/CHANGED @@ -24,6 +24,7 @@ - feature: dummy got a setList attribute - feature: new module 02_RSS.pm - feature: at attribute alignTime added + - feature: FHEMWEB attribute values via dropdown - 2011-12-31 (5.2) - bugfix: applying smallscreen attributes to firefox/opera diff --git a/FHEM/10_CUL_HM.pm b/FHEM/10_CUL_HM.pm index b5c31cde9..80b22ef2e 100755 --- a/FHEM/10_CUL_HM.pm +++ b/FHEM/10_CUL_HM.pm @@ -130,13 +130,12 @@ CUL_HM_Initialize($) $hash->{DefFn} = "CUL_HM_Define"; $hash->{ParseFn} = "CUL_HM_Parse"; $hash->{SetFn} = "CUL_HM_Set"; - $hash->{AttrList} = "IODev do_not_notify:1,0 ignore:0,1 dummy:0,1 " . - "showtime:1,0 loglevel:0,1,2,3,4,5,6 model " . - "subType:switch,dimmer,blindActuator,remote,sensor,". - "swi,pushButton,threeStateSensor,motionDetector,". - "keyMatic,winMatic,smokeDetector " . - "hmClass:receiver,sender serialNr firmware devInfo ". - "rawToReadable unit"; + $hash->{AttrList} = "IODev do_not_notify:1,0 ignore:1,0 dummy:1,0 " . + "showtime:1,0 loglevel:0,1,2,3,4,5,6 " . + "hmClass:receiver,sender serialNr firmware devInfo"; + $hash->{AttrList} .= " model:" .join(",", sort values %culHmModel); + $hash->{AttrList} .= " subType:".join(",", sort + map { $culHmDevProps{$_}{st} } keys %culHmDevProps); } diff --git a/FHEM/10_FS20.pm b/FHEM/10_FS20.pm index c24604df9..eae43d272 100755 --- a/FHEM/10_FS20.pm +++ b/FHEM/10_FS20.pm @@ -122,7 +122,7 @@ FS20_Initialize($) $hash->{DefFn} = "FS20_Define"; $hash->{UndefFn} = "FS20_Undef"; $hash->{ParseFn} = "FS20_Parse"; - $hash->{AttrList} = "IODev follow-on-for-timer:1,0 do_not_notify:1,0 ignore:0,1 dummy:1,0 showtime:1,0 model:fs20as1,fs20as4,fs20bf,fs20di,fs20du,fs20hgs,fs20hgs,fs20ls,fs20ms2,fs20pira,fs20piri,fs20rst,fs20s20,fs20s4,fs20s4a,fs20s4m,fs20s4u,fs20s4ub,fs20s8,fs20sa,fs20sd,fs20sig,fs20sn,fs20sr,fs20ss,fs20st,fs20str,fs20sv,fs20tfk,fs20tfk,fs20tk,fs20usr,fs20uts,fs20ze loglevel:0,1,2,3,4,5,6"; + $hash->{AttrList} = "IODev follow-on-for-timer:1,0 do_not_notify:1,0 ignore:1,0 dummy:1,0 showtime:1,0 model:fs20as1,fs20as4,fs20bf,fs20di,fs20du,fs20hgs,fs20hgs,fs20ls,fs20ms2,fs20pira,fs20piri,fs20rst,fs20s20,fs20s4,fs20s4a,fs20s4m,fs20s4u,fs20s4ub,fs20s8,fs20sa,fs20sd,fs20sig,fs20sn,fs20sr,fs20ss,fs20st,fs20str,fs20sv,fs20tfk,fs20tfk,fs20tk,fs20usr,fs20uts,fs20ze loglevel:0,1,2,3,4,5,6"; } ##################################### diff --git a/FHEM/10_IT.pm b/FHEM/10_IT.pm index 65b7b83f2..9fbefe9f7 100644 --- a/FHEM/10_IT.pm +++ b/FHEM/10_IT.pm @@ -43,7 +43,7 @@ IT_Initialize($) $hash->{DefFn} = "IT_Define"; $hash->{UndefFn} = "IT_Undef"; # $hash->{ParseFn} = "IT_Parse"; - $hash->{AttrList} = "IODev switch_rfmode:1,0 do_not_notify:1,0 ignore:0,1 dummy:1,0 model;itremote,itswitch,itdimmer loglevel:0,1,2,3,4,5,6"; + $hash->{AttrList} = "IODev switch_rfmode:1,0 do_not_notify:1,0 ignore:0,1 dummy:1,0 model:itremote,itswitch,itdimmer loglevel:0,1,2,3,4,5,6"; } diff --git a/FHEM/11_FHT.pm b/FHEM/11_FHT.pm index 43ec4be64..b90c676dc 100755 --- a/FHEM/11_FHT.pm +++ b/FHEM/11_FHT.pm @@ -163,9 +163,9 @@ FHT_Initialize($) $hash->{DefFn} = "FHT_Define"; $hash->{UndefFn} = "FHT_Undef"; $hash->{ParseFn} = "FHT_Parse"; - $hash->{AttrList} = "IODev do_not_notify:0,1 model;fht80b dummy:0,1 " . - "showtime:0,1 loglevel:0,1,2,3,4,5,6 retrycount " . - "minfhtbuffer lazy tmpcorr ignore:0,1"; + $hash->{AttrList} = "IODev do_not_notify:1,0 model:fht80b dummy:1,0 " . + "showtime:1,0 loglevel:0,1,2,3,4,5,6 retrycount " . + "minfhtbuffer lazy tmpcorr ignore:1,0"; } @@ -421,7 +421,10 @@ FHT_Parse($$) $val = $c2m{$val} if(defined($c2m{$val})); } elsif($cmd =~ m/.*-temp/) { - $val = sprintf("%.1f", $val / 2) + $val = sprintf("%.1f", $val / 2); + if($cmd eq "desired-temp") { + $val = ($val > 30 ? "on" : ($val < 6 ? "off" : $val)); + } } elsif($cmd eq "lowtemp-offset") { $val = sprintf("%d.0", $val) diff --git a/FHEM/12_HMS.pm b/FHEM/12_HMS.pm index 0ab6475e2..0d14090fc 100755 --- a/FHEM/12_HMS.pm +++ b/FHEM/12_HMS.pm @@ -38,7 +38,7 @@ HMS_Initialize($) $hash->{DefFn} = "HMS_Define"; $hash->{UndefFn} = "HMS_Undef"; $hash->{ParseFn} = "HMS_Parse"; - $hash->{AttrList} = "IODev do_not_notify:0,1 showtime:0,1 model;hms100-t,hms100-tf,hms100-wd,hms100-mg,hms100-tfk,rm100-2,hms100-co,hms100-fit loglevel:0,1,2,3,4,5,6 ignore:0,1"; + $hash->{AttrList} = "IODev do_not_notify:0,1 showtime:0,1 model:hms100-t,hms100-tf,hms100-wd,hms100-mg,hms100-tfk,rm100-2,hms100-co,hms100-fit loglevel:0,1,2,3,4,5,6 ignore:0,1"; } ##################################### diff --git a/FHEM/61_EMWZ.pm b/FHEM/61_EMWZ.pm index 105c80d4a..7983c0b90 100755 --- a/FHEM/61_EMWZ.pm +++ b/FHEM/61_EMWZ.pm @@ -21,7 +21,7 @@ EMWZ_Initialize($) $hash->{SetFn} = "EMWZ_Set"; $hash->{DefFn} = "EMWZ_Define"; - $hash->{AttrList} = "IODev dummy:1,0 model;EM1000WZ loglevel:0,1,2,3,4,5,6"; + $hash->{AttrList} = "IODev dummy:1,0 model:EM1000WZ loglevel:0,1,2,3,4,5,6"; } diff --git a/FHEM/62_EMEM.pm b/FHEM/62_EMEM.pm index e3fd0b1b8..b33e4e3c6 100755 --- a/FHEM/62_EMEM.pm +++ b/FHEM/62_EMEM.pm @@ -19,7 +19,7 @@ EMEM_Initialize($) $hash->{GetFn} = "EMEM_Get"; $hash->{DefFn} = "EMEM_Define"; - $hash->{AttrList} = "IODev dummy:1,0 model;EM1000EM loglevel:0,1,2,3,4,5,6"; + $hash->{AttrList} = "IODev dummy:1,0 model:EM1000EM loglevel:0,1,2,3,4,5,6"; } ################################### diff --git a/FHEM/63_EMGZ.pm b/FHEM/63_EMGZ.pm index 6f7cda8a4..2c0f33b6d 100644 --- a/FHEM/63_EMGZ.pm +++ b/FHEM/63_EMGZ.pm @@ -21,7 +21,7 @@ EMGZ_Initialize($) $hash->{SetFn} = "EMGZ_Set"; $hash->{DefFn} = "EMGZ_Define"; - $hash->{AttrList} = "IODev dummy:1,0 model;EM1000GZ loglevel:0,1,2,3,4,5,6"; + $hash->{AttrList} = "IODev dummy:1,0 model:EM1000GZ loglevel:0,1,2,3,4,5,6"; } diff --git a/FHEM/81_M232Counter.pm b/FHEM/81_M232Counter.pm index 34cc6f54c..2df9c6dd2 100644 --- a/FHEM/81_M232Counter.pm +++ b/FHEM/81_M232Counter.pm @@ -28,7 +28,7 @@ M232Counter_Initialize($) $hash->{SetFn} = "M232Counter_Set"; $hash->{DefFn} = "M232Counter_Define"; - $hash->{AttrList} = "dummy:1,0 model;M232Counter loglevel:0,1,2,3,4,5"; + $hash->{AttrList} = "dummy:1,0 model:M232Counter loglevel:0,1,2,3,4,5"; } ################################### diff --git a/FHEM/82_M232Voltage.pm b/FHEM/82_M232Voltage.pm index 2428f38ab..82e932d96 100644 --- a/FHEM/82_M232Voltage.pm +++ b/FHEM/82_M232Voltage.pm @@ -25,7 +25,7 @@ M232Voltage_Initialize($) $hash->{GetFn} = "M232Voltage_Get"; $hash->{DefFn} = "M232Voltage_Define"; - $hash->{AttrList} = "dummy:1,0 model;M232Voltage loglevel:0,1,2,3,4,5"; + $hash->{AttrList} = "dummy:1,0 model:M232Voltage loglevel:0,1,2,3,4,5"; } ################################### diff --git a/fhem.pl b/fhem.pl index 23aac685c..44b0e9995 100755 --- a/fhem.pl +++ b/fhem.pl @@ -2017,7 +2017,6 @@ RemoveInternalTimer($) } } - ##################################### sub SignalHandling() @@ -2835,7 +2834,7 @@ concatc($$$) { sub createInterfaceDefinitions() { - Log 2, "Creating interface definitions..."; + #Log 2, "Creating interface definitions..."; # The interfaces list below consists of lines with the # pipe-separated parts # - name