- Default change to CRSF

- And Fix RX Serial number problem.
This commit is contained in:
larryho5 2017-02-23 16:49:40 +08:00 committed by borisbstyle
parent fa232ed7e8
commit 05f6161e2a
2 changed files with 11 additions and 4 deletions

View File

@ -1262,15 +1262,22 @@ static bool bstSlaveProcessWriteCommand(uint8_t bstWriteCommand)
featureClearAll();
featureSet(bstRead32()); // features bitmap
#ifdef SERIALRX_UART
int serialIndex = findSerialPortIndexByIdentifier(SERIALRX_UART);
if (featureConfigured(FEATURE_RX_SERIAL)) {
/*
for (i = 0; i < SERIAL_PORT_COUNT; i++) {
if(serialConfig()->portConfigs[i].functionMask == FUNCTION_RX_SERIAL
&& i != SERIALRX_UART)
serialConfig()->portConfigs[i].functionMask = FUNCTION_NONE;
}
serialConfig()->portConfigs[SERIALRX_UART].functionMask = FUNCTION_RX_SERIAL;
*/
if (serialIndex >= 0) {
serialConfig()->portConfigs[serialIndex].functionMask = FUNCTION_RX_SERIAL;
}
} else {
serialConfig()->portConfigs[SERIALRX_UART].functionMask = FUNCTION_NONE;
if (serialIndex >= 0) {
serialConfig()->portConfigs[serialIndex].functionMask = FUNCTION_NONE;
}
}
#endif
break;

View File

@ -123,8 +123,8 @@
#define DEFAULT_FEATURES (FEATURE_VBAT | FEATURE_FAILSAFE | FEATURE_AIRMODE | FEATURE_LED_STRIP)
#define DEFAULT_RX_FEATURE FEATURE_RX_SERIAL
#define SERIALRX_PROVIDER SERIALRX_SBUS
#define SERIALRX_UART SERIAL_PORT_USART3
#define SERIALRX_PROVIDER SERIALRX_CRSF
#define SERIALRX_UART SERIAL_PORT_USART2
#define USE_SERIAL_4WAY_BLHELI_INTERFACE