FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-28 11:01:59 +00:00
Code Issues Releases Wiki Activity

72_FRITZBOX.pm: Version 07.57.13b

Browse Source 
73_PRESENCE.pm: Version 02.00a
73_PRESENCE2.pm: Version 01.03b
98_CDCOpenData.pm: Version 01.12f


git-svn-id: https://svn.fhem.de/fhem/trunk@28940 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
jowiemann 2024-06-03 07:29:41 +00:00
parent ee4f191706
commit a53c3f666b
4 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fhem/FHEM/72_FRITZBOX.pm
View File

@ -45,7 +45,7 @@ use warnings;
use Blocking; use Blocking;
use HttpUtils; use HttpUtils;
my $ModulVersion = "07.57.13a"; my $ModulVersion = "07.57.13b";
my $missingModul = ""; my $missingModul = "";
my $FRITZBOX_TR064pwd; my $FRITZBOX_TR064pwd;
my $FRITZBOX_TR064user; my $FRITZBOX_TR064user;
@ -2911,7 +2911,7 @@ sub FRITZBOX_Readout_Start($)
$hash->{helper}{READOUT_RUNNING_PID} = BlockingCall($runFn, $name, $hash->{helper}{READOUT_RUNNING_PID} = BlockingCall($runFn, $name,
"FRITZBOX_Readout_Done", $timeout, "FRITZBOX_Readout_Done", $timeout,
"FRITZBOX_Readout_Aborted", $hash); "FRITZBOX_Readout_Aborted", $hash);
$hash->{helper}{READOUT_RUNNING_PID}->{loglevel} = GetVerbose($name); # $hash->{helper}{READOUT_RUNNING_PID}->{loglevel} = GetVerbose($name);
FRITZBOX_Log $hash, 4, "Fork process $runFn"; FRITZBOX_Log $hash, 4, "Fork process $runFn";
} }
else { else {
@ -5808,7 +5808,7 @@ sub FRITZBOX_Readout_SetGet_Start($)
$hash->{helper}{CMD_RUNNING_PID} = BlockingCall($cmdFunction, $handover, $hash->{helper}{CMD_RUNNING_PID} = BlockingCall($cmdFunction, $handover,
"FRITZBOX_Readout_SetGet_Done", $timeout, "FRITZBOX_Readout_SetGet_Done", $timeout,
"FRITZBOX_Readout_SetGet_Aborted", $hash); "FRITZBOX_Readout_SetGet_Aborted", $hash);
$hash->{helper}{READOUT_RUNNING_PID}->{loglevel} = GetVerbose($name); # $hash->{helper}{READOUT_RUNNING_PID}->{loglevel} = GetVerbose($name);
return undef; return undef;
} # end FRITZBOX_Readout_SetGet_Start } # end FRITZBOX_Readout_SetGet_Start

12
fhem/FHEM/73_PRESENCE.pm
View File

@ -33,7 +33,7 @@ use Blocking;
use Time::HiRes qw(gettimeofday usleep sleep); use Time::HiRes qw(gettimeofday usleep sleep);
use DevIo; use DevIo;
my $ModulVersion = "02.00"; my $ModulVersion = "02.00a";
my %LOG_Text = ( my %LOG_Text = (
0 => "SERVER:", 0 => "SERVER:",
1 => "ERROR:", 1 => "ERROR:",
@ -737,31 +737,31 @@ sub PRESENCE_StartLocalScan($;$)
{ {
Log3 $name, 5, "PRESENCE ($name) - starting blocking call for mode local-bluetooth"; Log3 $name, 5, "PRESENCE ($name) - starting blocking call for mode local-bluetooth";
$hash->{helper}{RUNNING_PID} = BlockingCall("PRESENCE_DoLocalBluetoothScan", $name."|".$hash->{ADDRESS}."|".$local."|".AttrVal($name, "bluetoothHciDevice", ""), "PRESENCE_ProcessLocalScan", 60, "PRESENCE_ProcessAbortedScan", $hash); $hash->{helper}{RUNNING_PID} = BlockingCall("PRESENCE_DoLocalBluetoothScan", $name."|".$hash->{ADDRESS}."|".$local."|".AttrVal($name, "bluetoothHciDevice", ""), "PRESENCE_ProcessLocalScan", 60, "PRESENCE_ProcessAbortedScan", $hash);
$hash->{helper}{RUNNING_PID}->{loglevel} = GetVerbose($name); # $hash->{helper}{RUNNING_PID}->{loglevel} = GetVerbose($name);
} }
elsif($mode eq "lan-ping") elsif($mode eq "lan-ping")
{ {
Log3 $name, 5, "PRESENCE ($name) - starting blocking call for mode lan-ping"; Log3 $name, 5, "PRESENCE ($name) - starting blocking call for mode lan-ping";
$hash->{helper}{RUNNING_PID} = BlockingCall("PRESENCE_DoLocalPingScan", $name."|".$hash->{ADDRESS}."|".$local."|".AttrVal($name, "pingCount", "4"), "PRESENCE_ProcessLocalScan", 60, "PRESENCE_ProcessAbortedScan", $hash); $hash->{helper}{RUNNING_PID} = BlockingCall("PRESENCE_DoLocalPingScan", $name."|".$hash->{ADDRESS}."|".$local."|".AttrVal($name, "pingCount", "4"), "PRESENCE_ProcessLocalScan", 60, "PRESENCE_ProcessAbortedScan", $hash);
$hash->{helper}{RUNNING_PID}->{loglevel} = GetVerbose($name); # $hash->{helper}{RUNNING_PID}->{loglevel} = GetVerbose($name);
} }
elsif($mode eq "fritzbox") elsif($mode eq "fritzbox")
{ {
Log3 $name, 5, "PRESENCE ($name) - starting blocking call for mode fritzbox"; Log3 $name, 5, "PRESENCE ($name) - starting blocking call for mode fritzbox";
$hash->{helper}{RUNNING_PID} = BlockingCall("PRESENCE_DoLocalFritzBoxScan", $name."|".$hash->{ADDRESS}."|".$local."|".AttrVal($name, "fritzboxCheckSpeed", "0"), "PRESENCE_ProcessLocalScan", 60, "PRESENCE_ProcessAbortedScan", $hash); $hash->{helper}{RUNNING_PID} = BlockingCall("PRESENCE_DoLocalFritzBoxScan", $name."|".$hash->{ADDRESS}."|".$local."|".AttrVal($name, "fritzboxCheckSpeed", "0"), "PRESENCE_ProcessLocalScan", 60, "PRESENCE_ProcessAbortedScan", $hash);
$hash->{helper}{RUNNING_PID}->{loglevel} = GetVerbose($name); # $hash->{helper}{RUNNING_PID}->{loglevel} = GetVerbose($name);
} }
elsif($mode eq "shellscript") elsif($mode eq "shellscript")
{ {
Log3 $name, 5, "PRESENCE ($name) - starting blocking call for mode shellscript"; Log3 $name, 5, "PRESENCE ($name) - starting blocking call for mode shellscript";
$hash->{helper}{RUNNING_PID} = BlockingCall("PRESENCE_DoLocalShellScriptScan", $name."|".$hash->{helper}{call}."|".$local, "PRESENCE_ProcessLocalScan", 60, "PRESENCE_ProcessAbortedScan", $hash); $hash->{helper}{RUNNING_PID} = BlockingCall("PRESENCE_DoLocalShellScriptScan", $name."|".$hash->{helper}{call}."|".$local, "PRESENCE_ProcessLocalScan", 60, "PRESENCE_ProcessAbortedScan", $hash);
$hash->{helper}{RUNNING_PID}->{loglevel} = GetVerbose($name); # $hash->{helper}{RUNNING_PID}->{loglevel} = GetVerbose($name);
} }
elsif($mode eq "function") elsif($mode eq "function")
{ {
Log3 $name, 5, "PRESENCE ($name) - starting blocking call for mode function"; Log3 $name, 5, "PRESENCE ($name) - starting blocking call for mode function";
$hash->{helper}{RUNNING_PID} = BlockingCall("PRESENCE_DoLocalFunctionScan", $name."|".$hash->{helper}{call}."|".$local, "PRESENCE_ProcessLocalScan", 60, "PRESENCE_ProcessAbortedScan", $hash); $hash->{helper}{RUNNING_PID} = BlockingCall("PRESENCE_DoLocalFunctionScan", $name."|".$hash->{helper}{call}."|".$local, "PRESENCE_ProcessLocalScan", 60, "PRESENCE_ProcessAbortedScan", $hash);
$hash->{helper}{RUNNING_PID}->{loglevel} = GetVerbose($name); # $hash->{helper}{RUNNING_PID}->{loglevel} = GetVerbose($name);
} }
if(!$hash->{helper}{RUNNING_PID} and $mode =~ /^local-bluetooth|lan-ping|fritzbox|shellscript|function$/) if(!$hash->{helper}{RUNNING_PID} and $mode =~ /^local-bluetooth|lan-ping|fritzbox|shellscript|function$/)

4
fhem/FHEM/73_PRESENCE2.pm
View File

@ -33,7 +33,7 @@ use Blocking;
use Time::HiRes qw(gettimeofday usleep sleep); use Time::HiRes qw(gettimeofday usleep sleep);
use DevIo; use DevIo;
my $ModulVersion = "01.03a"; my $ModulVersion = "01.03b";
my %LOG_Text = ( my %LOG_Text = (
0 => "SERVER:", 0 => "SERVER:",
1 => "ERROR:", 1 => "ERROR:",
@ -1183,7 +1183,7 @@ sub PRESENCE2_daemonScanScheduler($;$) {
, $nonBlockingTimeout , $nonBlockingTimeout
, "PRESENCE2_daemonAbortedScan" , "PRESENCE2_daemonAbortedScan"
, $hash); , $hash);
$hash->{helper}{RUNNING_PID}->{loglevel} = GetVerbose($name); # $hash->{helper}{RUNNING_PID}->{loglevel} = GetVerbose($name);
} }
} }
} }

