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

fix: missing curlybracket

Browse Source 
oooopps shit somthing wrong
This commit is contained in:
Torte
2017-04-03 22:34:33 +02:00
parent 383cf54998
commit 34a81d549d
2 changed files with 13 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
FHEM/71_XiaomiSmartHome_Device.pm
View File

@@ -25,7 +25,7 @@ package main;
use strict; use strict;
use warnings; use warnings;
my $version = "0.10"; my $version = "0.11";
sub XiaomiSmartHome_Device_updateSReading($); sub XiaomiSmartHome_Device_updateSReading($);
##################################### #####################################
@@ -98,7 +98,6 @@ sub XiaomiSmartHome_Device_on_timeout($){
sub XiaomiSmartHome_Device_Read($$$){ sub XiaomiSmartHome_Device_Read($$$){
my ($hash, $msg, $name) = @_; my ($hash, $msg, $name) = @_;
my $decoded = decode_json($msg); my $decoded = decode_json($msg);
my $sid = $decoded->{'sid'}; my $sid = $decoded->{'sid'};
my $model = $decoded->{'model'}; my $model = $decoded->{'model'};
Log3 $name, 5, "$name: SID: " . $hash->{SID} . " " . $hash->{TYPE}; Log3 $name, 5, "$name: SID: " . $hash->{SID} . " " . $hash->{TYPE};
@@ -113,63 +112,61 @@ sub XiaomiSmartHome_Device_Read($$$){
if ($data->{status} eq 'close' && $hash->{MODEL} eq 'magnet'){ if ($data->{status} eq 'close' && $hash->{MODEL} eq 'magnet'){
readingsBulkUpdate($hash, "no_close", "0", 1 ); readingsBulkUpdate($hash, "no_close", "0", 1 );
} }
if(defined $data->{no_motion}){ }
if (defined $data->{no_motion}){
Log3 $name, 3, "$name>" . " SID: " . $sid . " Type: " . $hash->{MODEL} . " NO_motion: " . $data->{no_motion}; Log3 $name, 3, "$name>" . " SID: " . $sid . " Type: " . $hash->{MODEL} . " NO_motion: " . $data->{no_motion};
readingsBulkUpdate($hash, "no_motion", "$data->{no_motion}", 1 ); readingsBulkUpdate($hash, "no_motion", "$data->{no_motion}", 1 );
} }
if(defined $data->{no_close}){ if (defined $data->{no_close}){
Log3 $name, 3, "$name>" . " SID: " . $sid . " Type: " . $hash->{MODEL} . " NO_close: " . $data->{no_close}; Log3 $name, 3, "$name>" . " SID: " . $sid . " Type: " . $hash->{MODEL} . " NO_close: " . $data->{no_close};
readingsBulkUpdate($hash, "no_close", "$data->{no_close}", 1 ); readingsBulkUpdate($hash, "no_close", "$data->{no_close}", 1 );
} }
if(defined $data->{voltage}){ if (defined $data->{voltage}){
Log3 $name, 3, "$name>" . " SID: " . $sid . " Type: " . $hash->{MODEL} . " Voltage: " . $data->{voltage}; Log3 $name, 3, "$name>" . " SID: " . $sid . " Type: " . $hash->{MODEL} . " Voltage: " . $data->{voltage};
readingsBulkUpdate($hash, "voltage", "$data->{voltage}", 1 ); readingsBulkUpdate($hash, "voltage", "$data->{voltage}", 1 );
} }
if(defined $data->{temperature}){ if (defined $data->{temperature}){
my $temp = $data->{temperature}; my $temp = $data->{temperature};
$temp =~ s/(^[-+]?\d+?(?=(?>(?:\d{2})+)(?!\d))|\G\d{2}(?=\d))/$1./g; $temp =~ s/(^[-+]?\d+?(?=(?>(?:\d{2})+)(?!\d))|\G\d{2}(?=\d))/$1./g;
Log3 $name, 3, "$name>" . " SID: " . $sid . " Type: " . $hash->{MODEL} . " Temperature: " . $temp; Log3 $name, 3, "$name>" . " SID: " . $sid . " Type: " . $hash->{MODEL} . " Temperature: " . $temp;
readingsBulkUpdate($hash, "temperature", "$temp", 1 ); readingsBulkUpdate($hash, "temperature", "$temp", 1 );
} }
if(defined $data->{humidity}){ if (defined $data->{humidity}){
my $hum = $data->{humidity}; my $hum = $data->{humidity};
$hum =~ s/(^[-+]?\d+?(?=(?>(?:\d{2})+)(?!\d))|\G\d{2}(?=\d))/$1./g; $hum =~ s/(^[-+]?\d+?(?=(?>(?:\d{2})+)(?!\d))|\G\d{2}(?=\d))/$1./g;
Log3 $name, 3, "$name>" . " SID: " . $sid . " Type: " . $hash->{MODEL} . " Humidity: " . $hum; Log3 $name, 3, "$name>" . " SID: " . $sid . " Type: " . $hash->{MODEL} . " Humidity: " . $hum;
readingsBulkUpdate($hash, "humidity", "$hum", 1 ); readingsBulkUpdate($hash, "humidity", "$hum", 1 );
} }
#plug start #plug start
if(defined $data->{load_voltage}){ if (defined $data->{load_voltage}){
Log3 $name, 3, "$name>" . " SID: " . $sid . " Type: " . $hash->{MODEL} . " LOAD_Voltage: " . $data->{load_voltage}; Log3 $name, 3, "$name>" . " SID: " . $sid . " Type: " . $hash->{MODEL} . " LOAD_Voltage: " . $data->{load_voltage};
readingsBulkUpdate($hash, "LOAD_Voltage", "$data->{load_voltage}", 1 ); readingsBulkUpdate($hash, "LOAD_Voltage", "$data->{load_voltage}", 1 );
} }
if(defined $data->{load_power}){ if (defined $data->{load_power}){
Log3 $name, 3, "$name>" . " SID: " . $sid . " Type: " . $hash->{MODEL} . " LOAD_Power: " . $data->{load_power}; Log3 $name, 3, "$name>" . " SID: " . $sid . " Type: " . $hash->{MODEL} . " LOAD_Power: " . $data->{load_power};
readingsBulkUpdate($hash, "LOAD_Power", "$data->{load_power}", 1 ); readingsBulkUpdate($hash, "LOAD_Power", "$data->{load_power}", 1 );
} }
if(defined $data->{power_consumed}){ if (defined $data->{power_consumed}){
Log3 $name, 3, "$name>" . " SID: " . $sid . " Type: " . $hash->{MODEL} . " POWER_Consumed: " . $data->{power_consumed}; Log3 $name, 3, "$name>" . " SID: " . $sid . " Type: " . $hash->{MODEL} . " POWER_Consumed: " . $data->{power_consumed};
readingsBulkUpdate($hash, "POWER_Consumed", "$data->{power_consumed}", 1 ); readingsBulkUpdate($hash, "POWER_Consumed", "$data->{power_consumed}", 1 );
} }
if(defined $data->{inuse}){ if (defined $data->{inuse}){
Log3 $name, 3, "$name>" . " SID: " . $sid . " Type: " . $hash->{MODEL} . " InUse: " . $data->{inuse}; Log3 $name, 3, "$name>" . " SID: " . $sid . " Type: " . $hash->{MODEL} . " InUse: " . $data->{inuse};
readingsBulkUpdate($hash, "inuse", "$data->{inuse}", 1 ); readingsBulkUpdate($hash, "inuse", "$data->{inuse}", 1 );
} }
#plug end #plug end
#cube start #cube start
if(defined $data->{rotate}){ if (defined $data->{rotate}){
Log3 $name, 3, "$name>" . " SID: " . $sid . " Type: " . $hash->{MODEL} . " Rotate: " . $data->{rotate}; Log3 $name, 3, "$name>" . " SID: " . $sid . " Type: " . $hash->{MODEL} . " Rotate: " . $data->{rotate};
readingsBulkUpdate($hash, "rotate", "$data->{rotate}", 1 ); readingsBulkUpdate($hash, "rotate", "$data->{rotate}", 1 );
} }
#cube end #cube end
}
if ($decoded->{'cmd'} eq 'heartbeat'){ if ($decoded->{'cmd'} eq 'heartbeat'){
readingsBulkUpdate($hash, 'heartbeat', $decoded->{'sid'} , 1 ); readingsBulkUpdate($hash, 'heartbeat', $decoded->{'sid'} , 1 );
} }
readingsEndUpdate( $hash, 1 ); readingsEndUpdate( $hash, 1 );
XiaomiSmartHome_Device_update($hash); XiaomiSmartHome_Device_update($hash);
return $hash->{NAME}; return $hash->{NAME};
} }
##################################### #####################################

2
controls_mish.txt
View File

@@ -1,2 +1,2 @@
UPD 2017-04-03_14:31:37 15333 FHEM/71_XiaomiSmartHome.pm UPD 2017-04-03_14:31:37 15333 FHEM/71_XiaomiSmartHome.pm
UPD 2017-04-03_14:31:24 10000 FHEM/71_XiaomiSmartHome_Device.pm UPD 2017-04-03_22:28:16 10007 FHEM/71_XiaomiSmartHome_Device.pm