FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-20 13:26:02 +00:00
Code Issues Releases Wiki Activity

34_ESPEasy.pm: improved attribute handling

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@13854 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
dev0 2017-03-30 07:25:44 +00:00
parent ecb946b2b5
commit 229b2190d6
1 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
fhem/FHEM/34_ESPEasy.pm
View File

@ -36,7 +36,7 @@ use Color;
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
# global/default values # global/default values
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
my $module_version = 1.00; # Version of this module my $module_version = 1.01; # Version of this module
my $minEEBuild = 128; # informational my $minEEBuild = 128; # informational
my $minJsonVersion = 1.02; # checked in received data my $minJsonVersion = 1.02; # checked in received data
@ -166,6 +166,17 @@ my %ESPEasy_pinMap = (
"SD3" => 10 "SD3" => 10
); );
# ------------------------------------------------------------------------------
# build id
# ------------------------------------------------------------------------------
my %ESPEasy_build_id = (
"1" => { "type" => "ESP Easy", "ver" => "STD" },
"17" => { "type" => "ESP Easy Mega", "ver" => "STD" },
"33" => { "type" => "ESP Easy 32", "ver" => "STD" },
"65" => { "type" => "ARDUINO Easy", "ver" => "STD" },
"81" => { "type" => "NANO Easy", "ver" => "STD" }
);
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
#grep ^sub 34_ESPEasy.pm | awk '{print $1" "$2";"}' #grep ^sub 34_ESPEasy.pm | awk '{print $1" "$2";"}'
@ -915,22 +926,23 @@ sub ESPEasy_Attr(@)
elsif ($aName eq "maxHttpSessions") { elsif ($aName eq "maxHttpSessions") {
($cmd eq "set" && ($aVal !~ m/^[0-9]+$/)) ($cmd eq "set" && ($aVal !~ m/^[0-9]+$/))
? $ret = ">= 0 (default: $d_maxHttpSessions, 0: disable queuing)" ? ($ret = ">= 0 (default: $d_maxHttpSessions, 0: disable queuing)")
: $hash->{MAX_HTTP_SESSIONS} = $aVal; : ($hash->{MAX_HTTP_SESSIONS} = $aVal);
if ($cmd eq "del") {$hash->{MAX_HTTP_SESSIONS} = $d_maxHttpSessions} if ($cmd eq "del") {$hash->{MAX_HTTP_SESSIONS} = $d_maxHttpSessions}
} }
elsif ($aName eq "maxQueueSize") { elsif ($aName eq "maxQueueSize") {
($cmd eq "set" && ($aVal !~ m/^[1-9][0-9]+$/)) ($cmd eq "set" && ($aVal !~ m/^[1-9][0-9]+$/))
? $ret = ">10 (default: $d_maxQueueSize)" ? ($ret = ">=10 (default: $d_maxQueueSize)")
: $hash->{MAX_QUEUE_SIZE} = $aVal; : ($hash->{MAX_QUEUE_SIZE} = $aVal);
if ($cmd eq "del") {$hash->{MAX_QUEUE_SIZE} = $d_maxQueueSize} if ($cmd eq "del") {$hash->{MAX_QUEUE_SIZE} = $d_maxQueueSize}
} }
elsif ($aName eq "Interval") { elsif ($aName eq "Interval") {
($cmd eq "set" && ($aVal !~ m/^(\d)+$/ || $aVal <10 && $aVal !=0)) ($cmd eq "set" && ($aVal !~ m/^(\d)+$/ || $aVal <10 && $aVal !=0))
? $ret = "0 or >=10" ? ($ret = "0 or >=10")
: $hash->{INTERVAL} = $aVal} : ($hash->{INTERVAL} = $aVal)
}
if (!$init_done) { if (!$init_done) {
if ($aName =~ /^disable$/ && $aVal == 1) { if ($aName =~ /^disable$/ && $aVal == 1) {
@ -2181,7 +2193,7 @@ sub ESPEasy_ip2bin($)
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
# expand IPv6 address to 8 full blocks # expand IPv6 address to 8 full blocks
# Advantage of IO::Socket: already installed and it is the fastest way # Advantage of IO::Socket : already installed and it seems to be the fastest way
# http://stackoverflow.com/questions/4800691/perl-ipv6-address-expansion-parsing # http://stackoverflow.com/questions/4800691/perl-ipv6-address-expansion-parsing
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
sub ESPEasy_expandIPv6($) sub ESPEasy_expandIPv6($)