FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-03-04 11:26:55 +00:00
Code Issues Releases Wiki Activity

fwupdate for blind aktor TBU

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@6351 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
martinp876 2014-08-03 13:00:21 +00:00
parent c9f32b5f87
commit 4b037e9283
2 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
fhem/FHEM/10_CUL_HM.pm
View File

@ -4419,12 +4419,13 @@ sub CUL_HM_Set($@) {#+++++++++++++++++ set command+++++++++++++++++++++++++++++
return ("",1) if ($target && $target eq "remote");#Nothing for actor return ("",1) if ($target && $target eq "remote");#Nothing for actor
} }
elsif($cmd eq "pair") { ##################################################### elsif($cmd =~ m/^(pair|getVersion)$/) { ####################################
$state = ""; $state = "";
my $serialNr = ReadingsVal($name, "D-serialNr", undef); my $serial = ReadingsVal($name, "D-serialNr", undef);
return "serialNr is not set" if(!$serialNr); return "serial $serial - wrong length or Reading D-serialNr not present"
CUL_HM_PushCmdStack($hash,"++A401".$id."000000010A".uc( unpack("H*",$serialNr))); if(length($serial) != 10);
$hash->{hmPairSerial} = $serialNr; CUL_HM_PushCmdStack($hash,"++A401".$id."000000010A".uc( unpack("H*",$serial)));
$hash->{hmPairSerial} = $serial if ($cmd eq "pair");
} }
elsif($cmd eq "hmPairForSec") { ############################################# elsif($cmd eq "hmPairForSec") { #############################################
$state = ""; $state = "";
@ -4437,15 +4438,14 @@ sub CUL_HM_Set($@) {#+++++++++++++++++ set command+++++++++++++++++++++++++++++
} }
elsif($cmd eq "hmPairSerial") { ############################################# elsif($cmd eq "hmPairSerial") { #############################################
$state = ""; $state = "";
my $arg = $a[2]?$a[2]:""; my $serial = $a[2]?$a[2]:"";
return "Usage: set $name hmPairSerial <10-character-serialnumber>" return "Usage: set $name hmPairSerial <10-character-serialnumber>"
if($arg !~ m/^.{10}$/); if(length($serial) != 10);
$hash->{HM_CMDNR} = $hash->{HM_CMDNR} ? ($hash->{HM_CMDNR}+1)%256 : 1; CUL_HM_PushCmdStack($hash, "++8401${dst}000000010A".uc( unpack('H*', $serial)));
CUL_HM_PushCmdStack($hash, "++8401${dst}000000010A".unpack('H*', $arg));
CUL_HM_RemoveHMPair("hmPairForSec:$name"); CUL_HM_RemoveHMPair("hmPairForSec:$name");
$hash->{hmPair} = 1; $hash->{hmPair} = 1;
$hash->{hmPairSerial} = $arg; $hash->{hmPairSerial} = $serial;
InternalTimer(gettimeofday()+30, "CUL_HM_RemoveHMPair", "hmPairForSec:$name", 1); InternalTimer(gettimeofday()+30, "CUL_HM_RemoveHMPair", "hmPairForSec:$name", 1);
} }

17
fhem/FHEM/HMConfig.pm
View File

@ -1278,12 +1278,10 @@ $culHmRegChan{"ROTO_ZEL-STG-RM-FWT03"}= $culHmRegChan{"HM-CC-TC03"};
); );
%culHmSubTypeDevSets = (# device of this subtype %culHmSubTypeDevSets = (# device of this subtype
switch =>{ statusRequest => "", switch =>{ statusRequest => ""
getSerial => ""}, ,getSerial => ""
dimmer =>{ statusRequest => "", ,getVersion => ""
getSerial => ""}, },
blindActuator =>{ statusRequest => "",
getSerial => ""},
# remote =>{ }, # remote =>{ },
# threeStateSensor =>{ statusRequest =>""}, # threeStateSensor =>{ statusRequest =>""},
# THSensor =>{ statusRequest =>""}, at least OT/OT2 do not support this # THSensor =>{ statusRequest =>""}, at least OT/OT2 do not support this
@ -1293,8 +1291,11 @@ $culHmRegChan{"ROTO_ZEL-STG-RM-FWT03"}= $culHmRegChan{"HM-CC-TC03"};
keyMatic =>{ statusRequest => ""}, keyMatic =>{ statusRequest => ""},
repeater =>{ statusRequest => "", repeater =>{ statusRequest => "",
getSerial => ""}, getSerial => ""},
outputUnit =>{ statusRequest => ""},# also LED16? proof outputUnit =>{ statusRequest => ""},
); );
$culHmSubTypeDevSets{dimmer} = $culHmSubTypeDevSets{switch};
$culHmSubTypeDevSets{blindActuator} = $culHmSubTypeDevSets{switch};
%culHmGlobalSetsChn = (# all channels but virtuals %culHmGlobalSetsChn = (# all channels but virtuals
sign => "[on|off]", sign => "[on|off]",
@ -1442,7 +1443,7 @@ $culHmModelSets{"HM-PB-4DIS-WM"} = $culHmModelSets{"HM-PB-4DIS-WM-2"};
"HM-CC-RT-DN00" =>{ sysTime =>"" "HM-CC-RT-DN00" =>{ sysTime =>""
,fwUpdate =>"<filename> <bootTime> ..." ,fwUpdate =>"<filename> <bootTime> ..."
}, },
"HM-LC-Bl1PBU-FM" =>{ fwUpdate =>"<filename> <bootTime> ..." "HM-LC-Bl1PBU-FM00" =>{ fwUpdate =>"<filename> <bootTime> ..."
}, },
"HM-CC-RT-DN04" =>{ controlMode =>"[auto|manual|boost|day|night]" "HM-CC-RT-DN04" =>{ controlMode =>"[auto|manual|boost|day|night]"
,controlManu =>"[on|off|5.0..30.0]" ,controlManu =>"[on|off|5.0..30.0]"