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

Rename serialrx_type to serialrx_provider to match gps_provider and

Browse source 
telemetry_provider.
This commit is contained in:
Dominic Clifton 2014-05-10 00:32:20 +01:00
parent 1777d8feda
commit f1d38c0fa2
5 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/config.c
View file

@ -321,7 +321,7 @@ static void resetConf(void)
resetTelemetryConfig(&masterConfig.telemetryConfig); resetTelemetryConfig(&masterConfig.telemetryConfig);
masterConfig.rxConfig.serialrx_type = 0; masterConfig.rxConfig.serialrx_provider = 0;
masterConfig.rxConfig.midrc = 1500; masterConfig.rxConfig.midrc = 1500;
masterConfig.rxConfig.mincheck = 1100; masterConfig.rxConfig.mincheck = 1100;
masterConfig.rxConfig.maxcheck = 1900; masterConfig.rxConfig.maxcheck = 1900;

4
src/rx_common.c
View file

@ -61,7 +61,7 @@ void rxInit(rxConfig_t *rxConfig, failsafe_t *initialFailsafe)
void serialRxInit(rxConfig_t *rxConfig) void serialRxInit(rxConfig_t *rxConfig)
{ {
switch (rxConfig->serialrx_type) { switch (rxConfig->serialrx_provider) {
case SERIALRX_SPEKTRUM1024: case SERIALRX_SPEKTRUM1024:
case SERIALRX_SPEKTRUM2048: case SERIALRX_SPEKTRUM2048:
spektrumInit(rxConfig, &rxRuntimeConfig, &rcReadRawFunc); spektrumInit(rxConfig, &rxRuntimeConfig, &rcReadRawFunc);
@ -80,7 +80,7 @@ void serialRxInit(rxConfig_t *rxConfig)
bool isSerialRxFrameComplete(rxConfig_t *rxConfig) bool isSerialRxFrameComplete(rxConfig_t *rxConfig)
{ {
switch (rxConfig->serialrx_type) { switch (rxConfig->serialrx_provider) {
case SERIALRX_SPEKTRUM1024: case SERIALRX_SPEKTRUM1024:
case SERIALRX_SPEKTRUM2048: case SERIALRX_SPEKTRUM2048:
return spektrumFrameComplete(); return spektrumFrameComplete();

2
src/rx_common.h
View file

@ -26,7 +26,7 @@ extern int16_t rcData[MAX_SUPPORTED_RC_CHANNEL_COUNT]; // interval [1000;2
typedef struct rxConfig_s { typedef struct rxConfig_s {
uint8_t rcmap[8]; // mapping of radio channels to internal RPYTA+ order 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 midrc; // Some radios have not a neutral point centered on 1500. can be changed here
uint16_t mincheck; // minimum rc end uint16_t mincheck; // minimum rc end
uint16_t maxcheck; // maximum rc end uint16_t maxcheck; // maximum rc end

2
src/rx_spektrum.c
View file

@ -35,7 +35,7 @@ static serialPort_t *spektrumPort;
void spektrumInit(rxConfig_t *rxConfig, rxRuntimeConfig_t *rxRuntimeConfig, rcReadRawDataPtr *callback) void spektrumInit(rxConfig_t *rxConfig, rxRuntimeConfig_t *rxRuntimeConfig, rcReadRawDataPtr *callback)
{ {
switch (rxConfig->serialrx_type) { switch (rxConfig->serialrx_provider) {
case SERIALRX_SPEKTRUM2048: case SERIALRX_SPEKTRUM2048:
// 11 bit frames // 11 bit frames
spek_chan_shift = 3; spek_chan_shift = 3;

2
src/serial_cli.c
View file

@ -176,7 +176,7 @@ const clivalue_t valueTable[] = {
{ "gps_provider", VAR_UINT8, &masterConfig.gps_provider, 0, GPS_PROVIDER_MAX }, { "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 }, { "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_provider", VAR_UINT8, &masterConfig.telemetryConfig.telemetry_provider, 0, TELEMETRY_PROVIDER_MAX },
{ "telemetry_switch", VAR_UINT8, &masterConfig.telemetryConfig.telemetry_switch, 0, 1 }, { "telemetry_switch", VAR_UINT8, &masterConfig.telemetryConfig.telemetry_switch, 0, 1 },