SWR now only available in debug screens (not a telemetry sensor)
This commit is contained in:
@@ -28,8 +28,7 @@
|
|||||||
|
|
||||||
bool menuStatsGraph(evt_t event)
|
bool menuStatsGraph(evt_t event)
|
||||||
{
|
{
|
||||||
switch(event)
|
switch(event) {
|
||||||
{
|
|
||||||
case EVT_KEY_LONG(KEY_ENTER):
|
case EVT_KEY_LONG(KEY_ENTER):
|
||||||
g_eeGeneral.globalTimer = 0;
|
g_eeGeneral.globalTimer = 0;
|
||||||
storageDirty(EE_GENERAL);
|
storageDirty(EE_GENERAL);
|
||||||
@@ -128,7 +127,7 @@ bool menuStatsDebug(evt_t event)
|
|||||||
int line = 3;
|
int line = 3;
|
||||||
|
|
||||||
#if defined(DISK_CACHE)
|
#if defined(DISK_CACHE)
|
||||||
lcdDrawText(MENUS_MARGIN_LEFT, MENU_CONTENT_TOP+line*FH, "SD Cache hits");
|
lcdDrawText(MENUS_MARGIN_LEFT, MENU_CONTENT_TOP+line*FH, "SD cache hits");
|
||||||
lcdDrawNumber(MENU_STATS_COLUMN1, MENU_CONTENT_TOP+line*FH, diskCache.getHitRate(), PREC1|LEFT, 0, NULL, "%");
|
lcdDrawNumber(MENU_STATS_COLUMN1, MENU_CONTENT_TOP+line*FH, diskCache.getHitRate(), PREC1|LEFT, 0, NULL, "%");
|
||||||
++line;
|
++line;
|
||||||
#endif
|
#endif
|
||||||
@@ -166,6 +165,10 @@ bool menuStatsAnalogs(evt_t event)
|
|||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// SWR
|
||||||
|
lcdDrawText(MENUS_MARGIN_LEFT, MENU_CONTENT_TOP+6*FH, "RAS");
|
||||||
|
lcdDrawNumber(MENUS_MARGIN_LEFT+100, MENU_CONTENT_TOP+6*FH, telemetryData.swr.value);
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
* Copyright (C) OpenTX
|
* Copyright (C) OpenTX
|
||||||
*
|
*
|
||||||
* Based on code named
|
* Based on code named
|
||||||
* th9x - http://code.google.com/p/th9x
|
* th9x - http://code.google.com/p/th9x
|
||||||
* er9x - http://code.google.com/p/er9x
|
* er9x - http://code.google.com/p/er9x
|
||||||
* gruvin9x - http://code.google.com/p/gruvin9x
|
* gruvin9x - http://code.google.com/p/gruvin9x
|
||||||
*
|
*
|
||||||
@@ -22,7 +22,7 @@
|
|||||||
|
|
||||||
void menuGeneralDiagAna(uint8_t event)
|
void menuGeneralDiagAna(uint8_t event)
|
||||||
{
|
{
|
||||||
SIMPLE_MENU(STR_MENUANA, menuTabGeneral, e_Ana, 1);
|
SIMPLE_MENU(STR_MENUANA, menuTabGeneral, e_Ana, 0);
|
||||||
|
|
||||||
STICK_SCROLL_DISABLE();
|
STICK_SCROLL_DISABLE();
|
||||||
|
|
||||||
@@ -37,11 +37,11 @@ void menuGeneralDiagAna(uint8_t event)
|
|||||||
lcdDrawNumber(x+13*FW-1, y, avgJitter[i].get(), RIGHT);
|
lcdDrawNumber(x+13*FW-1, y, avgJitter[i].get(), RIGHT);
|
||||||
lcdDrawNumber(x+17*FW-1, y, (int16_t)calibratedStick[CONVERT_MODE(i)]*25/256, RIGHT);
|
lcdDrawNumber(x+17*FW-1, y, (int16_t)calibratedStick[CONVERT_MODE(i)]*25/256, RIGHT);
|
||||||
#else
|
#else
|
||||||
lcdDrawNumber(x+11*FW-1, y, (int16_t)calibratedStick[CONVERT_MODE(i)]*25/256, RIGHT);
|
lcdDrawNumber(x+10*FW-1, y, (int16_t)calibratedStick[CONVERT_MODE(i)]*25/256, RIGHT);
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
lcd_putsLeft(MENU_HEADER_HEIGHT+1+6*FH, STR_BATT_CALIB);
|
// SWR
|
||||||
putsVolts(LEN_CALIB_FIELDS*FW+4*FW, MENU_HEADER_HEIGHT+1+6*FH, getBatteryVoltage(), (s_editMode > 0 ? BLINK : 0) | INVERS | PREC2);
|
lcd_putsLeft(MENU_HEADER_HEIGHT+6*FH, "RAS");
|
||||||
if (s_editMode > 0) CHECK_INCDEC_GENVAR(event, g_eeGeneral.txVoltageCalibration, -127, 127);
|
lcdDrawNumber(10*FW-1, MENU_HEADER_HEIGHT+6*FH, telemetryData.swr.value, RIGHT);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
* Copyright (C) OpenTX
|
* Copyright (C) OpenTX
|
||||||
*
|
*
|
||||||
* Based on code named
|
* Based on code named
|
||||||
* th9x - http://code.google.com/p/th9x
|
* th9x - http://code.google.com/p/th9x
|
||||||
* er9x - http://code.google.com/p/er9x
|
* er9x - http://code.google.com/p/er9x
|
||||||
* gruvin9x - http://code.google.com/p/gruvin9x
|
* gruvin9x - http://code.google.com/p/gruvin9x
|
||||||
*
|
*
|
||||||
@@ -45,7 +45,8 @@ const pm_uchar sticks[] PROGMEM = {
|
|||||||
enum menuGeneralSetupItems {
|
enum menuGeneralSetupItems {
|
||||||
CASE_RTCLOCK(ITEM_SETUP_DATE)
|
CASE_RTCLOCK(ITEM_SETUP_DATE)
|
||||||
CASE_RTCLOCK(ITEM_SETUP_TIME)
|
CASE_RTCLOCK(ITEM_SETUP_TIME)
|
||||||
ITEM_SETUP_BATT_RANGE,
|
ITEM_SETUP_BATTERY_CALIB,
|
||||||
|
ITEM_SETUP_BATTERY_RANGE,
|
||||||
ITEM_SETUP_SOUND_LABEL,
|
ITEM_SETUP_SOUND_LABEL,
|
||||||
ITEM_SETUP_BEEP_MODE,
|
ITEM_SETUP_BEEP_MODE,
|
||||||
ITEM_SETUP_GENERAL_VOLUME,
|
ITEM_SETUP_GENERAL_VOLUME,
|
||||||
@@ -114,7 +115,7 @@ void menuGeneralSetup(uint8_t event)
|
|||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
MENU(STR_MENURADIOSETUP, menuTabGeneral, e_Setup, ITEM_SETUP_MAX, { 2, 2, 1, LABEL(SOUND), 0, 0, 0, 0, 0, 0, 0, CASE_VARIO(LABEL(VARIO)) CASE_VARIO(0) CASE_VARIO(0) CASE_VARIO(0) CASE_VARIO(0) CASE_HAPTIC(LABEL(HAPTIC)) CASE_HAPTIC(0) CASE_HAPTIC(0) CASE_HAPTIC(0) 0, LABEL(ALARMS), 0, 0, 0, 0, IF_ROTARY_ENCODERS(0) LABEL(BACKLIGHT), 0, 0, 0, CASE_REVPLUS(0) CASE_PWM_BACKLIGHT(0) CASE_PWM_BACKLIGHT(0) 0, CASE_SPLASH_PARAM(0) CASE_GPS(LABEL(GPS)) CASE_GPS(0) CASE_GPS(0) CASE_GPS(0) CASE_PXX(0) 0, 0, IF_FAI_CHOICE(0) CASE_MAVLINK(0) 0, 0, LABEL(TX_MODE), 0, 1/*to force edit mode*/ });
|
MENU(STR_MENURADIOSETUP, menuTabGeneral, e_Setup, ITEM_SETUP_MAX, { 2, 2, 0, 1, LABEL(SOUND), 0, 0, 0, 0, 0, 0, 0, CASE_VARIO(LABEL(VARIO)) CASE_VARIO(0) CASE_VARIO(0) CASE_VARIO(0) CASE_VARIO(0) CASE_HAPTIC(LABEL(HAPTIC)) CASE_HAPTIC(0) CASE_HAPTIC(0) CASE_HAPTIC(0) 0, LABEL(ALARMS), 0, 0, 0, 0, IF_ROTARY_ENCODERS(0) LABEL(BACKLIGHT), 0, 0, 0, CASE_REVPLUS(0) CASE_PWM_BACKLIGHT(0) CASE_PWM_BACKLIGHT(0) 0, CASE_SPLASH_PARAM(0) CASE_GPS(LABEL(GPS)) CASE_GPS(0) CASE_GPS(0) CASE_GPS(0) CASE_PXX(0) 0, 0, IF_FAI_CHOICE(0) CASE_MAVLINK(0) 0, 0, LABEL(TX_MODE), 0, 1/*to force edit mode*/ });
|
||||||
|
|
||||||
if (event == EVT_ENTRY) {
|
if (event == EVT_ENTRY) {
|
||||||
reusableBuffer.generalSettings.stickMode = g_eeGeneral.stickMode;
|
reusableBuffer.generalSettings.stickMode = g_eeGeneral.stickMode;
|
||||||
@@ -186,9 +187,17 @@ void menuGeneralSetup(uint8_t event)
|
|||||||
g_rtcTime = gmktime(&t); // update local timestamp and get wday calculated
|
g_rtcTime = gmktime(&t); // update local timestamp and get wday calculated
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case ITEM_SETUP_BATT_RANGE:
|
case ITEM_SETUP_BATTERY_CALIB:
|
||||||
|
lcd_putsLeft(y, STR_BATT_CALIB);
|
||||||
|
putsVolts(RADIO_SETUP_2ND_COLUMN, y, getBatteryVoltage(), attr | PREC2 | LEFT);
|
||||||
|
if (attr && s_editMode > 0) {
|
||||||
|
CHECK_INCDEC_GENVAR(event, g_eeGeneral.txVoltageCalibration, -127, 127);
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
|
||||||
|
case ITEM_SETUP_BATTERY_RANGE:
|
||||||
lcd_putsLeft(y, STR_BATTERY_RANGE);
|
lcd_putsLeft(y, STR_BATTERY_RANGE);
|
||||||
putsVolts(RADIO_SETUP_2ND_COLUMN, y, 90+g_eeGeneral.vBatMin, (menuHorizontalPosition==0 ? attr : 0)|LEFT|NO_UNIT);
|
putsVolts(RADIO_SETUP_2ND_COLUMN, y, 90+g_eeGeneral.vBatMin, (menuHorizontalPosition==0 ? attr : 0)|LEFT|NO_UNIT);
|
||||||
lcdDrawChar(lcdLastPos, y, '-');
|
lcdDrawChar(lcdLastPos, y, '-');
|
||||||
putsVolts(lcdLastPos+FW, y, 120+g_eeGeneral.vBatMax, (menuHorizontalPosition>0 ? attr : 0)|LEFT|NO_UNIT);
|
putsVolts(lcdLastPos+FW, y, 120+g_eeGeneral.vBatMax, (menuHorizontalPosition>0 ? attr : 0)|LEFT|NO_UNIT);
|
||||||
if (attr && menuHorizontalPosition < 0) lcdDrawFilledRect(RADIO_SETUP_2ND_COLUMN, y, LCD_W-RADIO_SETUP_2ND_COLUMN-MENUS_SCROLLBAR_WIDTH, 8);
|
if (attr && menuHorizontalPosition < 0) lcdDrawFilledRect(RADIO_SETUP_2ND_COLUMN, y, LCD_W-RADIO_SETUP_2ND_COLUMN-MENUS_SCROLLBAR_WIDTH, 8);
|
||||||
|
|||||||
@@ -276,7 +276,8 @@ PACK(struct FrskyTelemetryData {
|
|||||||
#else
|
#else
|
||||||
#define IS_VALID_XJT_VERSION() (1)
|
#define IS_VALID_XJT_VERSION() (1)
|
||||||
#endif
|
#endif
|
||||||
#define IS_HIDDEN_TELEMETRY_VALUE(id) ((id == SP2UART_A_ID) || (id == SP2UART_B_ID) || (id == XJT_VERSION_ID) || ((id == SWR_ID) && !IS_VALID_XJT_VERSION()))
|
|
||||||
|
#define IS_HIDDEN_TELEMETRY_VALUE(id) ((id == SP2UART_A_ID) || (id == SP2UART_B_ID) || (id == XJT_VERSION_ID) || (id == SWR_ID))
|
||||||
|
|
||||||
enum AlarmLevel {
|
enum AlarmLevel {
|
||||||
alarm_off = 0,
|
alarm_off = 0,
|
||||||
|
|||||||
@@ -43,7 +43,6 @@ struct FrSkySportSensor {
|
|||||||
|
|
||||||
const FrSkySportSensor sportSensors[] = {
|
const FrSkySportSensor sportSensors[] = {
|
||||||
{ RSSI_ID, RSSI_ID, 0, ZSTR_RSSI, UNIT_DB, 0 },
|
{ RSSI_ID, RSSI_ID, 0, ZSTR_RSSI, UNIT_DB, 0 },
|
||||||
{ SWR_ID, SWR_ID, 0, ZSTR_SWR, UNIT_RAW, 0 },
|
|
||||||
{ ADC1_ID, ADC1_ID, 0, ZSTR_A1, UNIT_VOLTS, 1 },
|
{ ADC1_ID, ADC1_ID, 0, ZSTR_A1, UNIT_VOLTS, 1 },
|
||||||
{ ADC2_ID, ADC2_ID, 0, ZSTR_A2, UNIT_VOLTS, 1 },
|
{ ADC2_ID, ADC2_ID, 0, ZSTR_A2, UNIT_VOLTS, 1 },
|
||||||
{ A3_FIRST_ID, A3_LAST_ID, 0, ZSTR_A3, UNIT_VOLTS, 2 },
|
{ A3_FIRST_ID, A3_LAST_ID, 0, ZSTR_A3, UNIT_VOLTS, 2 },
|
||||||
|
|||||||
Reference in New Issue
Block a user