From bed1c03f700cdaf1337e8b4902fc10eb836b320e Mon Sep 17 00:00:00 2001 From: Bruce Luckcuck Date: Thu, 1 Feb 2018 06:50:11 -0500 Subject: [PATCH] Airmode 3D activation fix requested changes Formatting changes and correction to update the PG version. --- src/main/interface/msp.c | 4 ++-- src/main/rx/rx.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/interface/msp.c b/src/main/interface/msp.c index 1bdbc03d23..67c9211ab5 100644 --- a/src/main/interface/msp.c +++ b/src/main/interface/msp.c @@ -1013,7 +1013,7 @@ static bool mspProcessOutCommand(uint8_t cmdMSP, sbuf_t *dst) sbufWriteU16(dst, rxConfig()->rx_max_usec); sbufWriteU8(dst, rxConfig()->rcInterpolation); sbufWriteU8(dst, rxConfig()->rcInterpolationInterval); - sbufWriteU16(dst, (rxConfig()->airModeActivateThreshold * 10) + 1000); + sbufWriteU16(dst, rxConfig()->airModeActivateThreshold * 10 + 1000); sbufWriteU8(dst, rxConfig()->rx_spi_protocol); sbufWriteU32(dst, rxConfig()->rx_spi_id); sbufWriteU8(dst, rxConfig()->rx_spi_rf_channel_count); @@ -1872,7 +1872,7 @@ static mspResult_e mspProcessInCommand(uint8_t cmdMSP, sbuf_t *src) if (sbufBytesRemaining(src) >= 4) { rxConfigMutable()->rcInterpolation = sbufReadU8(src); rxConfigMutable()->rcInterpolationInterval = sbufReadU8(src); - rxConfigMutable()->airModeActivateThreshold = ((sbufReadU16(src) - 1000) / 10); + rxConfigMutable()->airModeActivateThreshold = (sbufReadU16(src) - 1000) / 10; } if (sbufBytesRemaining(src) >= 6) { rxConfigMutable()->rx_spi_protocol = sbufReadU8(src); diff --git a/src/main/rx/rx.c b/src/main/rx/rx.c index cf4cdf3136..61f33cb1bb 100644 --- a/src/main/rx/rx.c +++ b/src/main/rx/rx.c @@ -126,7 +126,7 @@ static uint8_t rcSampleIndex = 0; #define BINDPLUG_PIN NONE #endif -PG_REGISTER_WITH_RESET_FN(rxConfig_t, rxConfig, PG_RX_CONFIG, 1); +PG_REGISTER_WITH_RESET_FN(rxConfig_t, rxConfig, PG_RX_CONFIG, 2); void pgResetFn_rxConfig(rxConfig_t *rxConfig) { RESET_CONFIG_2(rxConfig_t, rxConfig,