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

Fix CLI command "bind_rx" for CRSF (#13267)

Browse source
This commit is contained in:
Jan Post 2024-01-05 04:31:30 +01:00 • committed by GitHub
parent 7cb07d8e8e
commit 5fff78136e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -6468,7 +6468,7 @@ const clicmd_t cmdTable[] = {
"\t<->[name]", cliBeeper), "\t<->[name]", cliBeeper),
#endif // USE_BEEPER #endif // USE_BEEPER
#if defined(USE_RX_BIND) #if defined(USE_RX_BIND)
CLI_COMMAND_DEF("bind_rx", "initiate binding for RX SPI or SRXL2", NULL, cliRxBind), CLI_COMMAND_DEF("bind_rx", "initiate binding for RX SPI, SRXL2 or CRSF", NULL, cliRxBind),
#endif #endif
#if defined(USE_FLASH_BOOT_LOADER) #if defined(USE_FLASH_BOOT_LOADER)
CLI_COMMAND_DEF("bl", "reboot into bootloader", "[flash|rom]", cliBootloader), CLI_COMMAND_DEF("bl", "reboot into bootloader", "[flash|rom]", cliBootloader),

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

@ -30,7 +30,7 @@
static bool doRxBind(bool doBind) static bool doRxBind(bool doBind)
{ {
#if !defined(USE_SERIALRX_SRXL2) && !defined(USE_RX_FRSKY_SPI) && !defined(USE_RX_SFHSS_SPI) && !defined(USE_RX_FLYSKY) && !defined(USE_RX_SPEKTRUM) && !defined(USE_RX_EXPRESSLRS) && !defined(USE_RX_CRSF) #if !defined(USE_SERIALRX_SRXL2) && !defined(USE_RX_FRSKY_SPI) && !defined(USE_RX_SFHSS_SPI) && !defined(USE_RX_FLYSKY) && !defined(USE_RX_SPEKTRUM) && !defined(USE_RX_EXPRESSLRS) && !defined(USE_SERIALRX_CRSF)
UNUSED(doBind); UNUSED(doBind);
#endif #endif
@ -41,7 +41,7 @@ static bool doRxBind(bool doBind)
switch (rxRuntimeState.serialrxProvider) { switch (rxRuntimeState.serialrxProvider) {
default: default:
return false; return false;
#if defined(USE_RX_CRSF) #if defined(USE_SERIALRX_CRSF)
case SERIALRX_CRSF: case SERIALRX_CRSF:
if (doBind) { if (doBind) {
crsfRxBind(); crsfRxBind();

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

@ -613,7 +613,7 @@ extern uint8_t __config_end;
#endif #endif
#endif #endif
#if defined(USE_RX_SPI) || defined(USE_SERIALRX_SRXL2) #if defined(USE_RX_SPI) || defined(USE_SERIALRX_SRXL2) || defined(USE_SERIALRX_CRSF)
#define USE_RX_BIND #define USE_RX_BIND
#endif #endif

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

@ -155,7 +155,6 @@
#define USE_RX_SPI #define USE_RX_SPI
#define USE_RX_CC2500 #define USE_RX_CC2500
#define USE_RX_CRSF
#define USE_RX_EXPRESSLRS #define USE_RX_EXPRESSLRS
#define USE_RX_SX1280 #define USE_RX_SX1280
#define USE_RX_SX127X #define USE_RX_SX127X