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

-fix: check 'cmd' wrong, must define befor

Browse Source
This commit is contained in:
Torte
2017-10-30 07:35:20 +01:00
parent 9caee3a95f
commit d19108559b
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
FHEM/71_XiaomiSmartHome.pm
View File

@@ -51,7 +51,7 @@ use SetExtensions;
sub XiaomiSmartHome_Notify($$); sub XiaomiSmartHome_Notify($$);
sub XiaomiSmartHome_updateSingleReading($$); sub XiaomiSmartHome_updateSingleReading($$);
my $iv="\x17\x99\x6d\x09\x3d\x28\xdd\xb3\xba\x69\x5a\x2e\x6f\x58\x56\x2e"; my $iv="\x17\x99\x6d\x09\x3d\x28\xdd\xb3\xba\x69\x5a\x2e\x6f\x58\x56\x2e";
my $version = "1.12"; my $version = "1.14";
my %XiaomiSmartHome_gets = ( my %XiaomiSmartHome_gets = (
"getDevices" => ["get_id_list", '^.+get_id_list_ack' ], "getDevices" => ["get_id_list", '^.+get_id_list_ack' ],

7
FHEM/71_XiaomiSmartHome_Device.pm
View File

@@ -26,7 +26,7 @@ use strict;
use warnings; use warnings;
use Math::Round qw/nearest/; use Math::Round qw/nearest/;
my $version = "1.13"; my $version = "1.14";
sub XiaomiSmartHome_Device_updateSReading($); sub XiaomiSmartHome_Device_updateSReading($);
@@ -201,6 +201,7 @@ sub XiaomiSmartHome_Device_Read($$$){
} }
my $sid = $decoded->{'sid'}; my $sid = $decoded->{'sid'};
my $model = $decoded->{'model'}; my $model = $decoded->{'model'};
my $cmd = $decoded->{'cmd'};
Log3 $name, 5, "$name: DEV_Read> SID: " . $hash->{SID} . " " . $hash->{TYPE}; Log3 $name, 5, "$name: DEV_Read> SID: " . $hash->{SID} . " " . $hash->{TYPE};
my $data = eval{decode_json($decoded->{data})}; my $data = eval{decode_json($decoded->{data})};
if ($@) { if ($@) {
@@ -208,7 +209,7 @@ sub XiaomiSmartHome_Device_Read($$$){
return; return;
} }
readingsBeginUpdate( $hash ); readingsBeginUpdate( $hash );
if ($data->{cmd} ne 'heartbeat'){ if ($cmd ne 'heartbeat'){
if (defined $data->{status}){ if (defined $data->{status}){
Log3 $name, 3, "$name: DEV_Read>" . " Name: " . $hash->{NAME} . " SID: " . $sid . " Type: " . $hash->{MODEL} . " Status: " . $data->{status}; Log3 $name, 3, "$name: DEV_Read>" . " Name: " . $hash->{NAME} . " SID: " . $sid . " Type: " . $hash->{MODEL} . " Status: " . $data->{status};
readingsBulkUpdate($hash, "state", "$data->{status}", 1 ); readingsBulkUpdate($hash, "state", "$data->{status}", 1 );
@@ -341,7 +342,7 @@ sub XiaomiSmartHome_Device_Read($$$){
} }
#curtain end #curtain end
} }
if ($decoded->{'cmd'} eq 'heartbeat'){ if ($cmd eq 'heartbeat'){
readingsBulkUpdate($hash, 'heartbeat', $decoded->{'sid'} , 1 ); readingsBulkUpdate($hash, 'heartbeat', $decoded->{'sid'} , 1 );
} }

4
controls_mish.txt
View File

@@ -1,2 +1,2 @@
UPD 2017-10-24_08:55:31 36922 FHEM/71_XiaomiSmartHome.pm UPD 2017-10-30_07:30:44 36922 FHEM/71_XiaomiSmartHome.pm
UPD 2017-10-24_08:44:58 25216 FHEM/71_XiaomiSmartHome_Device.pm UPD 2017-10-30_07:30:27 25216 FHEM/71_XiaomiSmartHome_Device.pm