devel #9

Merged
marko merged 17 commits from devel into testing 2021-07-05 11:15:19 +00:00
3 changed files with 14 additions and 14 deletions
Showing only changes of commit 72cf203925 - Show all commits

View File

@ -59,7 +59,7 @@ use warnings;
use FHEM::Meta; use FHEM::Meta;
use GPUtils qw(GP_Export); use GPUtils qw(GP_Export);
require FHEM::Tesla::Powerwall; require FHEM::Devices::Tesla::Powerwall;
#-- Run before package compilation #-- Run before package compilation
BEGIN { BEGIN {
@ -67,8 +67,8 @@ BEGIN {
#-- Export to main context with different name #-- Export to main context with different name
GP_Export( GP_Export(
qw( qw(
Initialize Initialize
) )
); );
} }
@ -76,14 +76,14 @@ sub Initialize {
my $hash = shift; my $hash = shift;
$hash->{GetFn} = \&FHEM::Tesla::Powerwall::Get; $hash->{GetFn} = \&FHEM::Devices::Tesla::Powerwall::Get;
$hash->{SetFn} = \&FHEM::Tesla::Powerwall::Set; $hash->{SetFn} = \&FHEM::Devices::Tesla::Powerwall::Set;
$hash->{DefFn} = \&FHEM::Tesla::Powerwall::Define; $hash->{DefFn} = \&FHEM::Devices::Tesla::Powerwall::Define;
$hash->{UndefFn} = \&FHEM::Tesla::Powerwall::Undef; $hash->{UndefFn} = \&FHEM::Devices::Tesla::Powerwall::Undef;
$hash->{NotifyFn} = \&FHEM::Tesla::Powerwall::Notify; $hash->{NotifyFn} = \&FHEM::Devices::Tesla::Powerwall::Notify;
$hash->{RenameFn} = \&FHEM::Tesla::Powerwall::Rename; $hash->{RenameFn} = \&FHEM::Devices::Tesla::Powerwall::Rename;
$hash->{AttrFn} = \&FHEM::Tesla::Powerwall::Attr; $hash->{AttrFn} = \&FHEM::Devices::Tesla::Powerwall::Attr;
$hash->{AttrList} = $hash->{AttrList} =
'interval ' 'interval '
. 'disable:1 ' . 'disable:1 '

View File

@ -1 +1 @@
UPD 2021-04-23_08:18:27 6866 FHEM/46_TeslaPowerwall2AC.pm UPD 2021-04-23_08:24:15 6944 FHEM/46_TeslaPowerwall2AC.pm

View File

@ -52,7 +52,7 @@
## ##
## ##
package FHEM::Tesla::Powerwall; package FHEM::Devices::Tesla::Powerwall;
use strict; use strict;
use warnings; use warnings;
@ -464,7 +464,7 @@ sub Timer_GetData {
} }
::InternalTimer( ::gettimeofday() + $hash->{INTERVAL}, ::InternalTimer( ::gettimeofday() + $hash->{INTERVAL},
\&FHEM::Tesla::Powerwall::Timer_GetData, $hash ); \&FHEM::Devices::Tesla::Powerwall::Timer_GetData, $hash );
::Log3($name, 4, ::Log3($name, 4,
qq(TeslaPowerwall2AC ($name) - Call ::InternalTimer Timer_GetData)); qq(TeslaPowerwall2AC ($name) - Call ::InternalTimer Timer_GetData));
} }
@ -573,7 +573,7 @@ sub ErrorHandling {
} }
#### End Error Handling #### End Error Handling
::InternalTimer( ::gettimeofday() + 3, \&FHEM::Tesla::Powerwall::Write, $hash ) ::InternalTimer( ::gettimeofday() + 3, \&FHEM::Devices::Tesla::Powerwall::Write, $hash )
if ( defined( $hash->{actionQueue} ) if ( defined( $hash->{actionQueue} )
&& scalar( @{ $hash->{actionQueue} } ) > 0 ); && scalar( @{ $hash->{actionQueue} } ) > 0 );