diff --git a/src/config.c b/src/config.c index 7d73d4f673..8db296a0bc 100755 --- a/src/config.c +++ b/src/config.c @@ -321,7 +321,7 @@ static void resetConf(void) resetTelemetryConfig(&masterConfig.telemetryConfig); - masterConfig.rxConfig.serialrx_type = 0; + masterConfig.rxConfig.serialrx_provider = 0; masterConfig.rxConfig.midrc = 1500; masterConfig.rxConfig.mincheck = 1100; masterConfig.rxConfig.maxcheck = 1900; diff --git a/src/rx_common.c b/src/rx_common.c index b75b47dff0..14e37c2792 100644 --- a/src/rx_common.c +++ b/src/rx_common.c @@ -61,7 +61,7 @@ void rxInit(rxConfig_t *rxConfig, failsafe_t *initialFailsafe) void serialRxInit(rxConfig_t *rxConfig) { - switch (rxConfig->serialrx_type) { + switch (rxConfig->serialrx_provider) { case SERIALRX_SPEKTRUM1024: case SERIALRX_SPEKTRUM2048: spektrumInit(rxConfig, &rxRuntimeConfig, &rcReadRawFunc); @@ -80,7 +80,7 @@ void serialRxInit(rxConfig_t *rxConfig) bool isSerialRxFrameComplete(rxConfig_t *rxConfig) { - switch (rxConfig->serialrx_type) { + switch (rxConfig->serialrx_provider) { case SERIALRX_SPEKTRUM1024: case SERIALRX_SPEKTRUM2048: return spektrumFrameComplete(); diff --git a/src/rx_common.h b/src/rx_common.h index 28c2a4f9c0..c3b1b5ec61 100644 --- a/src/rx_common.h +++ b/src/rx_common.h @@ -26,7 +26,7 @@ extern int16_t rcData[MAX_SUPPORTED_RC_CHANNEL_COUNT]; // interval [1000;2 typedef struct rxConfig_s { uint8_t rcmap[8]; // mapping of radio channels to internal RPYTA+ order - uint8_t serialrx_type; // type of UART-based receiver (0 = spek 10, 1 = spek 11, 2 = sbus). Must be enabled by FEATURE_SERIALRX first. + uint8_t serialrx_provider; // type of UART-based receiver (0 = spek 10, 1 = spek 11, 2 = sbus). Must be enabled by FEATURE_SERIALRX first. uint16_t midrc; // Some radios have not a neutral point centered on 1500. can be changed here uint16_t mincheck; // minimum rc end uint16_t maxcheck; // maximum rc end diff --git a/src/rx_spektrum.c b/src/rx_spektrum.c index e4d06f6d7d..18d4ce7fee 100644 --- a/src/rx_spektrum.c +++ b/src/rx_spektrum.c @@ -35,7 +35,7 @@ static serialPort_t *spektrumPort; void spektrumInit(rxConfig_t *rxConfig, rxRuntimeConfig_t *rxRuntimeConfig, rcReadRawDataPtr *callback) { - switch (rxConfig->serialrx_type) { + switch (rxConfig->serialrx_provider) { case SERIALRX_SPEKTRUM2048: // 11 bit frames spek_chan_shift = 3; diff --git a/src/serial_cli.c b/src/serial_cli.c index 18d659c9a8..9db8cf4799 100644 --- a/src/serial_cli.c +++ b/src/serial_cli.c @@ -176,7 +176,7 @@ const clivalue_t valueTable[] = { { "gps_provider", VAR_UINT8, &masterConfig.gps_provider, 0, GPS_PROVIDER_MAX }, { "gps_initial_baudrate_index", VAR_INT8, &masterConfig.gps_initial_baudrate_index, 0, GPS_BAUDRATE_MAX }, - { "serialrx_type", VAR_UINT8, &masterConfig.rxConfig.serialrx_type, 0, SERIALRX_PROVIDER_MAX }, + { "serialrx_provider", VAR_UINT8, &masterConfig.rxConfig.serialrx_provider, 0, SERIALRX_PROVIDER_MAX }, { "telemetry_provider", VAR_UINT8, &masterConfig.telemetryConfig.telemetry_provider, 0, TELEMETRY_PROVIDER_MAX }, { "telemetry_switch", VAR_UINT8, &masterConfig.telemetryConfig.telemetry_switch, 0, 1 },