2
0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-01-31 12:49:34 +00:00

10_MYSENSORS_DEVICE: fix unitialized value #118952 and some more

git-svn-id: https://svn.fhem.de/fhem/trunk@23777 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
Beta-User 2021-02-20 11:03:16 +00:00
parent 802cc0841f
commit 4207311716

View File

@ -64,6 +64,8 @@ BEGIN {
asyncOutput
readingFnAttributes
IsDisabled
defs
init_done
))
};
@ -360,7 +362,7 @@ sub Set {
readingsSingleUpdate($hash,"state","set $command",1) ;
}
};
return "$command not defined: ".GP_Catch($@) if $@;
if ($@) { return "$command not defined: ".GP_Catch($@) };
return;
}
@ -373,9 +375,9 @@ sub Set {
subType => $type,
payload => $mappedValue
);
readingsSingleUpdate($hash,$command,$value,1) unless ($hash->{ack} or $hash->{IODev}->{ack});
readingsSingleUpdate($hash,$command,$value,1) if !$hash->{ack} || !$hash->{IODev}->{ack};
};
return "$command not defined: ".GP_Catch($@) if $@;
if ($@) { return "$command not defined: ".GP_Catch($@)};
return;
}
@ -506,12 +508,12 @@ sub onStreamMessage {
readingsBulkUpdate($hash, 'BL_VERSION', $blVersion);
readingsEndUpdate($hash, 1);
Log3($name, 4, "$name: received ST_FIRMWARE_CONFIG_REQUEST");
if ((AttrVal($name, "OTA_autoUpdate", 0) == 1) && ($blVersion eq "3.0" or $blType eq "Optiboot")) {
if ((AttrVal($name, 'OTA_autoUpdate', 0)) && ($blVersion eq '3.0' || $blType eq 'Optiboot')) {
Log3($name, 4, "$name: Optiboot BL, Node set to OTA_autoUpdate => calling firmware update procedure");
flashFirmware($hash, $fwType);
} elsif ($blType eq "MYSBootloader" && $hash->{OTA_requested} == 1) {
} elsif ($blType eq 'MYSBootloader' && $hash->{OTA_requested}) {
Log3($name, 4, "$name: MYSBootloader asking for firmware update, calling firmware update procedure");
$fwType = ReadingsVal($name, "FW_TYPE", "unknown");
$fwType = ReadingsVal($name, 'FW_TYPE', 'unknown');
flashFirmware($hash, $fwType);
}
} else {
@ -615,8 +617,8 @@ sub onStreamMessage {
sub Attr {
my ($command,$name,$attribute,$value) = @_;
my $hash = $main::defs{$name};
if ($attribute eq "config" && $main::init_done) {
my $hash = $defs{$name};
if ($attribute eq "config" && $init_done) {
sendClientMessage($hash,
cmd => C_INTERNAL,
childId => 255,