RAS refactoring
This commit is contained in:
@@ -67,26 +67,4 @@ void menuRadioDiagAnalogs(event_t event)
|
||||
lcdDrawChar(lcdNextPos, y, '@');
|
||||
lcdDrawNumber(x+10*FW-1, y, gyro.scaledY(), RIGHT);
|
||||
#endif
|
||||
|
||||
// RAS
|
||||
#if defined(PCBTARANIS)
|
||||
if (isModuleXJT2(INTERNAL_MODULE) && IS_INTERNAL_MODULE_ON()) {
|
||||
y += FH;
|
||||
lcdDrawText(1, y, "RAS:");
|
||||
lcdDrawNumber(1 + 4*FW, y, telemetryData.swr.value, LEFT);
|
||||
}
|
||||
else if (isModuleXJT(EXTERNAL_MODULE) && !IS_INTERNAL_MODULE_ON()) {
|
||||
y += FH;
|
||||
lcdDrawText(1, y, "RAS:");
|
||||
lcdDrawNumber(1 + 4*FW, y, telemetryData.swr.value, LEFT);
|
||||
}
|
||||
#else
|
||||
if (isModuleXJT(EXTERNAL_MODULE)) {
|
||||
y += FH;
|
||||
uint8_t x = ((NUM_STICKS+NUM_POTS+NUM_SLIDERS) & 1) ? (LCD_W/2)+FW : 0;
|
||||
|
||||
lcdDrawText(x, y, "RAS:");
|
||||
lcdDrawNumber(x + 4*FW, y, telemetryData.swr.value, LEFT);
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
@@ -138,6 +138,7 @@ enum MenuRadioHardwareItems {
|
||||
ITEM_RADIO_HARDWARE_BLUETOOTH_NAME,
|
||||
#endif
|
||||
ITEM_RADIO_HARDWARE_JITTER_FILTER,
|
||||
ITEM_RADIO_HARDWARE_RAS,
|
||||
ITEM_RADIO_HARDWARE_DEBUG,
|
||||
ITEM_RADIO_HARDWARE_MAX
|
||||
};
|
||||
@@ -207,6 +208,7 @@ void menuRadioHardware(event_t event)
|
||||
#endif
|
||||
BLUETOOTH_ROWS
|
||||
0 /* jitter filter */,
|
||||
READONLY_ROW,
|
||||
1 /* debugs */,
|
||||
});
|
||||
|
||||
@@ -397,6 +399,19 @@ void menuRadioHardware(event_t event)
|
||||
g_eeGeneral.jitterFilter = 1 - editCheckBox(1 - g_eeGeneral.jitterFilter, HW_SETTINGS_COLUMN2, y, STR_JITTER_FILTER, attr, event);
|
||||
break;
|
||||
|
||||
case ITEM_RADIO_HARDWARE_RAS:
|
||||
lcdDrawTextAlignedLeft(y, "RAS");
|
||||
if (telemetryData.swrInternal.value)
|
||||
lcdDrawNumber(HW_SETTINGS_COLUMN2, y, telemetryData.swrInternal.value);
|
||||
else
|
||||
lcdDrawText(HW_SETTINGS_COLUMN2, y, "---");
|
||||
lcdDrawText(lcdNextPos, y, "/");
|
||||
if (telemetryData.swrInternal.value)
|
||||
lcdDrawNumber(lcdNextPos, y, telemetryData.swrInternal.value);
|
||||
else
|
||||
lcdDrawText(lcdNextPos, y, "---");
|
||||
break;
|
||||
|
||||
case ITEM_RADIO_HARDWARE_DEBUG:
|
||||
lcdDrawTextAlignedLeft(y, STR_DEBUG);
|
||||
lcdDrawText(HW_SETTINGS_COLUMN2, y, STR_ANALOGS_BTN, menuHorizontalPosition == 0 ? attr : 0);
|
||||
|
||||
Reference in New Issue
Block a user