FHEM/mod-TeslaPowerwall2AC
1
0
Fork 0
Code Issues 3 Pull Requests Releases Wiki Activity

fix compose uri in CreateUri Fn

Browse Source
This commit is contained in:
Marko Oldenburg
2021-02-27 14:08:04 +01:00
parent 0d36ac8957
commit 3757e5e281
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
FHEM/46_TeslaPowerwall2AC.pm
View File

@@ -385,7 +385,8 @@ sub Get {
$list .= $list .=
'statusSOE:noArg aggregates:noArg siteinfo:noArg sitemaster:noArg powerwalls:noArg registration:noArg status:noArg' 'statusSOE:noArg aggregates:noArg siteinfo:noArg sitemaster:noArg powerwalls:noArg registration:noArg status:noArg'
if( AttrVal($name,'emailaddr','none') ne 'none' if( AttrVal($name,'emailaddr','none') ne 'none'
&& defined(ReadPassword($hash, $name)) ); && defined(ReadPassword($hash, $name))
&& defined($hash->{TOKEN}) );
return 'Unknown argument ' . $cmd . ', choose one of ' . $list; return 'Unknown argument ' . $cmd . ', choose one of ' . $list;
} }
@@ -865,18 +866,19 @@ sub CreateUri {
my $host = $hash->{HOST}; my $host = $hash->{HOST};
my $header = ( defined($hash->{TOKEN}) ? 'Cookie: AuthCookie=' . $hash->{TOKEN} : undef ); my $header = ( defined($hash->{TOKEN}) ? 'Cookie: AuthCookie=' . $hash->{TOKEN} : undef );
my $method = 'GET'; my $method = 'GET';
my $uri = ( $path ne 'login' ? $host . '/api/' . $paths{$path} : undef ); my $uri = ( $path ne 'login' ? $host . '/api/' . $paths{$path} : $host . '/api/login/Basic' );
my $data; my $data;
if ( $path eq 'login' ) { if ( $path eq 'login' ) {
$method = 'POST'; $method = 'POST';
$header = 'Content-Type: application/json'; $header = 'Content-Type: application/json';
$uri = 'login/Basic', $data =
$data = '{"username":"customer","password":"' . ReadPassword( $hash, $name ) . '","email":"' . AttrVal($name,'emailaddr','test@test.de') . '","force_sm_off":false}' '{"username":"customer","password":"'
. ReadPassword( $hash, $name )
. '","email":"'
. AttrVal($name,'emailaddr','test@test.de')
. '","force_sm_off":false}'
} }
elsif ( $path eq 'powerwallsstop' elsif ( $path eq 'powerwallsstop'
|| $path eq 'powerwallsruns' ) || $path eq 'powerwallsruns' )

2
controls_TeslaPowerwall2AC.txt
View File

@@ -1 +1 @@
UPD 2021-02-27_12:10:30 30701 FHEM/46_TeslaPowerwall2AC.pm UPD 2021-02-27_14:06:51 30728 FHEM/46_TeslaPowerwall2AC.pm