PXX2 always defined. PROTOCOL enums renamed. IRPROTOS removed

This commit is contained in:
Bertrand Songis
2018-11-28 18:02:14 +01:00
parent b30c9b63cd
commit b72ccb4836
34 changed files with 174 additions and 343 deletions
+1 -1
View File
@@ -543,7 +543,7 @@ void menuModelTelemetryFrsky(event_t event)
case ITEM_TELEMETRY_RSSI_LABEL:
#if defined(MULTIMODULE)
if (telemetryProtocol == PROTOCOL_MULTIMODULE &&
if (telemetryProtocol == PROTOCOL_TELEMETRY_MULTIMODULE &&
g_model.moduleData[EXTERNAL_MODULE].getMultiProtocol(false) == MM_RF_PROTO_FS_AFHDS2A)
lcdDrawTextAlignedLeft(y, "RSNR");
else
+4 -4
View File
@@ -537,23 +537,23 @@ bool isRfProtocolAvailable(int protocol)
bool isTelemetryProtocolAvailable(int protocol)
{
#if defined(PCBTARANIS)
if (protocol == PROTOCOL_FRSKY_D_SECONDARY && g_eeGeneral.serial2Mode != UART_MODE_TELEMETRY) {
if (protocol == PROTOCOL_TELEMETRY_FRSKY_D_SECONDARY && g_eeGeneral.serial2Mode != UART_MODE_TELEMETRY) {
return false;
}
#endif
if (protocol== PROTOCOL_PULSES_CROSSFIRE) {
if (protocol== PROTOCOL_TELEMETRY_CROSSFIRE) {
return false;
}
#if !defined(MULTIMODULE)
if (protocol == PROTOCOL_SPEKTRUM || protocol == PROTOCOL_FLYSKY_IBUS || protocol == PROTOCOL_MULTIMODULE) {
if (protocol == PROTOCOL_TELEMETRY_SPEKTRUM || protocol == PROTOCOL_TELEMETRY_FLYSKY_IBUS || protocol == PROTOCOL_TELEMETRY_MULTIMODULE) {
return false;
}
#endif
#if defined(PCBHORUS)
if (protocol == PROTOCOL_FRSKY_D_SECONDARY) {
if (protocol == PROTOCOL_TELEMETRY_FRSKY_D_SECONDARY) {
return false;
}
#endif