FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-02-26 10:34:52 +00:00
Code Issues Releases Wiki Activity

38_netatmo: fix after server changes

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@18857 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
moises 2019-03-11 11:03:02 +00:00
parent 5db07151f2
commit 8c3ea37515
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fhem/CHANGED
View File

@ -1,5 +1,6 @@
# Add changes at the top of the list. Keep it in ASCII, and 80-char wide. # 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. # Do not insert empty lines here, update check depends on it.
- bugfix: 38_netatmo: fix after server changes
- feature: 36_WMBUS: add preliminary support for Letrika solar inverters - feature: 36_WMBUS: add preliminary support for Letrika solar inverters
- bugfix: 14_SD_WS07.pm: fix bug autocreate define loop, - bugfix: 14_SD_WS07.pm: fix bug autocreate define loop,
broken definitions will be repaired. You need so save your config! broken definitions will be repaired. You need so save your config!

14
fhem/FHEM/38_netatmo.pm
View File

@ -59,7 +59,7 @@ netatmo_Initialize($)
"setpoint_duration ". "setpoint_duration ".
"webhookURL webhookPoll:0,1 ". "webhookURL webhookPoll:0,1 ".
"addresslimit ". "addresslimit ".
"serverAPI "; #"serverAPI ";
$hash->{AttrList} .= $readingFnAttributes; $hash->{AttrList} .= $readingFnAttributes;
} }
@ -436,7 +436,7 @@ netatmo_Define($$)
$modules{$hash->{TYPE}}{defptr}{"account"} = $hash; $modules{$hash->{TYPE}}{defptr}{"account"} = $hash;
$hash->{helper}{apiserver} = AttrVal($name, "serverAPI", "api.netatmo.com"); $hash->{helper}{apiserver} = "api.netatmo.com";#AttrVal($name, "serverAPI", "api.netatmo.com");
} else { } else {
return "Usage: define <name> netatmo device\ return "Usage: define <name> netatmo device\
@ -729,7 +729,7 @@ netatmo_getToken($)
url => "https://".$hash->{helper}{apiserver}."/oauth2/token", url => "https://".$hash->{helper}{apiserver}."/oauth2/token",
timeout => 5, timeout => 5,
noshutdown => 1, noshutdown => 1,
data => {grant_type => 'password', client_id => $hash->{helper}{client_id}, client_secret=> $hash->{helper}{client_secret}, username => netatmo_decrypt($hash->{helper}{username}), password => netatmo_decrypt($hash->{helper}{password}), scope => 'read_station read_thermostat write_thermostat read_camera write_camera access_camera read_presence write_presence access_presence read_homecoach'}, data => {grant_type => 'password', client_id => $hash->{helper}{client_id}, client_secret=> $hash->{helper}{client_secret}, username => netatmo_decrypt($hash->{helper}{username}), password => netatmo_decrypt($hash->{helper}{password}), scope => 'read_station read_thermostat write_thermostat read_camera write_camera access_camera read_presence write_presence access_presence read_homecoach read_smokedetector'},
}); });
netatmo_dispatch( {hash=>$hash,type=>'token'},$err,$data ); netatmo_dispatch( {hash=>$hash,type=>'token'},$err,$data );
@ -755,7 +755,7 @@ netatmo_getAppToken($)
timeout => 5, timeout => 5,
noshutdown => 1, noshutdown => 1,
header => "$auth", header => "$auth",
data => {app_identifier=>'com.netatmo.camera', grant_type => 'password', password => netatmo_decrypt($hash->{helper}{password}), scope => 'write_camera read_camera access_camera read_presence write_presence access_presence read_station', username => netatmo_decrypt($hash->{helper}{username})}, data => {app_identifier=>'com.netatmo.camera', grant_type => 'password', password => netatmo_decrypt($hash->{helper}{password}), scope => 'write_camera read_camera access_camera read_presence write_presence access_presence read_station read_smokedetector', username => netatmo_decrypt($hash->{helper}{username})},
}); });
@ -2172,7 +2172,7 @@ netatmo_setNotifications($$$)
if( !defined($iohash->{csrf_token}) ) if( !defined($iohash->{csrf_token}) )
{ {
my($err0,$data0) = HttpUtils_BlockingGet({ my($err0,$data0) = HttpUtils_BlockingGet({
url => "https://auth.netatmo.com/access/checklogin", url => "https://dev.netatmo.com/en-US",
timeout => 10, timeout => 10,
noshutdown => 1, noshutdown => 1,
}); });
@ -2181,7 +2181,7 @@ netatmo_setNotifications($$$)
Log3 $name, 1, "$name: csrf call failed! ".$err0; Log3 $name, 1, "$name: csrf call failed! ".$err0;
return undef; return undef;
} }
$data0 =~ /ci_csrf_netatmo" value="(.*)"/; $data0 =~ /csrf_value: "(.*)",/;
my $tmptoken = $1; my $tmptoken = $1;
$iohash->{csrf_token} = $tmptoken; $iohash->{csrf_token} = $tmptoken;
if(!defined($iohash->{csrf_token})) { if(!defined($iohash->{csrf_token})) {
@ -3412,7 +3412,7 @@ netatmo_parseReadings($$;$)
if(scalar(@{$json->{body}}) == 0) if(scalar(@{$json->{body}}) == 0)
{ {
$hash->{status} = "no data"; $hash->{status} = "no data";
readingsSingleUpdate( $hash, "active", "dead", 1 ) if($hash->{helper}{last_status_store} > 0 && $hash->{helper}{last_status_store} < (int(time) - 7200) ); readingsSingleUpdate( $hash, "active", "dead", 1 ) if(defined($hash->{helper}{last_status_store}) && $hash->{helper}{last_status_store} < (int(time) - 7200) );
} }
foreach my $values ( @{$json->{body}}) { foreach my $values ( @{$json->{body}}) {