Public/fhem-mirror
1
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-05-04 22:19:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

sysTime for TC, update register for dimmer

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk/fhem@3001 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
martinp876 2013-03-30 19:03:29 +00:00
parent 27c6aa3dc6
commit c6af760dff
2 changed files with 61 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
FHEM/10_CUL_HM.pm
View File

@ -2315,6 +2315,10 @@ sub CUL_HM_Set($@) {
CUL_HM_pushConfig($hash, $id, $dst, 2,0,0,$list, $data); CUL_HM_pushConfig($hash, $id, $dst, 2,0,0,$list, $data);
readingsSingleUpdate($hash,"tempList$wd",$msg,0); readingsSingleUpdate($hash,"tempList$wd",$msg,0);
} }
elsif($cmd eq "sysTime") { ##################################################
my $s2000 = sprintf("%02X", CUL_HM_secSince2000());
CUL_HM_PushCmdStack($hash,"++803F$id${dst}0204$s2000");
}
elsif($cmd eq "valvePos") { ################################################# elsif($cmd eq "valvePos") { #################################################
return "only number <= 100 or 'off' allowed" return "only number <= 100 or 'off' allowed"
if (!($a[2] eq "off" ||$a[2]+0 ne $a[2] ||$a[2] <100 )); if (!($a[2] eq "off" ||$a[2]+0 ne $a[2] ||$a[2] <100 ));
@ -4270,6 +4274,8 @@ sub CUL_HM_putHash($) {# provide data for HMinfo
displayTempUnit [celsius|fahrenheit]<br> displayTempUnit [celsius|fahrenheit]<br>
controlMode [manual|auto|central|party]<br> controlMode [manual|auto|central|party]<br>
decalcDay &lt;day&gt;</li> decalcDay &lt;day&gt;</li>
<li>systime <br>
set time in climate channel to system time</li>
</ul><br> </ul><br>
</li> </li>
<li>OutputUnit (HM-OU-LED16) <li>OutputUnit (HM-OU-LED16)

72
FHEM/HMConfig.pm
View File

@ -490,7 +490,6 @@ my %culHmRegType = (
}, },
blindActuator =>{driveUp =>1,driveDown =>1,driveTurn =>1,refRunCounter =>1, blindActuator =>{driveUp =>1,driveDown =>1,driveTurn =>1,refRunCounter =>1,
sign =>1, sign =>1,
transmitTryMax =>1,statusInfoMinDly=>1,statusInfoRandom=>1, # nt present in all files
MaxTimeF =>1, MaxTimeF =>1,
OnDly =>1,OnTime =>1,OffDly =>1,OffTime =>1, OnDly =>1,OnTime =>1,OffDly =>1,OffTime =>1,
OffLevel =>1,OnLevel =>1, OffLevel =>1,OnLevel =>1,
@ -503,8 +502,7 @@ my %culHmRegType = (
lgMultiExec =>1, lgMultiExec =>1,
}, },
dimmer =>{transmitTryMax =>1,statusInfoMinDly=>1,statusInfoRandom=>1,powerUpAction =>1, dimmer =>{transmitTryMax =>1,statusInfoMinDly=>1,statusInfoRandom=>1,powerUpAction =>1,
confBtnTime =>1,
ovrTempLvl =>1,redTempLvl =>1,redLvl =>1,fuseDelay =>1,#not dim.L
OnDly =>1,OnTime =>1,OffDly =>1,OffTime =>1, OnDly =>1,OnTime =>1,OffDly =>1,OffTime =>1,
OffDlyBlink =>1,OnLvlPrio =>1,OnDlyMode =>1, OffDlyBlink =>1,OnLvlPrio =>1,OnDlyMode =>1,
ActionTypeDim =>1,OnTimeMode =>1,OffTimeMode =>1, ActionTypeDim =>1,OnTimeMode =>1,OffTimeMode =>1,
@ -517,12 +515,7 @@ my %culHmRegType = (
CtOn =>1,CtDlyOn =>1,CtRampOn =>1, CtOn =>1,CtDlyOn =>1,CtRampOn =>1,
CtOff =>1,CtDlyOff =>1,CtRampOff =>1, CtOff =>1,CtDlyOff =>1,CtRampOff =>1,
OffDlyNewTime =>1,OffDlyOldTime =>1, OffDlyNewTime =>1,OffDlyOldTime =>1,
DimElsOffTimeMd =>1,DimElsOnTimeMd =>1,
DimElsActionType=>1,
DimElsJtOn =>1,DimElsJtOff =>1,DimElsJtDlyOn =>1,
DimElsJtDlyOff =>1,DimElsJtRampOn =>1,DimElsJtRampOff =>1,
lgMultiExec =>1, lgMultiExec =>1,
logicCombination=>1,
}, },
switch =>{sign =>1, switch =>{sign =>1,
OnTime =>1,OffTime =>1,OnDly =>1,OffDly =>1, OnTime =>1,OffTime =>1,OnDly =>1,OffDly =>1,
@ -556,9 +549,43 @@ $culHmRegType{pushButton} = $culHmRegType{remote};
my %culHmRegModel = ( my %culHmRegModel = (
"HM-RC-12" =>{backAtKey =>1, backAtMotion =>1, backOnTime =>1}, "HM-RC-12" =>{backAtKey =>1, backAtMotion =>1, backOnTime =>1},
"HM-RC-19" =>{backAtKey =>1, backAtMotion =>1, backOnTime =>1,backAtCharge =>1,language =>1,}, "HM-RC-19" =>{backAtKey =>1, backAtMotion =>1, backOnTime =>1,backAtCharge =>1,language =>1,},
"HM-LC-Dim1PWM-CV"=>{characteristic =>1},
"HM-LC-Bl1PBU-FM" =>{transmitTryMax =>1,statusInfoMinDly=>1,statusInfoRandom=>1,localResDis =>1,},
"HM-LC-Dim1L-P" =>{loadAppearBehav =>1,loadErrCalib =>1}, "HM-LC-Dim1L-P" =>{loadAppearBehav =>1,loadErrCalib =>1},
"HM-LC-Dim1L-Pl-2"=>{confBtnTime =>1,loadAppearBehav =>1,loadErrCalib =>1,
},
"HM-LC-Dim1L-CV" =>{confBtnTime =>1,loadAppearBehav =>1,loadErrCalib =>1,
logicCombination=>1,
DimElsOffTimeMd =>1,DimElsOnTimeMd =>1,
DimElsActionType=>1,
DimElsJtOn =>1,DimElsJtOff =>1,DimElsJtDlyOn =>1,
DimElsJtDlyOff =>1,DimElsJtRampOn =>1,DimElsJtRampOff =>1,
},
"HM-LC-Dim1PWM-CV"=>{confBtnTime =>1,ovrTempLvl =>1,redTempLvl =>1,redLvl =>1,
characteristic =>1,
logicCombination=>1,
DimElsOffTimeMd =>1,DimElsOnTimeMd =>1,
DimElsActionType=>1,
DimElsJtOn =>1,DimElsJtOff =>1,DimElsJtDlyOn =>1,
DimElsJtDlyOff =>1,DimElsJtRampOn =>1,DimElsJtRampOff =>1,
},
"HM-LC-Dim1T-Pl" =>{confBtnTime =>1,ovrTempLvl =>1,redTempLvl =>1,redLvl =>1,
fuseDelay =>1,
logicCombination=>1,
DimElsOffTimeMd =>1,DimElsOnTimeMd =>1,
DimElsActionType=>1,
DimElsJtOn =>1,DimElsJtOff =>1,DimElsJtDlyOn =>1,
DimElsJtDlyOff =>1,DimElsJtRampOn =>1,DimElsJtRampOff =>1,
},
"HM-LC-Dim1TPBU-FM"=>{ ovrTempLvl =>1,redTempLvl =>1,redLvl =>1,
fuseDelay =>1,
logicCombination=>1,
DimElsOffTimeMd =>1,DimElsOnTimeMd =>1,
DimElsActionType=>1,
DimElsJtOn =>1,DimElsJtOff =>1,DimElsJtDlyOn =>1,
DimElsJtDlyOff =>1,DimElsJtRampOn =>1,DimElsJtRampOff =>1,
},
"HM-CC-VD" =>{valveOffset =>1,valveError =>1}, "HM-CC-VD" =>{valveOffset =>1,valveError =>1},
"HM-PB-4DIS-WM" =>{peerNeedsBurst =>1,expectAES =>1,language =>1,stbyTime =>1}, "HM-PB-4DIS-WM" =>{peerNeedsBurst =>1,expectAES =>1,language =>1,stbyTime =>1},
"HM-WDS100-C6-O" =>{stormUpThresh =>1,stormLowThresh =>1}, "HM-WDS100-C6-O" =>{stormUpThresh =>1,stormLowThresh =>1},
@ -609,12 +636,22 @@ my %culHmRegModel = (
expectAES =>1,peerNeedsBurst =>1,}, expectAES =>1,peerNeedsBurst =>1,},
); );
#clones - - - - - - - - - - - - - - - #clones - - - - - - - - - - - - - - -
$culHmRegModel{"HM-RC-12-B"} = $culHmRegModel{"HM-RC-12"}; $culHmRegModel{"HM-RC-12-B"} = $culHmRegModel{"HM-RC-12"};
$culHmRegModel{"HM-RC-12-SW"} = $culHmRegModel{"HM-RC-12"}; $culHmRegModel{"HM-RC-12-SW"} = $culHmRegModel{"HM-RC-12"};
$culHmRegModel{"HM-RC-19-B"} = $culHmRegModel{"HM-RC-19"}; $culHmRegModel{"HM-RC-19-B"} = $culHmRegModel{"HM-RC-19"};
$culHmRegModel{"HM-RC-19-SW"} = $culHmRegModel{"HM-RC-19"}; $culHmRegModel{"HM-RC-19-SW"} = $culHmRegModel{"HM-RC-19"};
$culHmRegModel{"HM-LC-Dim1L-CV"} = $culHmRegModel{"HM-LC-Dim1L-P"};
$culHmRegModel{"HM-LC-Dim1L-SM"} = $culHmRegModel{"HM-LC-Dim1L-P"}; $culHmRegModel{"HM-LC-Dim1L-CV"} = $culHmRegModel{"HM-LC-Dim1L-P"};
$culHmRegModel{"HM-LC-Dim1L-SM"} = $culHmRegModel{"HM-LC-Dim1L-P"};
$culHmRegModel{"HM-LC-Dim2L-CV"} = $culHmRegModel{"HM-LC-Dim1L-Pl-2"};
$culHmRegModel{"Schueco-263-132"} = $culHmRegModel{"HM-LC-Dim1L-Pl-2"};
$culHmRegModel{"HM-LC-Dim2L-SM"} = $culHmRegModel{"HM-LC-Dim1L-CV"};
$culHmRegModel{"HM-LC-Dim1L-Pl"} = $culHmRegModel{"HM-LC-Dim1L-CV"};
$culHmRegModel{"HM-LC-Dim1T-CV"} = $culHmRegModel{"HM-LC-Dim1T-Pl"};
$culHmRegModel{"HM-LC-Dim1T-Pl-2"} = $culHmRegModel{"HM-LC-Dim1T-Pl"};
$culHmRegModel{"HM-LC-Dim1T-FM"} = $culHmRegModel{"HM-LC-Dim1T-Pl"};
$culHmRegModel{"HM-LC-Dim2T-SM"} = $culHmRegModel{"HM-LC-Dim1T-Pl"};
$culHmRegModel{"Schueco-263-134"} = $culHmRegModel{"HM-LC-Dim1T-Pl"};
my %culHmRegChan = (# if channelspecific then enter them here my %culHmRegChan = (# if channelspecific then enter them here
@ -773,7 +810,8 @@ my %culHmChanSets = (
displayTemp => "[actual|setpoint]", displayTemp => "[actual|setpoint]",
displayTempUnit => "[celsius|fahrenheit]", displayTempUnit => "[celsius|fahrenheit]",
controlMode => "[manual|auto|central|party]", controlMode => "[manual|auto|central|party]",
decalcDay => "day", }, decalcDay => "day",
sysTime => "" },
"HM-SEC-WIN01"=>{ stop =>"", "HM-SEC-WIN01"=>{ stop =>"",
level =>"<level> <relockDly> <speed>..."}, level =>"<level> <relockDly> <speed>..."},
); );