FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-03-03 16:56:54 +00:00
Code Issues Releases Wiki Activity

MYSENSORS: fix perl warnings

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@6801 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
ntruchsess 2014-10-22 22:16:03 +00:00
parent 0d7a412a4e
commit 12d480e8e5
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fhem/FHEM/10_MYSENSORS_DEVICE.pm
View File

@ -316,7 +316,7 @@ sub sendClientMessage($%) {
sendMessage($hash->{IODev},%msg);
}
sub mapReading($$) {
sub mapReading($$$$) {
my($hash, $type, $childId, $value) = @_;
if(defined (my $mapping = $hash->{typeMappings}->{$type})) {

18
fhem/FHEM/lib/Device/MySensors/Message.pm
View File

@ -24,20 +24,20 @@ sub parseMsg($) {
sub createMsg(%) {
my %msgRef = @_;
my @fields = ( $msgRef{'radioId'},
$msgRef{'childId'},
$msgRef{'cmd'},
$msgRef{'ack'},
$msgRef{'subType'},
defined($msgRef{'payload'}) ? $msgRef{'payload'} : "" );
my @fields = ( $msgRef{'radioId'} // "",
$msgRef{'childId'} // "",
$msgRef{'cmd'} // "",
$msgRef{'ack'} // "",
$msgRef{'subType'} // "",
$msgRef{'payload'} // "");
return join(';', @fields);
}
sub dumpMsg($) {
my $msgRef = shift;
my $cmd = commandToStr($msgRef->{'cmd'});
my $st = subTypeToStr( $msgRef->{'cmd'}, $msgRef->{'subType'} );
return sprintf("Rx: fr=%03d ci=%03d c=%03d(%-14s) st=%03d(%-16s) ack=%d %s\n", $msgRef->{'radioId'}, $msgRef->{'childId'}, $msgRef->{'cmd'}, $cmd, $msgRef->{'subType'}, $st, $msgRef->{'ack'}, defined($msgRef->{'payload'}) ? "'".$msgRef->{'payload'}."'" : "");
my $cmd = defined $msgRef->{'cmd'} ? commandToStr($msgRef->{'cmd'}) : "''";
my $st = (defined $msgRef->{'cmd'} and defined $msgRef->{'subType'}) ? subTypeToStr( $msgRef->{'cmd'}, $msgRef->{'subType'} ) : "''";
return sprintf("Rx: fr=%03d ci=%03d c=%03d(%-14s) st=%03d(%-16s) ack=%d %s\n", $msgRef->{'radioId'} // "", $msgRef->{'childId'} // "", $msgRef->{'cmd'} // "", $cmd, $msgRef->{'subType'} // "", $st, $msgRef->{'ack'} // "", "'".$msgRef->{'payload'} // ""."'");
}
sub gettime {