From 9159d204c4b937582a7175c328eb5538d3e218f9 Mon Sep 17 00:00:00 2001 From: martinp876 <> Date: Thu, 7 Nov 2013 14:13:43 +0000 Subject: [PATCH] reset HMLAN pairForSec git-svn-id: https://svn.fhem.de/fhem/trunk@4170 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/00_HMLAN.pm | 2 +- fhem/FHEM/10_CUL_HM.pm | 14 ++-- fhem/FHEM/HMConfig.pm | 180 +++++++++++++++++++++-------------------- 3 files changed, 101 insertions(+), 95 deletions(-) diff --git a/fhem/FHEM/00_HMLAN.pm b/fhem/FHEM/00_HMLAN.pm index 3576257f6..ea419784a 100755 --- a/fhem/FHEM/00_HMLAN.pm +++ b/fhem/FHEM/00_HMLAN.pm @@ -274,7 +274,7 @@ sub HMLAN_Set($@) {############################################################ return "Usage: set $name hmPairForSec " if(!$arg || $arg !~ m/^\d+$/); $hash->{hmPair} = 1; - InternalTimer(gettimeofday()+$arg, "HMLAN_RemoveHMPair", "hmPairForSec:".$hash, 1); + InternalTimer(gettimeofday()+$arg, "HMLAN_RemoveHMPair", "hmPairForSec:".$name, 1); } elsif($type eq "hmPairSerial") { ################################ return "Usage: set $name hmPairSerial <10-character-serialnumber>" diff --git a/fhem/FHEM/10_CUL_HM.pm b/fhem/FHEM/10_CUL_HM.pm index 8c98e8654..a179f7dde 100755 --- a/fhem/FHEM/10_CUL_HM.pm +++ b/fhem/FHEM/10_CUL_HM.pm @@ -1653,7 +1653,6 @@ sub CUL_HM_parseCommon(@){##################################################### if (!$modules{CUL_HM}{helper}{hmManualOper}#no autoaction ||$iohash->{hmPair} ||$iohash->{hmPairSerial} ); - if( $dst =~ m /(000000|$id)/ #--- see if we need to pair &&($iohash->{hmPair} ||( $iohash->{hmPairSerial} @@ -2518,14 +2517,13 @@ sub CUL_HM_Set($@) { else{ #if($list == 1/5/6){ $lChn = "01" if ($chn eq "00"); #by default select chan 01 for device } - my $addrData; if ($dLen < 8){# fractional byte see whether we have stored the register #read full 8 bit!!! my $rName = CUL_HM_id2Name($dst.$lChn); $rName =~ s/_chn:.*//; my $curVal = CUL_HM_getRegFromStore($rName,$addr,$list,$peerId.$peerChn); - return "cannot calculate value. Please issue set $name getConfig first" + return "cannot calculate value. Please issue set $name getConfig first - $curVal" if ($curVal !~ m/^(set_|)(\d+)$/); $curVal = $2; # we expect one byte in int, strap 'set_' possibly $data = ($curVal & (~($mask<<$bit)))|($data<<$bit); @@ -4516,11 +4514,11 @@ sub CUL_HM_RTtempReadings($) {# parse RT temperature readings # transport some readings to relevant channels (window receivce here) my $wHash = $modules{CUL_HM}{defptr}{substr($hash->{DEF},0,6)."03"}; CUL_HM_UpdtReadBulk($wHash,1, - "R-winOpnTemp:" .ReadingsVal($name,"R-winOpnTemp" ,"unknown"), - "R-winOpnPeriod:".ReadingsVal($name,"R-winOpnPeriod","unknown"), - "R-winOpnBoost:" .ReadingsVal($name,"R-winOpnBoost" ,"unknown"), - "R-winOpnMode:" .ReadingsVal($name,"R-winOpnMode" ,"unknown"), - "R-winOpnDetFall:".ReadingsVal($name,"R-winOpnDetFall" ,"unknown"),); + "winOpnTemp:" .ReadingsVal($name,"R-winOpnTemp" ,"unknown"), + "winOpnPeriod:" .ReadingsVal($name,"R-winOpnPeriod" ,"unknown"), + "winOpnBoost:" .ReadingsVal($name,"R-winOpnBoost" ,"unknown"), + "winOpnMode:" .ReadingsVal($name,"R-winOpnMode" ,"unknown"), + "winOpnDetFall:".ReadingsVal($name,"R-winOpnDetFall" ,"unknown"),); return $setting; } sub CUL_HM_repReadings($) { # parse repeater diff --git a/fhem/FHEM/HMConfig.pm b/fhem/FHEM/HMConfig.pm index 91d57d976..711ef3511 100644 --- a/fhem/FHEM/HMConfig.pm +++ b/fhem/FHEM/HMConfig.pm @@ -872,94 +872,102 @@ $culHmRegModel{"HM-LC-SW4-BA-PCB"} = $culHmRegModel{"HM-LC-SW1-BA-PCB"}; $culHmRegModel{"HM-CC-RT-DN-BoM"} = $culHmRegModel{"HM-CC-RT-DN"}; my %culHmRegChan = (# if channelspecific then enter them here - "HM-CC-TC02" =>{displayMode =>1,displayTemp =>1,displayTempUnit =>1, - controlMode =>1,decalcDay =>1, - "day-temp" =>1,"night-temp" =>1,"party-temp" =>1, - mdTempValve =>1,partyEndDay =>1, - partyEndMin =>1,partyEndHr =>1, - decalHr =>1,decalMin =>1 - }, - "HM-CC-TC03" =>{tempWinOpen =>1, }, #window channel - "HM-RC-1912" =>{msgShowTime =>1, beepAtAlarm =>1, beepAtService =>1,beepAtInfo =>1, - backlAtAlarm =>1, backlAtService =>1, backlAtInfo =>1, - lcdSymb =>1, lcdLvlInterp =>1}, - "HM-OU-CFM-PL01" =>{ActTypeLed =>1}, - "HM-OU-CFM-PL02" =>{ActTypeMp3 =>1,Intense =>1}, - "HM-SEC-WIN01" =>{setupDir =>1,pullForce =>1,pushForce =>1,tiltMax =>1, - CtValLo =>1,CtValHi =>1, - CtOn =>1,CtOff =>1,CtRampOn =>1,CtRampOff =>1, - WinJtOn =>1,WinJtOff =>1,WinJtRampOn =>1,WinJtRampOff =>1, - OnTime =>1,OffTime =>1,OffLevelKm =>1, - OnLevelKm =>1,OnRampOnSp =>1,OnRampOffSp =>1 - }, - "WDF-solar01" =>{WinJtOn =>1,WinJtOff =>1,WinJtRampOn =>1,WinJtRampOff =>1, - OffLevel =>1,OnLevel =>1, - CtValLo =>1,CtValHi =>1, - CtOn =>1,CtOff =>1,CtRampOn =>1,CtRampOff =>1, - OnRampOnSp =>1,OnRampOffSp =>1, - OnTime =>1,OffTime =>1 - }, - "Schueco_263-xxx01" =>{statusInfoMinDly=>1,statusInfoRandom=>1, - #no long here!!! - shCtValLo =>1,shCtValHi =>1, - shCtOn =>1,shCtDlyOn =>1,shCtOff =>1,shCtDlyOff =>1, - shOnTime =>1,shOffTime =>1,shOnDly =>1,shOffDly =>1, - shActionTypeDim =>1,shOnTimeMode =>1,shOffTimeMode =>1, - shDimJtOn =>1,shDimJtOff =>1,shDimJtDlyOn =>1, - shDimJtDlyOff =>1,shDimJtRampOn =>1,shDimJtRampOff =>1, - shOnLevel =>1 + "HM-CC-TC02" =>{ displayMode =>1,displayTemp =>1,displayTempUnit =>1 + ,controlMode =>1,decalcDay =>1 + ,"day-temp" =>1,"night-temp" =>1,"party-temp" =>1 + ,mdTempValve =>1,partyEndDay =>1 + ,partyEndMin =>1,partyEndHr =>1 + ,decalHr =>1,decalMin =>1 + }, + "HM-CC-TC03" =>{ tempWinOpen =>1 }, #window channel + "HM-RC-1912" =>{ msgShowTime =>1, beepAtAlarm =>1, beepAtService =>1,beepAtInfo =>1 + ,backlAtAlarm =>1, backlAtService =>1, backlAtInfo =>1 + ,lcdSymb =>1, lcdLvlInterp =>1 }, - "Schueco_263-xxx02" =>{transmitTryMax =>1,eventDlyTime =>1}, - "Schueco_263-xxx03" =>{ttJtOn =>1,ttJtOff =>1}, - "HM-Sen-RD-O01" =>{eventFilterTimeB=>1,transmitTryMax =>1,peerNeedsBurst =>1,expectAES =>1, - condTxThrhHi =>1,condTxThrhHi =>1,highHoldTime =>1,evntRelFltTime =>1 }, - "HM-CC-RT-DN03" =>{shCtValLo =>1}, - "HM-CC-RT-DN04" =>{btnNoBckLight =>1, - dayTemp =>1,nightTemp =>1,tempMin =>1,tempMax =>1, - tempOffset =>1, - decalcWeekday =>1,decalcTime =>1, - boostPos =>1,boostPeriod =>1, - daylightSaveTime=>1,regAdaptive =>1, - showInfo =>1,noMinMax4Manu =>1,showWeekday =>1, - valveOffset =>1,valveMaxPos =>1,valveErrPos =>1, - modePrioManu =>1,modePrioParty =>1, - reguIntI =>1,reguIntP =>1,reguIntPstart =>1, - reguExtI =>1,reguExtP =>1,reguExtPstart =>1, - winOpnTemp =>1,winOpnPeriod =>1,winOpnBoost =>1,winOpnMode =>1, - winOpnDetFall =>1 + "HM-OU-CFM-PL01" =>{ ActTypeLed =>1}, + "HM-OU-CFM-PL02" =>{ ActTypeMp3 =>1,Intense =>1}, + "HM-SEC-WIN01" =>{ setupDir =>1,pullForce =>1,pushForce =>1,tiltMax =>1 + ,CtValLo =>1,CtValHi =>1 + ,CtOn =>1,CtOff =>1,CtRampOn =>1,CtRampOff =>1 + ,WinJtOn =>1,WinJtOff =>1,WinJtRampOn =>1,WinJtRampOff =>1 + ,OnTime =>1,OffTime =>1,OffLevelKm =>1 + ,OnLevelKm =>1,OnRampOnSp =>1,OnRampOffSp =>1 + }, + "WDF-solar01" =>{ WinJtOn =>1,WinJtOff =>1,WinJtRampOn =>1,WinJtRampOff =>1 + ,OffLevel =>1,OnLevel =>1 + ,CtValLo =>1,CtValHi =>1 + ,CtOn =>1,CtOff =>1,CtRampOn =>1,CtRampOff =>1 + ,OnRampOnSp =>1,OnRampOffSp =>1 + ,OnTime =>1,OffTime =>1 + }, + "Schueco_263-xxx01" =>{ statusInfoMinDly=>1,statusInfoRandom=>1, + ,#no long here!!! + ,shCtValLo =>1,shCtValHi =>1 + ,shCtOn =>1,shCtDlyOn =>1,shCtOff =>1,shCtDlyOff =>1 + ,shOnTime =>1,shOffTime =>1,shOnDly =>1,shOffDly =>1 + ,shActionTypeDim =>1,shOnTimeMode =>1,shOffTimeMode =>1 + ,shDimJtOn =>1,shDimJtOff =>1,shDimJtDlyOn =>1 + ,shDimJtDlyOff =>1,shDimJtRampOn =>1,shDimJtRampOff =>1 + ,shOnLevel =>1 + }, + "Schueco_263-xxx02" =>{ transmitTryMax =>1,eventDlyTime =>1}, + "Schueco_263-xxx03" =>{ ttJtOn =>1,ttJtOff =>1}, + "HM-Sen-RD-O01" =>{ eventFilterTimeB=>1,transmitTryMax =>1,peerNeedsBurst =>1,expectAES =>1 + ,condTxThrhHi =>1,condTxThrhHi =>1,highHoldTime =>1,evntRelFltTime =>1 + }, + "HM-CC-RT-DN03" =>{ shCtValLo =>1}, + "HM-CC-RT-DN04" =>{ btnNoBckLight =>1 + ,dayTemp =>1,nightTemp =>1,tempMin =>1,tempMax =>1 + ,tempOffset =>1 + ,decalcWeekday =>1,decalcTime =>1 + ,boostPos =>1,boostPeriod =>1 + ,daylightSaveTime=>1,regAdaptive =>1 + ,showInfo =>1,noMinMax4Manu =>1,showWeekday =>1 + ,valveOffset =>1,valveMaxPos =>1,valveErrPos =>1 + ,modePrioManu =>1,modePrioParty =>1 + ,reguIntI =>1,reguIntP =>1,reguIntPstart =>1 + ,reguExtI =>1,reguExtP =>1,reguExtPstart =>1 + ,winOpnTemp =>1,winOpnPeriod =>1,winOpnBoost =>1,winOpnMode =>1 + ,winOpnDetFall =>1 + }, + "HM-CC-RT-DN06" =>{ CtrlRc =>1,TempRC =>1}, + "HM-TC-IT-WM-W-EU02"=>{ dayTemp =>1,nightTemp =>1,tempMin =>1,tempMax =>1,tempOffset =>1 + ,hyst2point =>1,heatCool =>1,boostPeriod =>1,winOpnBoost =>1 + ,showWeekday =>1,showInfo =>1,showSetTemp =>1,showHumitidy =>1 + ,noMinMax4Manu =>1,daylightSaveTime=>1,sendWeatherData =>1 + ,modePrioParty =>1,modePrioManu =>1,weekPrgSel =>1 + }, + "HM-ES-PMSw1-Pl02" =>{ averaging =>1 + ,txMinDly =>1,txThrPwr =>1,txThrCur =>1,txThrVlt =>1,txThrFrq =>1 + }, + "HM-ES-PMSw1-Pl04" =>{ txThrLoPwr =>1,txThrHiPwr =>1 + ,CtDlyOn =>1,CtDlyOff =>1,CtOn =>1,CtOff =>1 + ,CtValLo =>1,CtValHi =>1 + ,OnDly =>1,OnTime =>1,OffDly =>1,OffTime =>1 + ,SwJtOn =>1,SwJtOff =>1,SwJtDlyOn =>1,SwJtDlyOff =>1 + ,ActionType =>1 + }, + "HM-ES-PMSw1-Pl04" =>{ txThrLoCur =>1,txThrHiCur =>1 + ,CtDlyOn =>1,CtDlyOff =>1,CtOn =>1,CtOff =>1 + ,CtValLo =>1,CtValHi =>1 + ,OnDly =>1,OnTime =>1,OffDly =>1,OffTime =>1 + ,SwJtOn =>1,SwJtOff =>1,SwJtDlyOn =>1,SwJtDlyOff =>1 + ,ActionType =>1 + }, + "HM-ES-PMSw1-Pl05" =>{ txThrLoVlt =>1,txThrHiVlt =>1 + ,CtDlyOn =>1,CtDlyOff =>1,CtOn =>1,CtOff =>1 + ,CtValLo =>1,CtValHi =>1 + ,OnDly =>1,OnTime =>1,OffDly =>1,OffTime =>1 + ,SwJtOn =>1,SwJtOff =>1,SwJtDlyOn =>1,SwJtDlyOff =>1 + ,ActionType =>1 + }, + "HM-ES-PMSw1-Pl06" =>{ txThrLoFrq =>1,txThrHiFrq =>1 + ,CtDlyOn =>1,CtDlyOff =>1,CtOn =>1,CtOff =>1 + ,CtValLo =>1,CtValHi =>1 + ,OnDly =>1,OnTime =>1,OffDly =>1,OffTime =>1 + ,SwJtOn =>1,SwJtOff =>1,SwJtDlyOn =>1,SwJtDlyOff =>1 + ,ActionType =>1 }, - "HM-CC-RT-DN06" =>{CtrlRc =>1,TempRC =>1}, - "HM-TC-IT-WM-W-EU02"=>{dayTemp =>1,nightTemp =>1,tempMin =>1,tempMax =>1,tempOffset =>1, - hyst2point =>1,heatCool =>1,boostPeriod =>1,winOpnBoost =>1, - showWeekday =>1,showInfo =>1,showSetTemp =>1,showHumitidy =>1, - noMinMax4Manu =>1,daylightSaveTime=>1,sendWeatherData =>1, - modePrioParty =>1,modePrioManu =>1,weekPrgSel =>1,}, - "HM-ES-PMSw1-Pl02" =>{averaging =>1, - txMinDly =>1,txThrPwr =>1,txThrCur =>1,txThrVlt =>1,txThrFrq =>1,}, - "HM-ES-PMSw1-Pl04" =>{txThrLoPwr =>1,txThrHiPwr =>1, - CtDlyOn =>1,CtDlyOff =>1,CtOn =>1,CtOff =>1, - CtValLo =>1,CtValHi =>1, - OnDly =>1,OnTime =>1,OffDly =>1,OffTime =>1, - SwJtOn =>1,SwJtOff =>1,SwJtDlyOn =>1,SwJtDlyOff =>1, - ActionType =>1,}, - "HM-ES-PMSw1-Pl04" =>{txThrLoCur =>1,txThrHiCur =>1, - CtDlyOn =>1,CtDlyOff =>1,CtOn =>1,CtOff =>1, - CtValLo =>1,CtValHi =>1, - OnDly =>1,OnTime =>1,OffDly =>1,OffTime =>1, - SwJtOn =>1,SwJtOff =>1,SwJtDlyOn =>1,SwJtDlyOff =>1, - ActionType =>1,}, - "HM-ES-PMSw1-Pl05" =>{txThrLoVlt =>1,txThrHiVlt =>1, - CtDlyOn =>1,CtDlyOff =>1,CtOn =>1,CtOff =>1, - CtValLo =>1,CtValHi =>1, - OnDly =>1,OnTime =>1,OffDly =>1,OffTime =>1, - SwJtOn =>1,SwJtOff =>1,SwJtDlyOn =>1,SwJtDlyOff =>1, - ActionType =>1,}, - "HM-ES-PMSw1-Pl06" =>{txThrLoFrq =>1,txThrHiFrq =>1, - CtDlyOn =>1,CtDlyOff =>1,CtOn =>1,CtOff =>1, - CtValLo =>1,CtValHi =>1, - OnDly =>1,OnTime =>1,OffDly =>1,OffTime =>1, - SwJtOn =>1,SwJtOff =>1,SwJtDlyOn =>1,SwJtDlyOff =>1, - ActionType =>1,}, ); #clones - - - - - - - - - - - - - - -