diff --git a/fhem/CHANGED b/fhem/CHANGED index cc5eb9936..10a16c42d 100644 --- a/fhem/CHANGED +++ b/fhem/CHANGED @@ -1,12 +1,13 @@ # 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. + - bugfix: 10_FRM: accept Firmata firmware without AnalogInputFirmata - bugfix: 10_MYSENSORS_DEVICE: corrected S_LIGHT_LEVEL - bugfix: 93_DbRep: fix "month out of range" that causes fhem crash - feature: 20_FRM_PWM: new attribute "restoreOnStartup" - feature: 20_FRM_OUT: new attributes "activeLow" and "valueMode" - feature: 10_FRM: SerialFirmata support - - update: 10_FRM: OWX IODev assignment - - update: 10_FRM: Firmata 2.7+ support + - update: 10_FRM: OWX IODev assignment + - update: 10_FRM: Firmata 2.7+ support - bugfix: 98_weekprofile: fix "error restore topic" - change: 14_CUL_TCM97001: Fix Logoutput, Fix device output with multiple sensors diff --git a/fhem/FHEM/10_FRM.pm b/fhem/FHEM/10_FRM.pm index a03503e91..dee2c9c97 100755 --- a/fhem/FHEM/10_FRM.pm +++ b/fhem/FHEM/10_FRM.pm @@ -562,7 +562,7 @@ sub FRM_SetupDevice($) { } elsif ($hash->{SETUP_STAGE} == 2) { # device capabilities RemoveInternalTimer($hash); InternalTimer(gettimeofday() + 1, 'FRM_SetupDevice', $hash, 0); - my $capabilitiesReceived = $device->{metadata}{analog_mappings} && $device->{metadata}{capabilities}; + my $capabilitiesReceived = $device->{metadata}{capabilities} && ($device->{metadata}{analog_mappings} || ($elapsed >= 5)); if ($capabilitiesReceived) { # device capabilities have been received, convert to readings my $inputpins = $device->{metadata}{input_pins}; @@ -634,7 +634,6 @@ sub FRM_SetupDevice($) { # ready, init client modules $hash->{SETUP_STAGE} = 3; FRM_SetupDevice($hash); - } elsif ($elapsed >= 5) { # capabilities receive timeout, abort $hash->{SETUP_STAGE} = 5; @@ -1464,6 +1463,9 @@ sub FRM_Serial_Close { o OWX support - modified FRM_Client_AssignIOPort: use already assigned IODev + 04.01.2018 JB + o fix capability query for Firmata firmware without AnalogInputFirmata + =cut =pod @@ -1556,8 +1558,8 @@ sub FRM_Serial_Close {
  • - If the device is called none, then no device will be opened, so you - can experiment without hardware attached.
    + If the device is called none, then no device will be opened, so you + can experiment without hardware attached.
  • @@ -1579,12 +1581,12 @@ sub FRM_Serial_Close { Attributes


    Notes