6
fhem/FHEM/98_CDCOpenData.pm
View File

@ -54,7 +54,7 @@ use warnings;
use Blocking; use Blocking;
use HttpUtils; use HttpUtils;
my $ModulVersion = "01.12e"; my $ModulVersion = "01.12f";
my $missingModul = ""; my $missingModul = "";
sub CDCOpenData_Log($$$); sub CDCOpenData_Log($$$);
@ -1049,7 +1049,7 @@ sub CDCOpenData_Readout_Start($)
$hash->{helper}{READOUT_RUNNING_PID} = BlockingCall($runFn, $name, $hash->{helper}{READOUT_RUNNING_PID} = BlockingCall($runFn, $name,
"CDCOpenData_Readout_Done", $timeout, "CDCOpenData_Readout_Done", $timeout,
"CDCOpenData_Readout_Aborted", $hash); "CDCOpenData_Readout_Aborted", $hash);
$hash->{helper}{READOUT_RUNNING_PID}->{loglevel} = GetVerbose($name); # $hash->{helper}{READOUT_RUNNING_PID}->{loglevel} = GetVerbose($name);
CDCOpenData_Log $hash, 4, "Fork process $runFn"; CDCOpenData_Log $hash, 4, "Fork process $runFn";
} }
@ -2054,7 +2054,7 @@ sub CDCOpenData_Set_Cmd_Start($)
$hash->{helper}{CMD_RUNNING_PID} = BlockingCall($cmdFunction, $handover, $hash->{helper}{CMD_RUNNING_PID} = BlockingCall($cmdFunction, $handover,
"CDCOpenData_Set_Cmd_Done", $timeout, "CDCOpenData_Set_Cmd_Done", $timeout,
"CDCOpenData_Set_Cmd_Aborted", $hash); "CDCOpenData_Set_Cmd_Aborted", $hash);
$hash->{helper}{READOUT_RUNNING_PID}->{loglevel} = GetVerbose($name); # $hash->{helper}{READOUT_RUNNING_PID}->{loglevel} = GetVerbose($name);
return undef; return undef;
} # end CDCOpenData_Set_Cmd_Start } # end CDCOpenData_Set_Cmd_Start