mhop/fhem
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

36_Shelly: removed use Sub::Util

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@29128 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
Starkstrombastler
2024-09-06 17:03:09 +00:00
parent 2be678775f
commit fb99548c0f
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
fhem/CHANGED
View File

@@ -1,5 +1,6 @@
# Add changes at the top of the list. Keep it in ASCII, and 80-char wide. # Add changes at the top of the list. Keep it in ASCII, and 80-char wide.
# Do not insert empty lines here, update check depends on it # Do not insert empty lines here, update check depends on it
- bugfix: 36_Shelly: removed package command: use Sub::Util
- bugfix: 36_Shelly: added package command: use Sub::Util - bugfix: 36_Shelly: added package command: use Sub::Util
- bugfix: 38_netatmo: changed token refresh to internal reading - bugfix: 38_netatmo: changed token refresh to internal reading
- feature: 70_PylonLowVoltage: new attr waitTimeBetweenRS485Cmd - feature: 70_PylonLowVoltage: new attr waitTimeBetweenRS485Cmd

12
fhem/FHEM/36_Shelly.pm
View File

@@ -103,6 +103,7 @@
# 6.00.1 fix: selection of readings for command 'set clear responsetimes' improved; Debug commands removed # 6.00.1 fix: selection of readings for command 'set clear responsetimes' improved; Debug commands removed
# 6.00.2 fix: reading ble (bluetooth) may be set to disabled # 6.00.2 fix: reading ble (bluetooth) may be set to disabled
# 6.00.3 fix: use Sub::Util added # 6.00.3 fix: use Sub::Util added
# 6.00.4 fix: removed the use of Sub::Util
# to do roller: get maxtime open/close from shelly # to do roller: get maxtime open/close from shelly
# get status on stopp even when interval == 0 # get status on stopp even when interval == 0
@@ -125,7 +126,7 @@ sub Log($$);
sub Shelly_Set ($@); sub Shelly_Set ($@);
#-- globals on start #-- globals on start
my $version = "6.00.3 02.09.2024"; my $version = "6.00.4 06.09.2024";
my $defaultINTERVAL = 60; my $defaultINTERVAL = 60;
my $multiplyIntervalOnError = 1.0; # mechanism disabled if value=1 my $multiplyIntervalOnError = 1.0; # mechanism disabled if value=1
@@ -6360,6 +6361,7 @@ sub Shelly_HttpRequest(@){
hash => $hash, hash => $hash,
callback => \&Shelly_HttpResponse, callback => \&Shelly_HttpResponse,
function => \&$function, function => \&$function,
funcname => $function,
comp => $comp, comp => $comp,
val => $val, val => $val,
request => time() request => time()
@@ -6464,9 +6466,9 @@ sub Shelly_HttpResponse($){
Shelly_error_handling($hash,"Shelly_HttpResponse:code","$err: $msg",2); Shelly_error_handling($hash,"Shelly_HttpResponse:code","$err: $msg",2);
return; return;
} }
Log3 $name,4,"[Shelly_HttpResponse] $name: forwarding JSON-Hash to func: ".Sub::Util::subname($param->{function}); Log3 $name,4,"[Shelly_HttpResponse] $name: forwarding JSON-Hash to func: ".$param->{funcname};
# calling the sub() forwarded by $param # calling the sub() forwarded by $param
$param->{function}($param,$jhash); $param->{function}->($param,$jhash);
}else{ }else{
Log3 $name,4,"[Shelly_HttpResponse] ERROR haven't error neither data for $name"; Log3 $name,4,"[Shelly_HttpResponse] ERROR haven't error neither data for $name";
} }
@@ -6490,7 +6492,7 @@ sub Shelly_HttpResponse($){
<code>define &lt;name&gt; Shelly &lt;IP address&gt;[:port] [[user:]password]</code> <code>define &lt;name&gt; Shelly &lt;IP address&gt;[:port] [[user:]password]</code>
<br />Defines the Shelly device. </p> <br />Defines the Shelly device. </p>
Notes: <ul> Notes: <ul>
<li>This module needs the JSON, the HttpUtils and the Sub::Util package</li> <li>This module needs the JSON and the HttpUtils package</li>
<li>In Shelly button, switch, roller or dimmer devices one may set URL values that are "hit" when the input or output status changes. <li>In Shelly button, switch, roller or dimmer devices one may set URL values that are "hit" when the input or output status changes.
This is useful to transmit status changes arising from locally pressed buttons directly to FHEM by setting This is useful to transmit status changes arising from locally pressed buttons directly to FHEM by setting
<ul> <ul>
@@ -7065,7 +7067,7 @@ sub Shelly_HttpResponse($){
Benutzername: nur bei Gen1: Benutzername: nur bei Gen1:
Passwort: --> Passwort: -->
Hinweise: <ul> Hinweise: <ul>
<li>Dieses Modul benötigt die Pakete JSON, HttpUtils und Sub::Util</li> <li>Dieses Modul benötigt die Pakete JSON and HttpUtils </li>
<li>Das Attribut <code>model</code> wird automatisch gesetzt. <li>Das Attribut <code>model</code> wird automatisch gesetzt.
Für Shelly Geräte, welche nicht von diesem Modul unterstützt werden, wird das Attribut zu <i>generic</i> gesetzt. Für Shelly Geräte, welche nicht von diesem Modul unterstützt werden, wird das Attribut zu <i>generic</i> gesetzt.