mirror of
https://github.com/fhem/fhem-mirror.git
synced 2025-03-10 03:06:37 +00:00
14_FLAMINGO: fix some perlcritic 5 warnings
git-svn-id: https://svn.fhem.de/fhem/trunk@22619 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
HomeAuto_User
parent
906782a9d6
commit
e203879aeb
@ -1,5 +1,6 @@
|
||||
# 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.
|
||||
- feature: 14_FLAMINGO.pm: fix some perlcritic 5 warnings
|
||||
- feature: 98_DOIFtools: get subsInPackageDOIF for MODEL Perl (Forum #63938)
|
||||
- bugfix: 49_SSCam(STRM): avoid possible warnings during shutdown/restart
|
||||
- bugfix: 52_I2C_HDC1008: fix "temperature" (broken by change from Aug, 1st)
|
||||
|
||||
@ -3,9 +3,10 @@
|
||||
#################################################################
|
||||
# The module was taken over by an unknown maintainer!
|
||||
# It is part of the SIGNALduinos project.
|
||||
# https://github.com/RFD-FHEM/RFFHEM/tree/dev-r33
|
||||
# https://github.com/RFD-FHEM/RFFHEM
|
||||
#
|
||||
# 2018 - HomeAuto_User & elektron-bbs
|
||||
# 2018 - takeover from unknown maintainer
|
||||
# 2018-2020 - HomeAuto_User, elektron-bbs
|
||||
#################################################################
|
||||
# FLAMINGO FA20RF
|
||||
# get sduino_dummy raw MU;;P0=-1384;;P1=815;;P2=-2725;;P3=-20001;;P4=8159;;P5=-891;;D=01010121212121010101210101345101210101210101212101010101012121212101010121010134510121010121010121210101010101212121210101012101013451012101012101012121010101010121212121010101210101345101210101210101212101010101012121212101010121010134510121010121010121;;CP=1;;O;;
|
||||
@ -25,106 +26,111 @@ package main;
|
||||
use strict;
|
||||
use warnings;
|
||||
|
||||
our $VERSION = '200817';
|
||||
|
||||
my %sets = (
|
||||
"Testalarm:noArg",
|
||||
"Counterreset:noArg",
|
||||
'Testalarm:noArg',
|
||||
'Counterreset:noArg',
|
||||
);
|
||||
|
||||
my %models = (
|
||||
"FA20RF",
|
||||
"FA21RF",
|
||||
"FA22RF",
|
||||
"KD-101LA",
|
||||
"LM-101LD",
|
||||
"unknown",
|
||||
'FA20RF',
|
||||
'FA21RF',
|
||||
'FA22RF',
|
||||
'KD-101LA',
|
||||
'LM-101LD',
|
||||
'unknown',
|
||||
);
|
||||
|
||||
|
||||
#####################################
|
||||
sub
|
||||
FLAMINGO_Initialize($)
|
||||
{
|
||||
sub FLAMINGO_Initialize {
|
||||
my ($hash) = @_;
|
||||
|
||||
$hash->{Match} = "^P13\.?1?#[A-Fa-f0-9]+";
|
||||
$hash->{SetFn} = "FLAMINGO_Set";
|
||||
$hash->{DefFn} = "FLAMINGO_Define";
|
||||
$hash->{UndefFn} = "FLAMINGO_Undef";
|
||||
$hash->{ParseFn} = "FLAMINGO_Parse";
|
||||
$hash->{AttrList} = "IODev do_not_notify:0,1 showtime:0,1 ignore:0,1 ".
|
||||
"model:".join(",", sort %models)." " .
|
||||
"room:FLAMINGO ".
|
||||
$hash->{Match} = '^P13\.?1?#[A-Fa-f0-9]+';
|
||||
$hash->{SetFn} = 'FLAMINGO_Set';
|
||||
$hash->{DefFn} = 'FLAMINGO_Define';
|
||||
$hash->{UndefFn} = 'FLAMINGO_Undef';
|
||||
$hash->{ParseFn} = 'FLAMINGO_Parse';
|
||||
$hash->{AttrList} = 'IODev do_not_notify:0,1 showtime:0,1 ignore:0,1 '.
|
||||
'model:'.join(q{,}, sort %models).q{ } .
|
||||
'room:FLAMINGO '.
|
||||
$readingFnAttributes;
|
||||
$hash->{AutoCreate}=
|
||||
{
|
||||
"FLAMINGO.*" => { ATTR => "event-on-change-reading:.* event-min-interval:.*:300 room:FLAMINGO", FILTER => "%NAME", GPLOT => ""},
|
||||
'FLAMINGO.*' => { ATTR => 'event-on-change-reading:.* event-min-interval:.*:300', FILTER => '%NAME', GPLOT => q{} },
|
||||
};
|
||||
|
||||
return
|
||||
}
|
||||
|
||||
#####################################
|
||||
sub FLAMINGO_Define($$) {
|
||||
sub FLAMINGO_Define {
|
||||
my ($hash, $def) = @_;
|
||||
my @a = split("[ \t][ \t]*", $def);
|
||||
|
||||
# Argument 0 1 2 3 4
|
||||
return "wrong syntax: define <name> FLAMINGO <code> <model> <optional IODev>" if(int(@a) < 3 || int(@a) > 5);
|
||||
### check code ###
|
||||
return "wrong hex value: ".$a[2] if not ($a[2] =~ /^[0-9a-fA-F]{6}$/m);
|
||||
return 'ERROR: wrong syntax, define <name> FLAMINGO <code> <model> <optional IODev>' if(int(@a) < 3 || int(@a) > 5);
|
||||
### check hex code ###
|
||||
return 'ERROR: wrong hex length ' . length($a[2]) . ', you need 6'if not length($a[2]) == 6;
|
||||
return 'ERROR: wrong hex value ' . $a[2] if not ($a[2] =~ /^[0-9a-fA-F]{6}$/xms);
|
||||
### check model ###
|
||||
return "wrong model: ".$a[3] . "\n\n(allowed modelvalues: " . join(" | ", sort %models).")" if $a[3] && ( !grep { $_ eq $a[3] } %models );
|
||||
return 'ERROR: wrong model: '.$a[3] . "\n\n(allowed modelvalues: " . join(' | ', sort %models).')' if $a[3] && ( !grep { $_ eq $a[3] } %models );
|
||||
|
||||
$hash->{CODE} = $a[2];
|
||||
$hash->{lastMSG} = "no data";
|
||||
$hash->{bitMSG} = "no data";
|
||||
$hash->{lastMSG} = 'no data';
|
||||
$hash->{bitMSG} = 'no data';
|
||||
|
||||
$modules{FLAMINGO}{defptr}{$a[2]} = $hash;
|
||||
$hash->{STATE} = "Defined";
|
||||
$hash->{STATE} = 'Defined';
|
||||
|
||||
my $name = $hash->{NAME};
|
||||
my $iodev = $a[3] if($a[3]);
|
||||
$iodev = $modules{FLAMINGO}{defptr}{ioname} if (exists $modules{FLAMINGO}{defptr}{ioname} && not $iodev);
|
||||
my $iodev;
|
||||
if ($a[4]) { $iodev = $a[4]; };
|
||||
if (exists $modules{FLAMINGO}{defptr}{ioname} && !$iodev) { $iodev = $modules{FLAMINGO}{defptr}{ioname}; };
|
||||
|
||||
### Attributes ###
|
||||
if ( $init_done == 1 ) {
|
||||
$attr{$name}{model} = $a[3] if $a[3];
|
||||
$attr{$name}{model} = "unknown" if not $a[3];
|
||||
|
||||
$attr{$name}{room} = "FLAMINGO";
|
||||
#$attr{$name}{stateFormat} = "{ReadingsVal($name, "state", "")." | ".ReadingsTimestamp($name, "state", "")}";
|
||||
if ($a[3]) { CommandAttr($hash,"$name model $a[3]") ;};
|
||||
if (not $a[3]) { CommandAttr($hash,"$name model unknown") ;};
|
||||
}
|
||||
|
||||
AssignIoPort($hash,$iodev); ## sucht nach einem passenden IO-Gerät (physikalische Definition)
|
||||
|
||||
return undef;
|
||||
return;
|
||||
}
|
||||
|
||||
#####################################
|
||||
sub FLAMINGO_Undef($$) {
|
||||
sub FLAMINGO_Undef {
|
||||
my ($hash, $name) = @_;
|
||||
|
||||
RemoveInternalTimer($hash, "FLAMINGO_UpdateState");
|
||||
delete($modules{FLAMINGO}{defptr}{$hash->{CODE}}) if($hash && $hash->{CODE});
|
||||
delete($modules{FLAMINGO}{defptr}{testrunning}) if exists ($modules{FLAMINGO}{defptr}{testrunning});
|
||||
return undef;
|
||||
RemoveInternalTimer($hash, 'FLAMINGO_UpdateState');
|
||||
if($hash && $hash->{CODE}) {
|
||||
delete($modules{FLAMINGO}{defptr}{$hash->{CODE}});
|
||||
};
|
||||
|
||||
if ( exists $modules{FLAMINGO}{defptr}{testrunning} ) {
|
||||
delete($modules{FLAMINGO}{defptr}{testrunning});
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
#####################################
|
||||
sub FLAMINGO_Set($$@) {
|
||||
sub FLAMINGO_Set {
|
||||
my ( $hash, $name, @args ) = @_;
|
||||
|
||||
my $ret = undef;
|
||||
my $message;
|
||||
my $list;
|
||||
my $model = AttrVal($name, "model", "unknown");
|
||||
my $model = AttrVal($name, 'model', 'unknown');
|
||||
my $iodev = $hash->{IODev}{NAME};
|
||||
|
||||
$list = join (" ", %sets);
|
||||
return "ERROR: wrong command! (only $list)" if ($args[0] ne "?" && $args[0] ne "Testalarm" && $args[0] ne "Counterreset");
|
||||
$list = join (q{ }, %sets);
|
||||
return "ERROR: wrong command! (only $list)" if ($args[0] ne '?' && $args[0] ne 'Testalarm' && $args[0] ne 'Counterreset');
|
||||
|
||||
if ($args[0] eq "?") {
|
||||
if ($model eq "unknown") {
|
||||
$ret = ""; # no set if model unknown or no model attribut
|
||||
if ($args[0] eq '?') {
|
||||
if ($model eq 'unknown') {
|
||||
$ret = q{}; # no set if model unknown or no model attribut
|
||||
} else {
|
||||
$ret = $list;
|
||||
}
|
||||
@ -137,43 +143,46 @@ sub FLAMINGO_Set($$@) {
|
||||
my $bitAdd = substr($bitData,23,1); # for last bit, is needed to send
|
||||
|
||||
## use the protocol ID how receive last message
|
||||
my $sendID = ReadingsVal($name, "lastReceive_ID", ""); # for send command, because ID´s can vary / MU / MS message
|
||||
my $sendID = ReadingsVal($name, 'lastReceive_ID', q{}); # for send command, because ID´s can vary / MU / MS message
|
||||
|
||||
$message = "P".$sendID."#".$bitData.$bitAdd."P#R55";
|
||||
$message = 'P'.$sendID.'#'.$bitData.$bitAdd.'P#R55';
|
||||
|
||||
## Send Message to IODev and wait for correct answer
|
||||
Log3 $hash, 3, "FLAMINGO set $name $args[0]" if ($args[0] ne "?");
|
||||
Log3 $hash, 4, "$iodev: FLAMINGO send raw Message: $message" if ($args[0] eq "Testalarm");
|
||||
if ($args[0] ne '?') {
|
||||
Log3 $hash, 3, "FLAMINGO set $name $args[0]";
|
||||
}
|
||||
|
||||
## Counterreset ##
|
||||
if ($args[0] eq "Counterreset") {
|
||||
readingsSingleUpdate($hash, "alarmcounter", 0, 1);
|
||||
if ($args[0] eq 'Counterreset') {
|
||||
readingsSingleUpdate($hash, 'alarmcounter', 0, 1);
|
||||
}
|
||||
|
||||
## Testarlarm ##
|
||||
if ($args[0] ne "?" and $args[0] ne "Counterreset") {
|
||||
if ($args[0] ne '?' and $args[0] ne 'Counterreset') {
|
||||
|
||||
# remove InternalTimer
|
||||
RemoveInternalTimer($hash, "FLAMINGO_UpdateState");
|
||||
RemoveInternalTimer($hash, 'FLAMINGO_UpdateState');
|
||||
|
||||
$modules{FLAMINGO}{defptr}{testrunning} = "yes"; # marker, device send Testalarm to NOT register this alarm with other receivers in FHEM
|
||||
Log3 $hash, 4, "FLAMINGO set marker TESTALARM is running";
|
||||
$modules{FLAMINGO}{defptr}{testrunning} = 'yes'; # marker, device send Testalarm to NOT register this alarm with other receivers in FHEM
|
||||
Log3 $hash, 4, 'FLAMINGO set marker TESTALARM is running';
|
||||
|
||||
readingsSingleUpdate($hash, 'state', 'Testalarm', 1);
|
||||
Log3 $hash, 4, "$iodev: FLAMINGO send raw Message: $message";
|
||||
|
||||
readingsSingleUpdate($hash, "state", "Testalarm", 1);
|
||||
IOWrite($hash, 'sendMsg', $message);
|
||||
|
||||
InternalTimer(gettimeofday()+15, "FLAMINGO_UpdateState", $hash, 0); # set timer to Update status
|
||||
InternalTimer(gettimeofday()+15, 'FLAMINGO_UpdateState', $hash, 0); # set timer to Update status
|
||||
}
|
||||
|
||||
return $ret;
|
||||
}
|
||||
|
||||
#####################################
|
||||
sub FLAMINGO_Parse($$) {
|
||||
sub FLAMINGO_Parse {
|
||||
my ($iohash, $msg) = @_;
|
||||
#my $name = $iohash->{NAME};
|
||||
my ($protocol,$rawData) = split("#",$msg);
|
||||
$protocol=~ s/^[P](\d+)/$1/; # extract protocol
|
||||
my ($protocol,$rawData) = split('#',$msg);
|
||||
$protocol=~ s/^[P](\d+)/$1/xms; # extract protocol
|
||||
|
||||
my $iodev = $iohash->{NAME};
|
||||
$modules{FLAMINGO}{defptr}{ioname} = $iodev;
|
||||
@ -185,10 +194,12 @@ sub FLAMINGO_Parse($$) {
|
||||
my $deviceCode = $rawData; # Message is in hex "4d4efd"
|
||||
|
||||
my $def = $modules{FLAMINGO}{defptr}{$deviceCode};
|
||||
$def = $modules{FLAMINGO}{defptr}{$deviceCode} if(!$def);
|
||||
if(!$def) {
|
||||
$def = $modules{FLAMINGO}{defptr}{$deviceCode};
|
||||
}
|
||||
my $hash = $def;
|
||||
|
||||
#my $model = AttrVal($name, "model", "unknown");
|
||||
#my $model = AttrVal($name, 'model', 'unknown');
|
||||
|
||||
if(!$def) {
|
||||
Log3 $iohash, 1, "FLAMINGO UNDEFINED sensor detected, code $deviceCode, protocol $protocol";
|
||||
@ -196,25 +207,29 @@ sub FLAMINGO_Parse($$) {
|
||||
}
|
||||
|
||||
my $name = $hash->{NAME};
|
||||
return "" if(IsIgnored($name));
|
||||
if(IsIgnored($name)) {
|
||||
return q{};
|
||||
}
|
||||
|
||||
$hash->{bitMSG} = $bitData;
|
||||
$hash->{lastMSG} = $rawData;
|
||||
$hash->{lastReceive} = time();
|
||||
|
||||
readingsSingleUpdate($hash, "lastReceive_ID", $protocol, 0); # to save lastReceive_ID for send command
|
||||
readingsSingleUpdate($hash, 'lastReceive_ID', $protocol, 0); # to save lastReceive_ID for send command
|
||||
|
||||
## check if Testalarm received from a other transmitter in FHEM ##
|
||||
my $testalarmcheck = "";
|
||||
$testalarmcheck = $modules{FLAMINGO}{defptr}{testrunning} if exists ($modules{FLAMINGO}{defptr}{testrunning});
|
||||
|
||||
if ($testalarmcheck eq "yes") {
|
||||
return "";
|
||||
my $testalarmcheck = q{};
|
||||
if ( exists $modules{FLAMINGO}{defptr}{testrunning} ) {
|
||||
$testalarmcheck = $modules{FLAMINGO}{defptr}{testrunning};
|
||||
}
|
||||
|
||||
my $alarmcounter = ReadingsVal($name, "alarmcounter", 0);
|
||||
if ($testalarmcheck eq 'yes') {
|
||||
return q{};
|
||||
}
|
||||
|
||||
if (ReadingsVal($name, "state", "") ne "Alarm") {
|
||||
my $alarmcounter = ReadingsVal($name, 'alarmcounter', 0);
|
||||
|
||||
if (ReadingsVal($name, 'state', q{}) ne 'Alarm') {
|
||||
$alarmcounter = $alarmcounter+1;
|
||||
}
|
||||
|
||||
@ -222,32 +237,35 @@ sub FLAMINGO_Parse($$) {
|
||||
Log3 $name, 4, "$iodev: FLAMINGO $name: is receiving Alarm (Counter $alarmcounter)";
|
||||
|
||||
# remove InternalTimer
|
||||
RemoveInternalTimer($hash, "FLAMINGO_UpdateState");
|
||||
RemoveInternalTimer($hash, 'FLAMINGO_UpdateState');
|
||||
|
||||
readingsBeginUpdate($hash);
|
||||
readingsBulkUpdate($hash, "state", "Alarm");
|
||||
readingsBulkUpdate($hash, "alarmcounter", $alarmcounter); # register non testalarms how user can set via FHEM
|
||||
readingsBulkUpdate($hash, 'state', 'Alarm');
|
||||
readingsBulkUpdate($hash, 'alarmcounter', $alarmcounter); # register non testalarms how user can set via FHEM
|
||||
readingsEndUpdate($hash, 1); # Notify is done by Dispatch
|
||||
|
||||
InternalTimer(gettimeofday()+15, "FLAMINGO_UpdateState", $hash, 0); # set timer to Update status
|
||||
InternalTimer(gettimeofday()+15, 'FLAMINGO_UpdateState', $hash, 0); # set timer to Update status
|
||||
|
||||
return $name;
|
||||
}
|
||||
|
||||
#####################################
|
||||
sub FLAMINGO_UpdateState($) {
|
||||
sub FLAMINGO_UpdateState {
|
||||
my ($hash) = @_;
|
||||
my $name = $hash->{NAME};
|
||||
|
||||
readingsBeginUpdate($hash);
|
||||
readingsBulkUpdate($hash, "state", "no Alarm");
|
||||
readingsBulkUpdate($hash, 'state', 'no Alarm');
|
||||
readingsEndUpdate($hash, 1); # Notify is done by Dispatch
|
||||
|
||||
## delete marker device Testalarm ##
|
||||
Log3 $hash, 4, "FLAMINGO delete marker TESTALARM was running" if exists ($modules{FLAMINGO}{defptr}{testrunning});
|
||||
delete($modules{FLAMINGO}{defptr}{testrunning}) if exists ($modules{FLAMINGO}{defptr}{testrunning});
|
||||
if ( exists $modules{FLAMINGO}{defptr}{testrunning} ) {
|
||||
Log3 $hash, 4, 'FLAMINGO delete marker TESTALARM was running';
|
||||
delete($modules{FLAMINGO}{defptr}{testrunning})
|
||||
};
|
||||
|
||||
Log3 $name, 4, "FLAMINGO: $name: Alarm stopped";
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user