From b0bbf0f0e7d0fd05030a42702b95312db76cbc56 Mon Sep 17 00:00:00 2001 From: Beta-User Date: Sun, 29 Nov 2020 07:21:46 +0000 Subject: [PATCH] MYSENSORS_DEVICE: changes to reboot bootloader identification, #116250 git-svn-id: https://svn.fhem.de/fhem/trunk@23254 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/10_MYSENSORS_DEVICE.pm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/fhem/FHEM/10_MYSENSORS_DEVICE.pm b/fhem/FHEM/10_MYSENSORS_DEVICE.pm index 45b195aea..7f09ffe5b 100755 --- a/fhem/FHEM/10_MYSENSORS_DEVICE.pm +++ b/fhem/FHEM/10_MYSENSORS_DEVICE.pm @@ -281,8 +281,7 @@ sub Set { } if ($command eq "reboot") { - my $blVersion = ReadingsVal($name, "BL_VERSION", ""); - defined($hash->{OTA_BL_Type}) or $blVersion eq "3.0" + AttrVal($name, "OTA_BL_Type", 0) or ReadingsVal($name, "BL_VERSION", 0) ? return sendClientMessage($hash, childId => 255, cmd => C_INTERNAL, @@ -310,10 +309,12 @@ sub Set { if ($fwType == -1) { Log3 ($name,3,"Firmware type not defined (FW_TYPE) for $name, update not started"); return "$name: Firmware type not defined (FW_TYPE)"; - } elsif ($blVersion eq "3.0" or $blType eq "Optiboot") { + } + if ($blVersion eq "3.0" or $blType eq "Optiboot") { Log3 ($name,4,"Startet flashing Firmware: Optiboot method"); return flashFirmware($hash, $fwType); - } elsif ($blType eq "MYSBootloader") { + } + if ($blType eq "MYSBootloader") { $hash->{OTA_requested} = 1; Log3 ($name,4,"Send reboot command to MYSBootloader node to start update"); return sendClientMessage($hash,