marko/easee
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed variable naming to ensure overall uniqueness across FHEM modules (thx CoolTux)

Browse Source
This commit is contained in:
Matthias Sandmann 2022-03-17 10:24:10 +01:00
parent 5100a1c97b
commit 477b1ac479
1 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
98_EaseeWallbox.pm
View File

@ -37,7 +37,7 @@ my %EaseeWallbox_sets = (
deactivateTimer => "", deactivateTimer => "",
); );
my %url = ( my %EaseeWallbox_urls = (
getOAuthToken => 'https://api.easee.cloud/api/accounts/login', getOAuthToken => 'https://api.easee.cloud/api/accounts/login',
getRefreshToken => 'https://api.easee.cloud/api/accounts/refresh_token', getRefreshToken => 'https://api.easee.cloud/api/accounts/refresh_token',
getProfile => 'https://api.easee.cloud/api/accounts/profile', getProfile => 'https://api.easee.cloud/api/accounts/profile',
@ -86,7 +86,7 @@ my %url = (
setChargingPrice => 'https://api.easee.cloud/api/sites/#SiteID#/price', setChargingPrice => 'https://api.easee.cloud/api/sites/#SiteID#/price',
); );
my %reasonForNoCurrent = ( my %EaseeWallbox_reasonsForNoCurrent = (
0 => 'OK', #charger is allocated current 0 => 'OK', #charger is allocated current
1 => 'MaxCircuitCurrentTooLow', 1 => 'MaxCircuitCurrentTooLow',
2 => 'MaxDynamicCircuitCurrentTooLow', 2 => 'MaxDynamicCircuitCurrentTooLow',
@ -106,13 +106,13 @@ my %reasonForNoCurrent = (
56 => 'ChargerInErrorState', 56 => 'ChargerInErrorState',
100 => 'Undefined' 100 => 'Undefined'
); );
my %phaseMode = ( my %EaseeWallbox_phaseModes = (
1 => 'Locked to single phase', 1 => 'Locked to single phase',
2 => 'Auto', 2 => 'Auto',
3 => 'Locked to three phase', 3 => 'Locked to three phase',
); );
my %operationMode = ( my %EaseeWallbox_operationModes = (
1 => "Standby", 1 => "Standby",
2 => "Paused", 2 => "Paused",
3 => 'Charging', 3 => 'Charging',
@ -148,8 +148,7 @@ sub EaseeWallbox_getCmdList ($$$) {
if ( defined($myOpt) and ( length($myOpt) > 0 ) ); if ( defined($myOpt) and ( length($myOpt) > 0 ) );
$myOpt = "" if ( !defined($myOpt) ); $myOpt = "" if ( !defined($myOpt) );
#Logging makes me crazy... Log3 ($name, 5, "parse cmd-table - Set:$mySet, Option:$myOpt, RetVal:$retVal");
#Log3 ($name, 5, "parse cmd-table - Set:$mySet, Option:$myOpt, RetVal:$retVal");
} }
if ( !defined($retVal) ) { if ( !defined($retVal) ) {
$retVal = "error while parsing set-table"; $retVal = "error while parsing set-table";
@ -190,7 +189,7 @@ sub EaseeWallbox_Define($$) {
my $errmsg = ''; my $errmsg = '';
# Check parameter(s) - Must be min 4 in total (counts strings not purly parameter, interval is optional) # Check parameter(s) - Must be min 4 in total (counts strings not purly parameter, interval is optional)
if ( int(@param) < 4 ) { if ( int(@param) < 4 ) {
$errmsg = return $errmsg = return
"syntax error: define <name> EaseeWallbox <username> <password> [Interval]"; "syntax error: define <name> EaseeWallbox <username> <password> [Interval]";
@ -413,7 +412,7 @@ sub EaseeWallbox_NewTokenRequest {
}; };
my $param = { my $param = {
url => $url{getOAuthToken}, url => $EaseeWallbox_urls{getOAuthToken},
header => { "Content-Type" => "application/json" }, header => { "Content-Type" => "application/json" },
method => 'POST', method => 'POST',
timeout => 5, timeout => 5,
@ -478,7 +477,7 @@ sub EaseeWallbox_TokenRefresh {
}; };
my $param = { my $param = {
url => $url{getRefreshToken}, url => $EaseeWallbox_urls{getRefreshToken},
header => { "Content-Type" => "application/json" }, header => { "Content-Type" => "application/json" },
method => 'POST', method => 'POST',
timeout => 5, timeout => 5,
@ -596,7 +595,7 @@ sub EaseeWallbox_ExecuteParameterlessCommand($$) {
sub EaseeWallbox_ExecuteCommand($@) { sub EaseeWallbox_ExecuteCommand($@) {
my ( $hash, $method, $template, $message ) = @_; my ( $hash, $method, $template, $message ) = @_;
my $name = $hash->{NAME}; my $name = $hash->{NAME};
my $urlTemplate = $url{$template}; my $urlTemplate = $EaseeWallbox_urls{$template};
if ( not defined $hash ) { if ( not defined $hash ) {
Log3 'EaseeWallbox', 1, Log3 'EaseeWallbox', 1,
@ -661,7 +660,7 @@ sub EaseeWallbox_GetChargers($) {
return $msg; return $msg;
} }
my $readTemplate = $url{"getChargers"}; my $readTemplate = $EaseeWallbox_urls{"getChargers"};
my $d = EaseeWallbox_httpSimpleOperationOAuth( $hash, $readTemplate, my $d = EaseeWallbox_httpSimpleOperationOAuth( $hash, $readTemplate,
'GET' ); 'GET' );
@ -690,7 +689,7 @@ sub EaseeWallbox_GetChargers($) {
#readingsBulkUpdate( $hash, "charger_createdOn", $charger->{createdOn} ); #readingsBulkUpdate( $hash, "charger_createdOn", $charger->{createdOn} );
readingsEndUpdate( $hash, 1 ); readingsEndUpdate( $hash, 1 );
$readTemplate = $url{"getChargerDetails"}; $readTemplate = $EaseeWallbox_urls{"getChargerDetails"};
$readTemplate =~ s/#ChargerID#/$chargerId/g; $readTemplate =~ s/#ChargerID#/$chargerId/g;
$d = EaseeWallbox_httpSimpleOperationOAuth( $hash, $readTemplate, $d = EaseeWallbox_httpSimpleOperationOAuth( $hash, $readTemplate,
'GET' ); 'GET' );
@ -727,7 +726,7 @@ sub EaseeWallbox_GetChargerConfig($) {
return $msg; return $msg;
} }
my $readTemplate = $url{"getChargerConfiguration"}; my $readTemplate = $EaseeWallbox_urls{"getChargerConfiguration"};
$readTemplate =~ s/#ChargerID#/$chargerId/g; $readTemplate =~ s/#ChargerID#/$chargerId/g;
my $d = EaseeWallbox_httpSimpleOperationOAuth( $hash, $readTemplate, my $d = EaseeWallbox_httpSimpleOperationOAuth( $hash, $readTemplate,
'GET' ); 'GET' );
@ -775,7 +774,7 @@ sub EaseeWallbox_GetChargerConfig($) {
#); #);
readingsBulkUpdate( $hash, "charger_phaseModeId", $d->{phaseMode} ); readingsBulkUpdate( $hash, "charger_phaseModeId", $d->{phaseMode} );
readingsBulkUpdate( $hash, "charger_phaseMode", readingsBulkUpdate( $hash, "charger_phaseMode",
$phaseMode{ $d->{phaseMode} } ); $EaseeWallbox_phaseModes{ $d->{phaseMode} } );
#readingsBulkUpdate( $hash, "charger_localNodeType", #readingsBulkUpdate( $hash, "charger_localNodeType",
# $d->{localNodeType} ); # $d->{localNodeType} );
readingsBulkUpdate( readingsBulkUpdate(
@ -830,7 +829,7 @@ sub EaseeWallbox_GetChargerSite($) {
return $msg; return $msg;
} }
my $readTemplate = $url{"getChargerSite"}; my $readTemplate = $EaseeWallbox_urls{"getChargerSite"};
$readTemplate =~ s/#ChargerID#/$chargerId/g; $readTemplate =~ s/#ChargerID#/$chargerId/g;
my $d = EaseeWallbox_httpSimpleOperationOAuth( $hash, $readTemplate, my $d = EaseeWallbox_httpSimpleOperationOAuth( $hash, $readTemplate,
'GET' ); 'GET' );
@ -954,7 +953,7 @@ sub EaseeWallbox_RequestChargerStateCallback($) {
readingsBulkUpdate( $hash, "operationModeCode", readingsBulkUpdate( $hash, "operationModeCode",
$d->{chargerOpMode} ); $d->{chargerOpMode} );
readingsBulkUpdate( $hash, "operationMode", readingsBulkUpdate( $hash, "operationMode",
$operationMode{ $d->{chargerOpMode} } ); $EaseeWallbox_operationModes{ $d->{chargerOpMode} } );
readingsBulkUpdate( $hash, "power", $d->{totalPower} ); readingsBulkUpdate( $hash, "power", $d->{totalPower} );
readingsBulkUpdate( $hash, "kWhInSession", readingsBulkUpdate( $hash, "kWhInSession",
@ -971,7 +970,7 @@ sub EaseeWallbox_RequestChargerStateCallback($) {
$d->{reasonForNoCurrent} $d->{reasonForNoCurrent}
); );
readingsBulkUpdate( $hash, "reasonForNoCurrent", readingsBulkUpdate( $hash, "reasonForNoCurrent",
$reasonForNoCurrent{ $d->{reasonForNoCurrent} } ); $EaseeWallbox_reasonsForNoCurrent{ $d->{reasonForNoCurrent} } );
readingsBulkUpdate( $hash, "errorCode", $d->{errorCode} ); readingsBulkUpdate( $hash, "errorCode", $d->{errorCode} );
readingsBulkUpdate( $hash, "fatalErrorCode", $d->{fatalErrorCode} ); readingsBulkUpdate( $hash, "fatalErrorCode", $d->{fatalErrorCode} );
@ -1031,7 +1030,7 @@ sub EaseeWallbox_RequestCurrentSession($) {
Log3 $name, 4, Log3 $name, 4,
"EaseeWallbox_RequestCurrentSession Called for non-blocking value update. Name: $name"; "EaseeWallbox_RequestCurrentSession Called for non-blocking value update. Name: $name";
my $readTemplate = $url{"getCurrentSession"}; my $readTemplate = $EaseeWallbox_urls{"getCurrentSession"};
$readTemplate =~ s/#ChargerID#/$chargerId/g; $readTemplate =~ s/#ChargerID#/$chargerId/g;
my $CurrentTokenData = EaseeWallbox_LoadToken($hash); my $CurrentTokenData = EaseeWallbox_LoadToken($hash);
@ -1079,7 +1078,7 @@ sub EaseeWallbox_RequestChargerState($) {
Log3 $name, 4, Log3 $name, 4,
"EaseeWallbox_RequestChargerState Called for non-blocking value update. Name: $name"; "EaseeWallbox_RequestChargerState Called for non-blocking value update. Name: $name";
my $readTemplate = $url{"getChargerState"}; my $readTemplate = $EaseeWallbox_urls{"getChargerState"};
$readTemplate =~ s/#ChargerID#/$chargerId/g; $readTemplate =~ s/#ChargerID#/$chargerId/g;
my $CurrentTokenData = EaseeWallbox_LoadToken($hash); my $CurrentTokenData = EaseeWallbox_LoadToken($hash);