From bf2df3cb2a09b308c2f759ad147c94323a1888b2 Mon Sep 17 00:00:00 2001 From: moises <> Date: Sat, 3 Nov 2018 21:53:19 +0000 Subject: [PATCH] 38_netatmo: fixed ignored values after 'dead' state, 72_XiaomiDevice: load_power reading for power plug git-svn-id: https://svn.fhem.de/fhem/trunk@17667 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/CHANGED | 2 + fhem/FHEM/32_withings.pm | 21 +++++----- fhem/FHEM/38_netatmo.pm | 12 +++--- fhem/FHEM/72_XiaomiDevice.pm | 81 +++++++++++++++++++++++++++--------- 4 files changed, 81 insertions(+), 35 deletions(-) diff --git a/fhem/CHANGED b/fhem/CHANGED index 76036d51d..9bb9749f9 100644 --- a/fhem/CHANGED +++ b/fhem/CHANGED @@ -1,5 +1,7 @@ # Add changes at the top of the list. Keep it in ASCII, and 80-char wide. # Do not insert empty lines here, update check depends on it. + - bugfix: 38_netatmo: fixed ignored values after 'dead' state + - feature: 72_XiaomiDevice: load_power reading for power plug - feature: 34_ESPEasy: added set cmds: active/inactive/reopen, shutdown tcp server port if bridge is disabled/inactive, tcp server will be started first after FHEM's global event 'INITIALIZED'. diff --git a/fhem/FHEM/32_withings.pm b/fhem/FHEM/32_withings.pm index 9551c6af8..c29f7e66d 100644 --- a/fhem/FHEM/32_withings.pm +++ b/fhem/FHEM/32_withings.pm @@ -16,6 +16,7 @@ package main; use strict; use warnings; +no warnings qw(redefine); use HttpUtils; @@ -47,7 +48,7 @@ my %device_types = ( 0 => "User related", 64 => "Thermometer", ); my %device_models = ( 1 => { 1 => "Smart Scale", 2 => "Wireless Scale", 3 => "Smart Kid Scale", 4 => "Smart Body Analyzer", 5 => "WiFi Body Scale", 6 => "Cardio Scale", 7 => "Body Scale", }, - 2 => { 21 => "Smart Baby Monitor", 22 => "Home", 22 => "Home v2", }, + 2 => { 21 => "Smart Baby Monitor", 22 => "Home", 23 => "Home v2", }, 4 => { 41 => "iOS Blood Pressure Monitor", 42 => "Wireless Blood Pressure Monitor", 43 => "BPM", 44 => "BPM+", }, 16 => { 51 => "Pulse Ox", 52 => "Activite", 53 => "Activite v2", 54 => "Go", 55 => "Steel HR", }, 32 => { 60 => "Aura", 61 => "Sleep Sensor", 62 => "Sleep Mat", 63 => "Sleep", }, @@ -393,7 +394,7 @@ sub withings_Define($$) { my $resolve = inet_aton("scalews.withings.com"); if(!defined($resolve)) { - $hash->{STATE} = "DNS error"; + $hash->{STATE} = "DNS error" if( $hash->{SUBTYPE} eq "ACCOUNT" ); InternalTimer( gettimeofday() + 900, "withings_InitWait", $hash, 0); return undef; } @@ -425,7 +426,7 @@ sub withings_InitWait($) { my $resolve = inet_aton("scalews.withings.com"); if(!defined($resolve)) { - $hash->{STATE} = "DNS error"; + $hash->{STATE} = "DNS error" if( $hash->{SUBTYPE} eq "ACCOUNT" ); InternalTimer( gettimeofday() + 1800, "withings_InitWait", $hash, 0); return undef; } @@ -455,7 +456,7 @@ sub withings_Notify($$) { my $resolve = inet_aton("scalews.withings.com"); if(!defined($resolve)) { - $hash->{STATE} = "DNS error"; + $hash->{STATE} = "DNS error" if( $hash->{SUBTYPE} eq "ACCOUNT" ); InternalTimer( gettimeofday() + 3600, "withings_InitWait", $hash, 0); return undef; } @@ -555,7 +556,7 @@ sub withings_getSessionKey($) { # $hash->{helper}{appliver} = $1; # if(!defined($hash->{helper}{appliver})) { # Log3 $name, 1, "$name: APPLIVER ERROR "; - # $hash->{STATE} = "APPLIVER error"; + # $hash->{STATE} = "APPLIVER error" if( $hash->{SUBTYPE} eq "ACCOUNT" ); # return undef; # } # Log3 $name, 4, "$name: appliver ".$hash->{helper}{appliver}; @@ -569,7 +570,7 @@ sub withings_getSessionKey($) { # # if(!defined($hash->{helper}{csrf_token})) { # Log3 $name, 1, "$name: CSRF ERROR "; - # $hash->{STATE} = "CSRF error"; + # $hash->{STATE} = "CSRF error" if( $hash->{SUBTYPE} eq "ACCOUNT" ); # return undef; # } # Log3 $name, 4, "$name: csrf_token ".$hash->{helper}{csrf_token}; @@ -601,7 +602,7 @@ sub withings_getSessionKey($) { if ($err || !defined($data) || $data =~ /Authentification failed/ || $data =~ /not a valid/) { Log3 $name, 1, "$name: LOGIN ERROR "; - $hash->{STATE} = "Login error"; + $hash->{STATE} = "Login error" if( $hash->{SUBTYPE} eq "ACCOUNT" ); return undef; } else @@ -616,7 +617,7 @@ sub withings_getSessionKey($) { } else { - $hash->{STATE} = "Cookie error"; + $hash->{STATE} = "Cookie error" if( $hash->{SUBTYPE} eq "ACCOUNT" ); Log3 $name, 1, "$name: COOKIE ERROR "; $hash->{helper}{appliver} = '9855c478'; $hash->{helper}{csrf_token} = '9855c478'; @@ -659,7 +660,7 @@ sub withings_getSessionKey($) { } else { - $hash->{STATE} = "Account error"; + $hash->{STATE} = "Account error" if( $hash->{SUBTYPE} eq "ACCOUNT" ); Log3 $name, 1, "$name: ACCOUNT ERROR "; return undef; } @@ -1489,7 +1490,7 @@ sub withings_poll($;$) { #my $resolve = inet_aton("scalews.withings.com"); #if(!defined($resolve)) #{ - # $hash->{STATE} = "DNS error"; + # $hash->{STATE} = "DNS error" if( $hash->{SUBTYPE} eq "ACCOUNT" ); # InternalTimer( gettimeofday() + 3600, "withings_poll", $hash, 0); # return undef; #} diff --git a/fhem/FHEM/38_netatmo.pm b/fhem/FHEM/38_netatmo.pm index 7d60829ed..3c41cd2de 100644 --- a/fhem/FHEM/38_netatmo.pm +++ b/fhem/FHEM/38_netatmo.pm @@ -11,7 +11,7 @@ # # ############################################################################## -# Release 22 / 2018-10-22 +# Release 23 / 2018-11-03 package main; @@ -142,7 +142,7 @@ netatmo_Define($$) } $hash->{Module} = $module; - $hash->{dataTypes} = $readings if($readings); + $hash->{dataTypes} = $readings if(defined($readings) && $readings ne ""); $hash->{dataTypes} = "Temperature,CO2,Humidity,Noise,Pressure,Rain,WindStrength,WindAngle,GustStrength,GustAngle,Sp_Temperature,BoilerOn,BoilerOff" if( !$readings ); @@ -1172,7 +1172,7 @@ netatmo_initDevice($) my $newdatatypes = ""; my @reading_names = (); foreach my $type (@{$device->{data_type}}) { - $newdatatypes = "" if ( !defined($newdatatypes) ); + #$newdatatypes = "" if ( !defined($newdatatypes) ); $newdatatypes .= "," if ( $newdatatypes ); $type = "WindStrength,WindAngle,GustStrength,GustAngle" if($type eq "Wind"); $newdatatypes .= $type; @@ -1187,9 +1187,9 @@ netatmo_initDevice($) $state_format .= "H: humidity"; } } - if($newdatatypes ne "") + if(defined($newdatatypes) && $newdatatypes ne "") { - delete($hash->{dataTypes}); + #delete($hash->{dataTypes}); $hash->{dataTypes} = $newdatatypes; } @@ -3422,7 +3422,7 @@ netatmo_parseReadings($$;$) { $reading = "undefined";#next; } - if(lc($requested) =~ /wind/ && ($rname eq "temperature" || $rname eq "humidity")) + if(lc($requested) =~ /wind/ && lc($requested) !~ /temperature/ && ($rname eq "temperature" || $rname eq "humidity")) { Log3 $name, 3, "$name netatmo - wind sensor $rname reading: $reading ($time)"; next;# if($reading == 0); diff --git a/fhem/FHEM/72_XiaomiDevice.pm b/fhem/FHEM/72_XiaomiDevice.pm index ef22f89e5..4d899d7d6 100755 --- a/fhem/FHEM/72_XiaomiDevice.pm +++ b/fhem/FHEM/72_XiaomiDevice.pm @@ -20,6 +20,8 @@ package main; use strict; use warnings; +no warnings qw(redefine); + use Time::Local; use POSIX qw( strftime ); use Data::Dumper; #debugging @@ -209,7 +211,7 @@ sub XiaomiDevice_Define($$$) { $hash->{helper}{packetid} = 1; - $hash->{helper}{delay} = 0; + $hash->{helper}{delay} = 60; $a[3] = '' if(!defined($a[3])); if(length($a[3]) == 32) { @@ -1627,7 +1629,11 @@ sub XiaomiDevice_GetUpdate($) elsif( defined($attr{$name}) && defined($attr{$name}{subType}) && $attr{$name}{subType} eq "PowerPlug") { $hash->{helper}{packet}{$packetid} = "powerplug_data"; - XiaomiDevice_WriteJSON($hash, '{"id":'.$packetid.',"method":"get_prop","params":["power", "temperature", "current", "mode", "power_consume_rate", "wifi_led", "power_price", "voltage", "power_factor", "elec_leakage"]}' ); + XiaomiDevice_WriteJSON($hash, '{"id":'.$packetid.',"method":"get_prop","params":["power", "temperature", "current", "mode", "power_consume_rate", "wifi_led", "power_price", "voltage", "power_factor", "elec_leakage", "usb_power", "load_power", "usb_on"]}' ); + $packetid = $hash->{helper}{packetid}; + $hash->{helper}{packet}{$packetid} = "powerplug_power"; + XiaomiDevice_WriteJSON($hash, '{"id":'.$packetid.',"method":"get_power","params":[]}' ); + $hash->{helper}{packetid} = $packetid+1; } return undef; } @@ -1702,7 +1708,7 @@ sub XiaomiDevice_GetSettings($) my $packetid = $hash->{helper}{packetid}; $hash->{helper}{packetid} = $packetid+1; $hash->{helper}{packet}{$packetid} = "powerplug_data"; - return XiaomiDevice_WriteJSON($hash, '{"id":'.$packetid.',"method":"get_prop","params":["power", "temperature", "current", "mode", "power_consume_rate", "wifi_led", "power_price"]}' ); + return XiaomiDevice_WriteJSON($hash, '{"id":'.$packetid.',"method":"get_prop","params":["power", "temperature", "current", "mode", "power_consume_rate", "wifi_led", "power_price", "voltage", "power_factor", "elec_leakage", "usb_power", "load_power", "usb_on"]}' ); } @@ -1878,7 +1884,7 @@ sub XiaomiDevice_WriteJSON($$) { RemoveInternalTimer($hash); Log3 ($name, 1, "$name: internal error, values missing"); - $hash->{helper}{delay} += 900; + $hash->{helper}{delay} += 300; InternalTimer( gettimeofday() + $hash->{helper}{delay}, "XiaomiDevice_connect", $hash); return undef; } @@ -2245,7 +2251,7 @@ sub XiaomiDevice_ParseJSON($$) { return undef if(!defined($json->{result})); return undef if(ref($json->{result}) ne "ARRAY"); - return undef if(ref($json->{result}[0]) ne "HASH"); + if(ref($json->{result}[0]) eq "HASH"){ readingsBeginUpdate($hash); readingsBulkUpdate( $hash, "power", $json->{result}[0]{power}, 1 ) if(defined($json->{result}[0]{power})); readingsBulkUpdate( $hash, "temperature", $json->{result}[0]{temperature}, 1 ) if(defined($json->{result}[0]{temperature})); @@ -2257,9 +2263,37 @@ sub XiaomiDevice_ParseJSON($$) readingsBulkUpdate( $hash, "voltage", $json->{result}[0]{voltage}, 1 ) if(defined($json->{result}[0]{voltage})); readingsBulkUpdate( $hash, "power_factor", $json->{result}[0]{power_factor}, 1 ) if(defined($json->{result}[0]{power_factor})); readingsBulkUpdate( $hash, "elec_leakage", $json->{result}[0]{elec_leakage}, 1 ) if(defined($json->{result}[0]{elec_leakage})); - readingsBulkUpdate( $hash, "button_pressed", $json->{result}[0]{button_pressed}, 1 ) if(defined($json->{result}[0]{button_pressed})); + readingsBulkUpdate( $hash, "usb_power", $json->{result}[0]{usb_power}, 1 ) if(defined($json->{result}[0]{usb_power})); + readingsBulkUpdate( $hash, "load_power", $json->{result}[0]{load_power}, 1 ) if(defined($json->{result}[0]{load_power})); + readingsBulkUpdate( $hash, "usb_power", ($json->{result}[0]{usb_on} eq "0" ? 'off' : 'on' ), 1 ) if(defined($json->{result}[0]{usb_on})); #readingsBulkUpdate( $hash, "setting", (($json->{result}[0]{setting} eq "1")?"yes":"no"), 1 ) if(defined($json->{result}[0]{setting})); readingsEndUpdate($hash,1); + } else { + readingsBeginUpdate($hash); + readingsBulkUpdate( $hash, "power", $json->{result}[0], 1 ) if(defined($json->{result}[0])); + readingsBulkUpdate( $hash, "temperature", $json->{result}[1], 1 ) if(defined($json->{result}[1])); + readingsBulkUpdate( $hash, "current", $json->{result}[2], 1 ) if(defined($json->{result}[2])); + readingsBulkUpdate( $hash, "power_mode", $json->{result}[3], 1 ) if(defined($json->{result}[3])); + readingsBulkUpdate( $hash, "power_consume_rate", $json->{result}[4], 1 ) if(defined($json->{result}[4])); + readingsBulkUpdate( $hash, "wifi_led", $json->{result}[5], 1 ) if(defined($json->{result}[5])); + readingsBulkUpdate( $hash, "power_price", $json->{result}[6], 1 ) if(defined($json->{result}[6])); + readingsBulkUpdate( $hash, "voltage", $json->{result}[7], 1 ) if(defined($json->{result}[7])); + readingsBulkUpdate( $hash, "power_factor", $json->{result}[8], 1 ) if(defined($json->{result}[8])); + readingsBulkUpdate( $hash, "elec_leakage", $json->{result}[9], 1 ) if(defined($json->{result}[9])); + readingsBulkUpdate( $hash, "usb_power", $json->{result}[10], 1 ) if(defined($json->{result}[10])); + readingsBulkUpdate( $hash, "load_power", $json->{result}[11], 1 ) if(defined($json->{result}[11])); + readingsBulkUpdate( $hash, "usb_power", ($json->{result}[12] eq "0" ? 'off' : 'on' ), 1 ) if(defined($json->{result}[12])); + readingsEndUpdate($hash,1); + } + return undef; + } + + if($msgtype eq "powerplug_power") + { + Log3 $name, 2, "$name: ".Dumper($json); + return undef if(!defined($json->{result})); + return undef if(ref($json->{result}) ne "ARRAY"); + readingsSingleUpdate( $hash, "load_power", sprintf( "%.2f" ,int($json->{result}[0])/100), 1 ) if(defined($json->{result}[0])); return undef; } @@ -2753,7 +2787,7 @@ sub XiaomiDevice_connect($) Log3 $name, 1, "$name: connect to device failed"; readingsSingleUpdate($hash, "state", "disconnected", 1) if($hash->{helper}{ConnectionState} ne "disconnected"); $hash->{helper}{ConnectionState} = "disconnected"; - $hash->{helper}{delay} += 900; + $hash->{helper}{delay} += 600; InternalTimer( gettimeofday() + $hash->{helper}{delay}, "XiaomiDevice_connect", $hash); } @@ -2806,7 +2840,7 @@ sub XiaomiDevice_connectFail($) Log3 $name, 2, "$name: connection timeout"; readingsSingleUpdate($hash, "state", "disconnected", 1) if($hash->{helper}{ConnectionState} ne "disconnected"); $hash->{helper}{ConnectionState} = "disconnected"; - $hash->{helper}{delay} += 300; + $hash->{helper}{delay} += 60; InternalTimer( gettimeofday() + $hash->{helper}{delay}, "XiaomiDevice_connect", $hash); return undef; @@ -2871,7 +2905,7 @@ sub XiaomiDevice_Read($) { } Log3 $name, 3, "$name: received token: ".$token if(!defined($hash->{helper}{token}));; RemoveInternalTimer($hash, "XiaomiDevice_connectFail"); - $hash->{helper}{delay} = 0; + $hash->{helper}{delay} = 60; if(!defined($hash->{helper}{token})){ $hash->{helper}{token} = $token; @@ -2901,7 +2935,7 @@ sub XiaomiDevice_Read($) { } RemoveInternalTimer($hash, "XiaomiDevice_connectFail"); - $hash->{helper}{delay} = 0; + $hash->{helper}{delay} = 60; my $key = Digest::MD5::md5(pack('H*', $hash->{helper}{token})); my $iv = Digest::MD5::md5($key.pack('H*', $hash->{helper}{token})); @@ -2941,6 +2975,10 @@ sub XiaomiDevice_Write($$) } my $sock = $hash->{CD}; + if(!$sock){ + Log3 $hash, 2, "$name: socket error"; + return undef; + } if(!($sock->send($msg))) { # Send failed @@ -2952,7 +2990,7 @@ sub XiaomiDevice_Write($$) { # Send successful Log3 $hash, 5, "$name Send SUCCESS"; - InternalTimer(gettimeofday() + 10, "XiaomiDevice_connectFail", $hash, 0) if(length($msg) > 40); + InternalTimer(gettimeofday() + 30, "XiaomiDevice_connectFail", $hash, 0) if(length($msg) > 40); } Log3 $hash, 5, "$name > ".unpack('H*',$msg); @@ -3007,9 +3045,9 @@ sub XiaomiDevice_DbLog_splitFn($) { $value = $parts[1]; $unit = ""; - $unit = "%" if($reading eq "filter");; - $unit = "%" if($reading =~ /humidity/);; - $unit = "µg/m³" if($reading =~ /pm25/);; + $unit = "%" if($reading eq "filter"); + $unit = "%" if($reading =~ /humidity/); + $unit = "µg/m³" if($reading =~ /pm25/); $unit = "rpm" if($reading =~ /speed/); $unit = "˚C" if($reading =~ /temperature/); $unit = "h" if($reading =~ /usage/); @@ -3017,11 +3055,12 @@ sub XiaomiDevice_DbLog_splitFn($) { $unit = "h" if($reading =~ /_used/); $unit = "m³" if($reading eq "filter_volume"); $unit = "l" if($reading eq "water_volume"); - $unit = "%" if($reading =~ /batteryPercent/);; - $unit = "%" if($reading =~ /fan_power/);; - $unit = "h" if($reading =~ /clean_time/);; - $unit = "m²" if($reading =~ /clean_area/);; - $unit = "%" if($reading =~ /consumables_/);; + $unit = "%" if($reading =~ /batteryPercent/); + $unit = "%" if($reading =~ /fan_power/); + $unit = "h" if($reading =~ /clean_time/); + $unit = "m²" if($reading =~ /clean_area/); + $unit = "%" if($reading =~ /consumables_/); + $unit = "W" if($reading eq "load_power"); Log3 "dbsplit", 5, "xiaomi dbsplit: ".$event." $reading: $value $unit" if(defined($value)); @@ -3284,6 +3323,10 @@ sub XiaomiDevice_DbLog_splitFn($) {
Filter life in %

+
  • load_power (PowerPlug) +
    + Power consumption in W
    +


    • Attributes