Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-16 12:55:19 +03:00
Code Issues Wiki Activity

Airmode 3D activation fix requested changes

Browse source 
Formatting changes and correction to update the PG version.
This commit is contained in:
Bruce Luckcuck 2018-02-01 06:50:11 -05:00
parent 003979a2eb
commit bed1c03f70
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/main/interface/msp.c
View file

@ -1013,7 +1013,7 @@ static bool mspProcessOutCommand(uint8_t cmdMSP, sbuf_t *dst)
sbufWriteU16(dst, rxConfig()->rx_max_usec); sbufWriteU16(dst, rxConfig()->rx_max_usec);
sbufWriteU8(dst, rxConfig()->rcInterpolation); sbufWriteU8(dst, rxConfig()->rcInterpolation);
sbufWriteU8(dst, rxConfig()->rcInterpolationInterval); sbufWriteU8(dst, rxConfig()->rcInterpolationInterval);
sbufWriteU16(dst, (rxConfig()->airModeActivateThreshold * 10) + 1000); sbufWriteU16(dst, rxConfig()->airModeActivateThreshold * 10 + 1000);
sbufWriteU8(dst, rxConfig()->rx_spi_protocol); sbufWriteU8(dst, rxConfig()->rx_spi_protocol);
sbufWriteU32(dst, rxConfig()->rx_spi_id); sbufWriteU32(dst, rxConfig()->rx_spi_id);
sbufWriteU8(dst, rxConfig()->rx_spi_rf_channel_count); 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) { if (sbufBytesRemaining(src) >= 4) {
rxConfigMutable()->rcInterpolation = sbufReadU8(src); rxConfigMutable()->rcInterpolation = sbufReadU8(src);
rxConfigMutable()->rcInterpolationInterval = sbufReadU8(src); rxConfigMutable()->rcInterpolationInterval = sbufReadU8(src);
rxConfigMutable()->airModeActivateThreshold = ((sbufReadU16(src) - 1000) / 10); rxConfigMutable()->airModeActivateThreshold = (sbufReadU16(src) - 1000) / 10;
} }
if (sbufBytesRemaining(src) >= 6) { if (sbufBytesRemaining(src) >= 6) {
rxConfigMutable()->rx_spi_protocol = sbufReadU8(src); rxConfigMutable()->rx_spi_protocol = sbufReadU8(src);

2
src/main/rx/rx.c
View file

@ -126,7 +126,7 @@ static uint8_t rcSampleIndex = 0;
#define BINDPLUG_PIN NONE #define BINDPLUG_PIN NONE
#endif #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) void pgResetFn_rxConfig(rxConfig_t *rxConfig)
{ {
RESET_CONFIG_2(rxConfig_t, rxConfig, RESET_CONFIG_2(rxConfig_t, rxConfig,