FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-24 21:29:21 +00:00
Code Issues Releases Wiki Activity

77_SMAEM: contrib 3.3.0

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@19437 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
nasseeder1 2019-05-21 22:45:37 +00:00
parent 8d4e498d23
commit 099a362c98
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
fhem/contrib/DS_Starter/77_SMAEM.pm
View File

@ -179,9 +179,12 @@ sub SMAEM_DelayedShutdown ($) {
my ($hash) = @_;
my $name = $hash->{NAME};
Log3($name, 2, "$name - Quit background process due to shutdown ...");
if($hash->{HELPER}{RUNNING_PID}) {
Log3($name, 2, "$name - Quit background process due to shutdown ...");
return 1;
}
return 1;
return 0;
}
###############################################################
@ -736,7 +739,7 @@ sub SMAEM_setserials ($) {
$as = $hash->{HELPER}{ALLSERIALS};
$index = $hash->{TYPE}."_".$hash->{NAME}."_allserials";
$retcode = SMAEM_setCacheValue($index,$as);
$retcode = SMAEM_setCacheValue($hash,$index,$as);
if ($retcode) {
Log3($name, 1, "SMAEM $name - ERROR while saving all serial numbers - $retcode");
@ -757,7 +760,7 @@ sub SMAEM_setsum ($$$$) {
$sumstr = $gridinsum."_".$gridoutsum;
$index = $hash->{TYPE}."_".$hash->{NAME}."_".$smaserial;
$retcode = SMAEM_setCacheValue($index,$sumstr);
$retcode = SMAEM_setCacheValue($hash,$index,$sumstr);
if ($retcode) {
Log3($name, 1, "SMAEM $name - ERROR while saving summary of energy values - $retcode");
@ -770,8 +773,8 @@ return ($retcode);
###############################################################
### Schreibroutine in eigenes Keyvalue-File
sub SMAEM_setCacheValue ($$) {
my ($key,$value) = @_;
sub SMAEM_setCacheValue ($$$) {
my ($hash,$key,$value) = @_;
my $fName = $attr{global}{modpath}."/FHEM/FhemUtils/cacheSMAEM";
my $param = {
@ -780,7 +783,7 @@ sub SMAEM_setCacheValue ($$) {
};
my ($err, @old) = FileRead($param);
SMAEM_createCacheFile() if($err);
SMAEM_createCacheFile($hash) if($err);
my @new;
my $fnd;
@ -811,7 +814,7 @@ sub SMAEM_getserials ($) {
if ($retcode) {
Log3($name, 1, "SMAEM $name - $retcode") if ($retcode);
Log3($name, 3, "SMAEM $name - Create new cacheFile $modpath/FHEM/FhemUtils/cacheSMAEM");
$retcode = SMAEM_createCacheFile();
$retcode = SMAEM_createCacheFile($hash);
} else {
if ($serials) {
$hash->{HELPER}{ALLSERIALS} = $serials;
@ -863,7 +866,7 @@ sub SMAEM_getCacheValue ($) {
###############################################################
### Anlegen eigenes Keyvalue-File wenn nicht vorhanden
sub SMAEM_createCacheFile () {
sub SMAEM_createCacheFile ($) {
my $fName = $attr{global}{modpath}."/FHEM/FhemUtils/cacheSMAEM";
my $param = {
FileName => $fName,
@ -874,7 +877,7 @@ sub SMAEM_createCacheFile () {
"# Please do not modify, move or delete it.",
"");
return FileWrite($param, @new);
return FileWrite($param, @new);
}
###############################################################