Public/fhem-mirror
1
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-05-01 20:20:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

HMConfig:introduce trgEvent and trgPress

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@15817 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
martinp876 2018-01-07 18:18:52 +00:00
parent ecefb2d9dd
commit 48534593ca
1 changed files with 46 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
fhem/FHEM/HMConfig.pm
View File

@ -21,9 +21,9 @@ use vars qw(%culHmGlobalGets);
use vars qw(%culHmVrtGets); use vars qw(%culHmVrtGets);
use vars qw(%culHmSubTypeGets); use vars qw(%culHmSubTypeGets);
use vars qw(%culHmModelGets); use vars qw(%culHmModelGets);
use vars qw(%culHmGlobalSetsDevice);
use vars qw(%culHmSubTypeDevSets); use vars qw(%culHmSubTypeDevSets);
use vars qw(%culHmGlobalSetsChn); use vars qw(%culHmGlobalSetsChn);
use vars qw(%culHmReglSets);
use vars qw(%culHmGlobalSets); use vars qw(%culHmGlobalSets);
use vars qw(%culHmGlobalSetsVrtDev); use vars qw(%culHmGlobalSetsVrtDev);
use vars qw(%culHmSubTypeSets); use vars qw(%culHmSubTypeSets);
@ -1653,7 +1653,7 @@ $culHmRegChan{"HM-OU-CFM-TW02"} = $culHmRegChan{"HM-OU-CFM-PL02"};
); );
##############################---set---######################################## ##############################---set---########################################
%culHmGlobalSets = (# all but virtuals %culHmGlobalSets = (# all but virtuals
regBulk => "-list-:-peer- -addr1:data1- -addr2:data2- ..." regBulk => "-list-:-peer- -addr1:data1- -addr2:data2- ..."
,getRegRaw => "[List0|List1|List2|List3|List4|List5|List6] ... [-PeerChannel-]" ,getRegRaw => "[List0|List1|List2|List3|List4|List5|List6] ... [-PeerChannel-]"
,getConfig => "" ,getConfig => ""
@ -1665,42 +1665,55 @@ $culHmRegChan{"HM-OU-CFM-TW02"} = $culHmRegChan{"HM-OU-CFM-PL02"};
virtual => "-noButtons-" virtual => "-noButtons-"
,clear => "[readings|rssi|msgEvents|unknownDev]" ,clear => "[readings|rssi|msgEvents|unknownDev]"
); );
%culHmGlobalSetsDevice = (# all devices but virtuals
raw => "data ..." %culHmReglSets = (# entities with regList
,reset => "" "0" =>{ #this is a device
,unpair => "" raw => "data ..."
,assignHmKey => "" ,reset => ""
,deviceRename => "newName" ,unpair => ""
,fwUpdate =>"-filename- -bootTime- ..." ,assignHmKey => ""
,deviceRename => "newName"
,fwUpdate =>"-filename- -bootTime- ..."
}
,"1" =>{ #this is a channel
sign => "[on|off]"
}
,"3p" =>{ press =>"[long|short] -peer- [-repCount(long only)-] [-repDelay-] ..."
,eventL =>"-peer- -cond-"
,eventS =>"-peer- -cond-"
}
,"4p" =>{ trgPressS =>"[-peer-]"
,trgPressL =>"[-peer-]"
,trgEventS =>"[-peer-] -condition-"
,trgEventL =>"[-peer-] -condition-"
}
); );
%culHmSubTypeDevSets = (# device of this subtype %culHmSubTypeDevSets = (# device of this subtype
switch =>{ getSerial => "" switch =>{ getSerial => ""
,pair => "" ,pair => ""
,getVersion => "" ,getVersion => ""
,getDevInfo => "" ,getDevInfo => ""
} }
# ,winMatic =>{ statusRequest => ""} not working at least for FW 1.6 # ,winMatic =>{ statusRequest => ""} not working at least for FW 1.6
,keyMatic =>{ statusRequest => ""} ,keyMatic =>{ statusRequest => ""}
,repeater =>{ statusRequest => "" ,repeater =>{ statusRequest => ""
,getSerial => "" ,getSerial => ""
} }
); );
$culHmSubTypeDevSets{dimmer} = $culHmSubTypeDevSets{dimmer} =
$culHmSubTypeDevSets{blindActuator} = $culHmSubTypeDevSets{switch}; $culHmSubTypeDevSets{blindActuator} = $culHmSubTypeDevSets{switch};
%culHmGlobalSetsChn = (# all channels but virtuals
%culHmGlobalSetsChn = (# all channels but virtuals peerBulk => "-peer1,peer2,...- [set|unset]"
sign => "[on|off]"
,peerBulk => "-peer1,peer2,...- [set|unset]"
); );
%culHmSubTypeSets = (# channels of this subtype %culHmSubTypeSets = (# channels of this subtype
switch =>{ "on-for-timer" =>"-ontime-" switch =>{ "on-for-timer" =>"-ontime-"
,"on-till" =>"-time-" ,"on-till" =>"-time-"
,on =>"" ,on =>""
,off =>"" ,off =>""
,toggle =>"" ,toggle =>""
,press =>"[long|short] [-peer-] [-repCount(long only)-] [-repDelay-] ..." # ,press =>"[long|short] [-peer-] [-repCount(long only)-] [-repDelay-] ..."
,inhibit =>"[on|off]" ,inhibit =>"[on|off]"
,statusRequest =>"" ,statusRequest =>""
,peerIODev =>"[IO] -btn- [set|unset]... not for future use" ,peerIODev =>"[IO] -btn- [set|unset]... not for future use"
@ -1713,7 +1726,7 @@ $culHmSubTypeDevSets{blindActuator} = $culHmSubTypeDevSets{switch};
,toggle =>"" ,toggle =>""
,pct =>"[-value-|old] ... [-ontime-] [-ramptime-]" ,pct =>"[-value-|old] ... [-ontime-] [-ramptime-]"
,stop =>"" ,stop =>""
,press =>"[long|short] [on|off|-peer-] [-repCount(long only)-] [-repDelay-] ..." # ,press =>"[long|short] [on|off|-peer-] [-repCount(long only)-] [-repDelay-] ..."
,up =>"[-changeValue-] [-ontime-] [-ramptime-] ..." ,up =>"[-changeValue-] [-ontime-] [-ramptime-] ..."
,down =>"[-changeValue-] [-ontime-] [-ramptime-] ..." ,down =>"[-changeValue-] [-ontime-] [-ramptime-] ..."
,inhibit =>"[on|off]" ,inhibit =>"[on|off]"
@ -1726,7 +1739,7 @@ $culHmSubTypeDevSets{blindActuator} = $culHmSubTypeDevSets{switch};
,toggleDir =>"" ,toggleDir =>""
,pct =>"[-value-] ... [-ontime-]" ,pct =>"[-value-] ... [-ontime-]"
,stop =>"" ,stop =>""
,press =>"[long|short] [on|off|-peer-] [-repCount(long only)-] [-repDelay-] ..." # ,press =>"[long|short] [on|off|-peer-] [-repCount(long only)-] [-repDelay-] ..."
,up =>"[-changeValue-] [-ontime-] [-ramptime-] ..." ,up =>"[-changeValue-] [-ontime-] [-ramptime-] ..."
,down =>"[-changeValue-] [-ontime-] [-ramptime-] ..." ,down =>"[-changeValue-] [-ontime-] [-ramptime-] ..."
,inhibit =>"[on|off]" ,inhibit =>"[on|off]"
@ -1779,7 +1792,7 @@ $culHmSubTypeSets{motionAndBtn} = $culHmSubTypeSets{threeStateSensor};
,on =>"" ,on =>""
,off =>"" ,off =>""
,toggle =>"" ,toggle =>""
,press =>"[long|short] [-peer-] ..." # ,press =>"[long|short] [-peer-] ..."
,inhibit =>"[on|off]" ,inhibit =>"[on|off]"
} }
,"HM-CC-TC" =>{ burstXmit =>""} ,"HM-CC-TC" =>{ burstXmit =>""}
@ -1850,7 +1863,7 @@ $culHmModelSets{"HM-Sen-Wa-Od"} = $culHmModelSets{"HM-SEC-SD"};
,level =>"-level- -relockDly- -speed-..." ,level =>"-level- -relockDly- -speed-..."
,keydef =>"-btn- -txt1- -txt2-" ,keydef =>"-btn- -txt1- -txt2-"
,inhibit =>"[on|off]" ,inhibit =>"[on|off]"
,press =>"[long|short] [-peer-] [-repCount(long only)-] [-repDelay-]..." # ,press =>"[long|short] [-peer-] [-repCount(long only)-] [-repDelay-]..."
,peerIODev =>"[IO] -btn- [set|unset]... not for future use" ,peerIODev =>"[IO] -btn- [set|unset]... not for future use"
} }
,"HM-Sen-RD-O02" =>{ "on-for-timer" =>"-sec-" ,"HM-Sen-RD-O02" =>{ "on-for-timer" =>"-sec-"
@ -1875,7 +1888,7 @@ $culHmModelSets{"HM-Sen-Wa-Od"} = $culHmModelSets{"HM-SEC-SD"};
,"desired-temp" =>"[on|off|5.0..30.0]" ,"desired-temp" =>"[on|off|5.0..30.0]"
,sysTime =>"" ,sysTime =>""
} }
,"HM-CC-RT-DN06" =>{ press =>"[long|short] [-peer-] [-repCount(long only)-] [-repDelay-] ..."} # ,"HM-CC-RT-DN06" =>{ press =>"[long|short] [-peer-] [-repCount(long only)-] [-repDelay-] ..."}
,"HM-TC-IT-WM-W-EU00" =>{ sysTime =>"" ,"HM-TC-IT-WM-W-EU00" =>{ sysTime =>""
,getSerial => "" ,getSerial => ""
} }
@ -1922,7 +1935,7 @@ $culHmModelSets{"HM-Sen-Wa-Od"} = $culHmModelSets{"HM-SEC-SD"};
,toggle =>"" ,toggle =>""
,pct =>"-value- ... [-ontime-] [-ramptime-]" ,pct =>"-value- ... [-ontime-] [-ramptime-]"
,stop =>"" ,stop =>""
,press =>"[long|short] [on|off|-peer-] [-repCount(long only)-] [-repDelay-] ..." # ,press =>"[long|short] [on|off|-peer-] [-repCount(long only)-] [-repDelay-] ..."
,up =>"[-changeValue-] [-ontime-] [-ramptime-] ..." ,up =>"[-changeValue-] [-ontime-] [-ramptime-] ..."
,down =>"[-changeValue-] [-ontime-] [-ramptime-] ..." ,down =>"[-changeValue-] [-ontime-] [-ramptime-] ..."
,inhibit =>"[on|off]" ,inhibit =>"[on|off]"
@ -1944,10 +1957,10 @@ $culHmModelSets{"HM-Sen-Wa-Od"} = $culHmModelSets{"HM-SEC-SD"};
,"on-for-timer" =>"-ontime-" ,"on-for-timer" =>"-ontime-"
,"on-till" =>"-time-" ,"on-till" =>"-time-"
,inhibit =>"[on|off]" ,inhibit =>"[on|off]"
,press =>"[long|short] [-peer-] [-repCount(long only)-] [-repDelay-] ..." # ,press =>"[long|short] [-peer-] [-repCount(long only)-] [-repDelay-] ..."
} }
,"HM-Sec-Sir-WM04" =>{ alarmLevel =>"[disarmed|armExtSens|armAll|armBlocked]" ,"HM-Sec-Sir-WM04" =>{ alarmLevel =>"[disarmed|armExtSens|armAll|armBlocked]"
,press =>"[long|short] [-peer-] [-repCount(long only)-] [-repDelay-] ..." # ,press =>"[long|short] [-peer-] [-repCount(long only)-] [-repDelay-] ..."
} }
,"HM-Dis-EP-WM5503" =>{ displayEP =>"text1,icon1:text2,icon2:text3,icon3 ... -sound- -repetition- -pause- -signal-"} ,"HM-Dis-EP-WM5503" =>{ displayEP =>"text1,icon1:text2,icon2:text3,icon3 ... -sound- -repetition- -pause- -signal-"}
); );
@ -2159,8 +2172,8 @@ $culHmChanSets{"HM-Dis-EP-WM5502"} = $culHmChanSets{"HM-TC-IT-WM-W-EU01"};
"12" => { txt => "HAVE_DATA"}, "12" => { txt => "HAVE_DATA"},
"3E" => { txt => "SWITCH" , params => { "3E" => { txt => "SWITCH" , params => {
DST => "00,6", PEER => "00,6",
UNKNOWN => "06,2", fix => "06,2",
CHANNEL => "08,2", CHANNEL => "08,2",
COUNTER => "10,2", } }, COUNTER => "10,2", } },
"3F" => { txt => "TimeStamp" , params => { "3F" => { txt => "TimeStamp" , params => {