From 2b77e01eeccc405397b28a4126774eb40cf036ed Mon Sep 17 00:00:00 2001 From: ntruchsess <> Date: Sat, 25 Oct 2014 12:10:23 +0000 Subject: [PATCH] MYSENSORS_DEVICE: don't append -1 to autocreated reading if is 1 git-svn-id: https://svn.fhem.de/fhem/trunk@6808 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/10_MYSENSORS_DEVICE.pm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/fhem/FHEM/10_MYSENSORS_DEVICE.pm b/fhem/FHEM/10_MYSENSORS_DEVICE.pm index fae0a43ac..76d87d714 100644 --- a/fhem/FHEM/10_MYSENSORS_DEVICE.pm +++ b/fhem/FHEM/10_MYSENSORS_DEVICE.pm @@ -366,12 +366,13 @@ sub onPresentationMessage($$) { my $readingMappings = $hash->{readingMappings}; my $typeMappings = $hash->{typeMappings}; if (my $sensorMappings = $hash->{sensorMappings}->{$nodeType}) { + my $idStr = ($id > 1 ? $id-1 : ""); my @ret = (); foreach my $type (@{$sensorMappings->{sends}}) { next if (defined $readingMappings->{$id}->{$type}); my $typeStr = $typeMappings->{$type}->{type}; if ($hash->{IODev}->{'inclusion-mode'}) { - if (my $ret = CommandAttr(undef,"$name mapReading_$typeStr$id $id $typeStr")) { + if (my $ret = CommandAttr(undef,"$name mapReading_$typeStr$idStr $id $typeStr")) { push @ret,$ret; } } else { @@ -381,9 +382,9 @@ sub onPresentationMessage($$) { foreach my $type (@{$sensorMappings->{receives}}) { my $typeMapping = $typeMappings->{$type}; my $typeStr = $typeMapping->{type}; - next if (defined $hash->{sets}->{"$typeStr$id"}); + next if (defined $hash->{sets}->{"$typeStr$idStr"}); if ($hash->{IODev}->{'inclusion-mode'}) { - if (my $ret = CommandAttr(undef,"$name setReading_$typeStr$id".($typeMapping->{val} ? " ".join (",",values %{$typeMapping->{val}}) : ""))) { + if (my $ret = CommandAttr(undef,"$name setReading_$typeStr$idStr".($typeMapping->{val} ? " ".join (",",values %{$typeMapping->{val}}) : ""))) { push @ret,$ret; } } else {