FHEM/modul-XiaomiSmartHome
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

FIX Rename devices is now posible

Browse Source 
FIX: After rename a device the device now didnt create again. The new
name is used.
This commit is contained in:
Torte
2017-03-22 18:52:26 +01:00
parent 12d96b9968
commit 173974463c
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
FHEM/71_XiaomiSmartHome.pm
View File

@@ -490,9 +490,13 @@ sub XiaomiSmartHome_updateAllReadings($)
<br><br> <br><br>
Example: <code>define XiaomiSmartHome XiaomiSmartHome 192.168.1.xxx</code> Example: <code>define XiaomiSmartHome XiaomiSmartHome 192.168.1.xxx</code>
<br><br> <br><br>
</ul> </ul>
<br> <br>
<b>Prerequisite</b>
<ul>
<li>Installation of the following packages: apt-get install libio-socket-multicast-perl libjson-perl libcrypt-cbc-perl</li>
<li>And with CPAN: cpan Crypt::Cipher::AES</li>
</ul>
</ul> </ul>
=end html =end html

12
FHEM/71_XiaomiSmartHome_Device.pm
View File

@@ -120,16 +120,16 @@ sub XiaomiSmartHome_Device_Parse($$) {
my $model = $decoded->{'model'}; my $model = $decoded->{'model'};
my $name = $io_hash->{NAME}; my $name = $io_hash->{NAME};
if (my $hash = $modules{XiaomiSmartHome_Device}{defptr}{$sid}) if (my $io_hash = $modules{XiaomiSmartHome_Device}{defptr}{$sid})
{ {
Log3 $name, 4, "$name> IS DEFINED " . $model . " : " .$sid; Log3 $name, 4, "$name> IS DEFINED " . $model . " : " .$sid;
XiaomiSmartHome_Device_Read($hash, $msg, $name); XiaomiSmartHome_Device_Read($io_hash, $msg, $name);
} }
else else
{ {
Log3 $name, 4, "$name> UNDEFINED " . $model . " : " .$sid; Log3 $name, 4, "$name> UNDEFINED " . $model . " : " .$sid;
return "UNDEFINED $sid XiaomiSmartHome_Device $model $name"; return "UNDEFINED XMI_$sid XiaomiSmartHome_Device $sid $model $name";
} }
} }
##################################### #####################################
@@ -157,15 +157,15 @@ sub XiaomiSmartHome_Device_update($){
sub XiaomiSmartHome_Device_Define($$) { sub XiaomiSmartHome_Device_Define($$) {
my ($hash, $def) = @_; my ($hash, $def) = @_;
my ($name, $modul, $type, $iodev) = split("[ \t]+", $def); my ($name, $modul, $sid, $type, $iodev) = split("[ \t]+", $def);
#Log3 "test", 3, "Define status = " . $status; #Log3 "test", 3, "Define status = " . $status;
$hash->{TYPE} = $modul; $hash->{TYPE} = $modul;
$hash->{MODEL} = $type; $hash->{MODEL} = $type;
$hash->{SID} = $name; $hash->{SID} = $sid;
$hash->{NAME} = $name; $hash->{NAME} = $name;
$hash->{VERSION} = $version; $hash->{VERSION} = $version;
$hash->{STATE} = 'initialized'; $hash->{STATE} = 'initialized';
$modules{XiaomiSmartHome_Device}{defptr}{$name} = $hash; $modules{XiaomiSmartHome_Device}{defptr}{$sid} = $hash;
AssignIoPort($hash,$iodev); AssignIoPort($hash,$iodev);
if(defined($hash->{IODev}->{NAME})) { if(defined($hash->{IODev}->{NAME})) {