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

Naming adjustment for USE_SERIAL_RX to USE_SERIALRX (#11992)

Browse source
This commit is contained in:
J Blackman 2022-11-15 10:42:54 +11:00 • committed by GitHub
parent 79a6e95635
commit 6efdc71e53
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/main/cli/settings.c
View file

@ -230,7 +230,7 @@ static const char * const lookupTableBlackboxSampleRate[] = {
}; };
#endif #endif
#ifdef USE_SERIAL_RX #ifdef USE_SERIALRX
static const char * const lookupTableSerialRX[] = { static const char * const lookupTableSerialRX[] = {
"SPEK1024", "SPEK1024",
"SPEK2048", "SPEK2048",
@ -549,7 +549,7 @@ const lookupTableEntry_t lookupTables[] = {
#ifdef USE_SERVOS #ifdef USE_SERVOS
LOOKUP_TABLE_ENTRY(lookupTableGimbalMode), LOOKUP_TABLE_ENTRY(lookupTableGimbalMode),
#endif #endif
#ifdef USE_SERIAL_RX #ifdef USE_SERIALRX
LOOKUP_TABLE_ENTRY(lookupTableSerialRX), LOOKUP_TABLE_ENTRY(lookupTableSerialRX),
#endif #endif
#ifdef USE_RX_SPI #ifdef USE_RX_SPI
@ -759,7 +759,7 @@ const clivalue_t valueTable[] = {
{ "fpv_mix_degrees", VAR_UINT8 | MASTER_VALUE, .config.minmaxUnsigned = { 0, 90 }, PG_RX_CONFIG, offsetof(rxConfig_t, fpvCamAngleDegrees) }, { "fpv_mix_degrees", VAR_UINT8 | MASTER_VALUE, .config.minmaxUnsigned = { 0, 90 }, PG_RX_CONFIG, offsetof(rxConfig_t, fpvCamAngleDegrees) },
{ "max_aux_channels", VAR_UINT8 | MASTER_VALUE, .config.minmaxUnsigned = { 0, MAX_AUX_CHANNEL_COUNT }, PG_RX_CONFIG, offsetof(rxConfig_t, max_aux_channel) }, { "max_aux_channels", VAR_UINT8 | MASTER_VALUE, .config.minmaxUnsigned = { 0, MAX_AUX_CHANNEL_COUNT }, PG_RX_CONFIG, offsetof(rxConfig_t, max_aux_channel) },
#ifdef USE_SERIAL_RX #ifdef USE_SERIALRX
{ PARAM_NAME_SERIAL_RX_PROVIDER, VAR_UINT8 | MASTER_VALUE | MODE_LOOKUP, .config.lookup = { TABLE_SERIAL_RX }, PG_RX_CONFIG, offsetof(rxConfig_t, serialrx_provider) }, { PARAM_NAME_SERIAL_RX_PROVIDER, VAR_UINT8 | MASTER_VALUE | MODE_LOOKUP, .config.lookup = { TABLE_SERIAL_RX }, PG_RX_CONFIG, offsetof(rxConfig_t, serialrx_provider) },
{ "serialrx_inverted", VAR_UINT8 | MASTER_VALUE | MODE_LOOKUP, .config.lookup = { TABLE_OFF_ON }, PG_RX_CONFIG, offsetof(rxConfig_t, serialrx_inverted) }, { "serialrx_inverted", VAR_UINT8 | MASTER_VALUE | MODE_LOOKUP, .config.lookup = { TABLE_OFF_ON }, PG_RX_CONFIG, offsetof(rxConfig_t, serialrx_inverted) },
#endif #endif

2
src/main/cli/settings.h
View file

@ -48,7 +48,7 @@ typedef enum {
#ifdef USE_SERVOS #ifdef USE_SERVOS
TABLE_GIMBAL_MODE, TABLE_GIMBAL_MODE,
#endif #endif
#ifdef USE_SERIAL_RX #ifdef USE_SERIALRX
TABLE_SERIAL_RX, TABLE_SERIAL_RX,
#endif #endif
#ifdef USE_RX_SPI #ifdef USE_RX_SPI

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

@ -419,7 +419,7 @@ static void validateAndFixConfig(void)
featureDisableImmediate(FEATURE_RX_PPM); featureDisableImmediate(FEATURE_RX_PPM);
#endif #endif
#ifndef USE_SERIAL_RX #ifndef USE_SERIALRX
featureDisableImmediate(FEATURE_RX_SERIAL); featureDisableImmediate(FEATURE_RX_SERIAL);
#endif #endif

4
src/main/io/spektrum_rssi.c
View file

@ -19,7 +19,7 @@
*/ */
#include "platform.h" #include "platform.h"
#ifdef USE_SERIAL_RX #ifdef USE_SERIALRX
#if defined(USE_SPEKTRUM_REAL_RSSI) || defined(USE_SPEKTRUM_FAKE_RSSI) #if defined(USE_SPEKTRUM_REAL_RSSI) || defined(USE_SPEKTRUM_FAKE_RSSI)
#include "config/feature.h" #include "config/feature.h"
@ -213,4 +213,4 @@ void spektrumHandleRSSI(volatile uint8_t spekFrame[])
#endif // USE_SPEKTRUM_FAKE_RSSI #endif // USE_SPEKTRUM_FAKE_RSSI
} }
#endif // USE_SPEKTRUM_REAL_RSSI || USE_SPEKTRUM_FAKE_RSSI #endif // USE_SPEKTRUM_REAL_RSSI || USE_SPEKTRUM_FAKE_RSSI
#endif // USE_SERIAL_RX #endif // USE_SERIALRX

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

@ -20,7 +20,7 @@
#include "platform.h" #include "platform.h"
#if defined(USE_PWM) || defined(USE_PPM) || defined(USE_SERIAL_RX) || defined(USE_RX_MSP) || defined(USE_RX_SPI) #if defined(USE_PWM) || defined(USE_PPM) || defined(USE_SERIALRX) || defined(USE_RX_MSP) || defined(USE_RX_SPI)
#include "pg/pg.h" #include "pg/pg.h"
#include "pg/pg_ids.h" #include "pg/pg_ids.h"

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

@ -198,7 +198,7 @@ STATIC_UNIT_TESTED bool isPulseValid(uint16_t pulseDuration)
pulseDuration <= rxConfig()->rx_max_usec; pulseDuration <= rxConfig()->rx_max_usec;
} }
#ifdef USE_SERIAL_RX #ifdef USE_SERIALRX
static bool serialRxInit(const rxConfig_t *rxConfig, rxRuntimeState_t *rxRuntimeState) static bool serialRxInit(const rxConfig_t *rxConfig, rxRuntimeState_t *rxRuntimeState)
{ {
bool enabled = false; bool enabled = false;
@ -324,7 +324,7 @@ void rxInit(void)
default: default:
break; break;
#ifdef USE_SERIAL_RX #ifdef USE_SERIALRX
case RX_PROVIDER_SERIAL: case RX_PROVIDER_SERIAL:
{ {
const bool enabled = serialRxInit(rxConfig(), &rxRuntimeState); const bool enabled = serialRxInit(rxConfig(), &rxRuntimeState);

2
src/main/target/SITL/target.h
View file

@ -98,7 +98,7 @@
#undef USE_OSD #undef USE_OSD
#undef USE_PPM #undef USE_PPM
#undef USE_PWM #undef USE_PWM
#undef USE_SERIAL_RX #undef USE_SERIALRX
#undef USE_SERIALRX_CRSF #undef USE_SERIALRX_CRSF
#undef USE_SERIALRX_GHST #undef USE_SERIALRX_GHST
#undef USE_SERIALRX_IBUS #undef USE_SERIALRX_IBUS

2
src/main/target/common_post.h
View file

@ -122,7 +122,7 @@
#define BARO_EOC_PIN NONE #define BARO_EOC_PIN NONE
#endif #endif
#if !defined(USE_SERIAL_RX) #if !defined(USE_SERIALRX)
#undef USE_SERIALRX_CRSF #undef USE_SERIALRX_CRSF
#undef USE_SERIALRX_IBUS #undef USE_SERIALRX_IBUS
#undef USE_SERIALRX_JETIEXBUS #undef USE_SERIALRX_JETIEXBUS

2
src/main/target/common_pre.h
View file

@ -238,7 +238,7 @@ extern uint8_t _dmaram_end__;
#if (!defined(CLOUD_BUILD)) #if (!defined(CLOUD_BUILD))
#define USE_PPM #define USE_PPM
#define USE_SERIAL_RX #define USE_SERIALRX
#define USE_SERIALRX_CRSF // Team Black Sheep Crossfire protocol #define USE_SERIALRX_CRSF // Team Black Sheep Crossfire protocol
#define USE_SERIALRX_GHST // ImmersionRC Ghost Protocol #define USE_SERIALRX_GHST // ImmersionRC Ghost Protocol
#define USE_SERIALRX_IBUS // FlySky and Turnigy receivers #define USE_SERIALRX_IBUS // FlySky and Turnigy receivers

2
src/test/unit/target.h
View file

@ -33,7 +33,7 @@
#define USE_BARO #define USE_BARO
#define USE_GPS #define USE_GPS
#define USE_DASHBOARD #define USE_DASHBOARD
#define USE_SERIAL_RX #define USE_SERIALRX
#define USE_RX_MSP #define USE_RX_MSP
#define USE_SERIALRX_CRSF // Team Black Sheep Crossfire protocol #define USE_SERIALRX_CRSF // Team Black Sheep Crossfire protocol
#define USE_SERIALRX_SPEKTRUM // DSM2 and DSMX protocol #define USE_SERIALRX_SPEKTRUM // DSM2 and DSMX protocol