mirror of
https://github.com/opentx/opentx.git
synced 2025-07-18 13:55:12 +03:00
Revert "[ARM boards] Imperial parameter removed"
This reverts commit 79e727a149
.
This commit is contained in:
parent
9886dede73
commit
8dadb5346b
6 changed files with 28 additions and 6 deletions
|
@ -115,6 +115,7 @@ enum menuGeneralSetupItems {
|
||||||
CASE_GPS(ITEM_SETUP_GPSFORMAT)
|
CASE_GPS(ITEM_SETUP_GPSFORMAT)
|
||||||
CASE_PXX(ITEM_SETUP_COUNTRYCODE)
|
CASE_PXX(ITEM_SETUP_COUNTRYCODE)
|
||||||
CASE_CPUARM(ITEM_SETUP_LANGUAGE)
|
CASE_CPUARM(ITEM_SETUP_LANGUAGE)
|
||||||
|
CASE_CPUARM(ITEM_SETUP_IMPERIAL)
|
||||||
IF_FAI_CHOICE(ITEM_SETUP_FAI)
|
IF_FAI_CHOICE(ITEM_SETUP_FAI)
|
||||||
CASE_MAVLINK(ITEM_MAVLINK_BAUD)
|
CASE_MAVLINK(ITEM_MAVLINK_BAUD)
|
||||||
CASE_CPUARM(ITEM_SETUP_SWITCHES_DELAY)
|
CASE_CPUARM(ITEM_SETUP_SWITCHES_DELAY)
|
||||||
|
@ -152,7 +153,7 @@ void menuGeneralSetup(uint8_t event)
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
MENU(STR_MENURADIOSETUP, menuTabGeneral, e_Setup, ITEM_SETUP_MAX+1, {0, CASE_RTCLOCK(2) CASE_RTCLOCK(2) CASE_BATTGRAPH(1) LABEL(SOUND), CASE_AUDIO(0) CASE_BUZZER(0) CASE_VOICE(0) CASE_CPUARM(0) CASE_CPUARM(0) CASE_CPUARM(0) 0, CASE_AUDIO(0) CASE_VARIO_CPUARM(LABEL(VARIO)) CASE_VARIO_CPUARM(0) CASE_VARIO_CPUARM(0) CASE_VARIO_CPUARM(0) CASE_VARIO_CPUARM(0) CASE_HAPTIC(LABEL(HAPTIC)) CASE_HAPTIC(0) CASE_HAPTIC(0) CASE_HAPTIC(0) 0, LABEL(ALARMS), 0, CASE_PCBSKY9X(0) CASE_PCBSKY9X(0) 0, 0, 0, IF_ROTARY_ENCODERS(0) LABEL(BACKLIGHT), 0, 0, CASE_CPUARM(0) CASE_PWM_BACKLIGHT(0) CASE_PWM_BACKLIGHT(0) 0, CASE_SPLASH_PARAM(0) CASE_GPS(0) CASE_GPS(0) CASE_PXX(0) CASE_CPUARM(0) IF_FAI_CHOICE(0) CASE_MAVLINK(0) CASE_CPUARM(0) 0, COL_TX_MODE, 1/*to force edit mode*/});
|
MENU(STR_MENURADIOSETUP, menuTabGeneral, e_Setup, ITEM_SETUP_MAX+1, {0, CASE_RTCLOCK(2) CASE_RTCLOCK(2) CASE_BATTGRAPH(1) LABEL(SOUND), CASE_AUDIO(0) CASE_BUZZER(0) CASE_VOICE(0) CASE_CPUARM(0) CASE_CPUARM(0) CASE_CPUARM(0) 0, CASE_AUDIO(0) CASE_VARIO_CPUARM(LABEL(VARIO)) CASE_VARIO_CPUARM(0) CASE_VARIO_CPUARM(0) CASE_VARIO_CPUARM(0) CASE_VARIO_CPUARM(0) CASE_HAPTIC(LABEL(HAPTIC)) CASE_HAPTIC(0) CASE_HAPTIC(0) CASE_HAPTIC(0) 0, LABEL(ALARMS), 0, CASE_PCBSKY9X(0) CASE_PCBSKY9X(0) 0, 0, 0, IF_ROTARY_ENCODERS(0) LABEL(BACKLIGHT), 0, 0, CASE_CPUARM(0) CASE_PWM_BACKLIGHT(0) CASE_PWM_BACKLIGHT(0) 0, CASE_SPLASH_PARAM(0) CASE_GPS(0) CASE_GPS(0) CASE_PXX(0) CASE_CPUARM(0) CASE_CPUARM(0) IF_FAI_CHOICE(0) CASE_MAVLINK(0) CASE_CPUARM(0) 0, COL_TX_MODE, 1/*to force edit mode*/});
|
||||||
|
|
||||||
uint8_t sub = m_posVert - 1;
|
uint8_t sub = m_posVert - 1;
|
||||||
|
|
||||||
|
@ -509,6 +510,10 @@ void menuGeneralSetup(uint8_t event)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
case ITEM_SETUP_IMPERIAL:
|
||||||
|
g_eeGeneral.imperial = selectMenuItem(RADIO_SETUP_2ND_COLUMN, y, STR_UNITSSYSTEM, STR_VUNITSSYSTEM, g_eeGeneral.imperial, 0, 1, attr, event);
|
||||||
|
break;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(FAI_CHOICE)
|
#if defined(FAI_CHOICE)
|
||||||
|
|
|
@ -96,6 +96,7 @@ enum menuGeneralSetupItems {
|
||||||
CASE_GPS(ITEM_SETUP_GPSFORMAT)
|
CASE_GPS(ITEM_SETUP_GPSFORMAT)
|
||||||
CASE_PXX(ITEM_SETUP_COUNTRYCODE)
|
CASE_PXX(ITEM_SETUP_COUNTRYCODE)
|
||||||
ITEM_SETUP_LANGUAGE,
|
ITEM_SETUP_LANGUAGE,
|
||||||
|
ITEM_SETUP_IMPERIAL,
|
||||||
IF_FAI_CHOICE(ITEM_SETUP_FAI)
|
IF_FAI_CHOICE(ITEM_SETUP_FAI)
|
||||||
CASE_MAVLINK(ITEM_MAVLINK_BAUD)
|
CASE_MAVLINK(ITEM_MAVLINK_BAUD)
|
||||||
ITEM_SETUP_SWITCHES_DELAY,
|
ITEM_SETUP_SWITCHES_DELAY,
|
||||||
|
@ -127,7 +128,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_CPUARM(LABEL(VARIO)) CASE_VARIO_CPUARM(0) CASE_VARIO_CPUARM(0) CASE_VARIO_CPUARM(0) CASE_VARIO_CPUARM(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, 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, 1, LABEL(SOUND), 0, 0, 0, 0, 0, 0, 0, CASE_VARIO_CPUARM(LABEL(VARIO)) CASE_VARIO_CPUARM(0) CASE_VARIO_CPUARM(0) CASE_VARIO_CPUARM(0) CASE_VARIO_CPUARM(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*/ });
|
||||||
|
|
||||||
int sub = m_posVert;
|
int sub = m_posVert;
|
||||||
|
|
||||||
|
@ -450,6 +451,10 @@ void menuGeneralSetup(uint8_t event)
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
case ITEM_SETUP_IMPERIAL:
|
||||||
|
g_eeGeneral.imperial = selectMenuItem(RADIO_SETUP_2ND_COLUMN, y, STR_UNITSSYSTEM, STR_VUNITSSYSTEM, g_eeGeneral.imperial, 0, 1, attr, event);
|
||||||
|
break;
|
||||||
|
|
||||||
#if defined(FAI_CHOICE)
|
#if defined(FAI_CHOICE)
|
||||||
case ITEM_SETUP_FAI:
|
case ITEM_SETUP_FAI:
|
||||||
onoffMenuItem(g_eeGeneral.fai, RADIO_SETUP_2ND_COLUMN, y, PSTR("FAI Mode"), attr, event);
|
onoffMenuItem(g_eeGeneral.fai, RADIO_SETUP_2ND_COLUMN, y, PSTR("FAI Mode"), attr, event);
|
||||||
|
|
|
@ -339,6 +339,7 @@ static int luaGetGeneralSettings(lua_State *L)
|
||||||
lua_newtable(L);
|
lua_newtable(L);
|
||||||
lua_pushtablenumber(L, "battMin", double(90+g_eeGeneral.vBatMin)/10);
|
lua_pushtablenumber(L, "battMin", double(90+g_eeGeneral.vBatMin)/10);
|
||||||
lua_pushtablenumber(L, "battMax", double(120+g_eeGeneral.vBatMax)/10);
|
lua_pushtablenumber(L, "battMax", double(120+g_eeGeneral.vBatMax)/10);
|
||||||
|
lua_pushtableinteger(L, "imperial", g_eeGeneral.imperial);
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -341,6 +341,7 @@ enum BeeperMode {
|
||||||
uint8_t sticksGain; \
|
uint8_t sticksGain; \
|
||||||
uint8_t rotarySteps; \
|
uint8_t rotarySteps; \
|
||||||
uint8_t countryCode; \
|
uint8_t countryCode; \
|
||||||
|
uint8_t imperial; \
|
||||||
char ttsLanguage[2]; \
|
char ttsLanguage[2]; \
|
||||||
int8_t beepVolume; \
|
int8_t beepVolume; \
|
||||||
int8_t wavVolume; \
|
int8_t wavVolume; \
|
||||||
|
|
|
@ -1665,7 +1665,9 @@ void varioWakeup();
|
||||||
#define IS_SOUND_OFF() (g_eeGeneral.beepMode == e_mode_quiet)
|
#define IS_SOUND_OFF() (g_eeGeneral.beepMode == e_mode_quiet)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(IMPERIAL_UNITS)
|
#if defined(CPUARM)
|
||||||
|
#define IS_IMPERIAL_ENABLE() (g_eeGeneral.imperial)
|
||||||
|
#elif defined(IMPERIAL_UNITS)
|
||||||
#define IS_IMPERIAL_ENABLE() (1)
|
#define IS_IMPERIAL_ENABLE() (1)
|
||||||
#else
|
#else
|
||||||
#define IS_IMPERIAL_ENABLE() (0)
|
#define IS_IMPERIAL_ENABLE() (0)
|
||||||
|
|
|
@ -370,11 +370,18 @@ enum AlarmLevel {
|
||||||
#define TELEMETRY_BARO_ALT_ARGS frskyData.hub.baroAltitude < 0 ? '-' : ' ', abs(baroAltitudeDivision.quot), abs(baroAltitudeDivision.rem),
|
#define TELEMETRY_BARO_ALT_ARGS frskyData.hub.baroAltitude < 0 ? '-' : ' ', abs(baroAltitudeDivision.quot), abs(baroAltitudeDivision.rem),
|
||||||
#define TELEMETRY_GPS_ALT_FORMAT "%c%d.%02d,"
|
#define TELEMETRY_GPS_ALT_FORMAT "%c%d.%02d,"
|
||||||
#define TELEMETRY_GPS_ALT_ARGS frskyData.hub.gpsAltitude < 0 ? '-' : ' ', abs(frskyData.hub.gpsAltitude / 100), abs(frskyData.hub.gpsAltitude % 100),
|
#define TELEMETRY_GPS_ALT_ARGS frskyData.hub.gpsAltitude < 0 ? '-' : ' ', abs(frskyData.hub.gpsAltitude / 100), abs(frskyData.hub.gpsAltitude % 100),
|
||||||
|
#define TELEMETRY_SPEED_UNIT (IS_IMPERIAL_ENABLE() ? SPEED_UNIT_IMP : SPEED_UNIT_METR)
|
||||||
#define TELEMETRY_GPS_SPEED_FORMAT "%d,"
|
#define TELEMETRY_GPS_SPEED_FORMAT "%d,"
|
||||||
#define TELEMETRY_GPS_SPEED_ARGS frskyData.hub.gpsSpeed_bp,
|
#define TELEMETRY_GPS_SPEED_ARGS frskyData.hub.gpsSpeed_bp,
|
||||||
#define TELEMETRY_CELLS_ARGS frskyData.hub.cellsSum / 10, frskyData.hub.cellsSum % 10, TELEMETRY_CELL_VOLTAGE(0)/100, TELEMETRY_CELL_VOLTAGE(0)%100, TELEMETRY_CELL_VOLTAGE(1)/100, TELEMETRY_CELL_VOLTAGE(1)%100, TELEMETRY_CELL_VOLTAGE(2)/100, TELEMETRY_CELL_VOLTAGE(2)%100, TELEMETRY_CELL_VOLTAGE(3)/100, TELEMETRY_CELL_VOLTAGE(3)%100, TELEMETRY_CELL_VOLTAGE(4)/100, TELEMETRY_CELL_VOLTAGE(4)%100, TELEMETRY_CELL_VOLTAGE(5)/100, TELEMETRY_CELL_VOLTAGE(5)%100, TELEMETRY_CELL_VOLTAGE(6)/100, TELEMETRY_CELL_VOLTAGE(6)%100, TELEMETRY_CELL_VOLTAGE(7)/100, TELEMETRY_CELL_VOLTAGE(7)%100, TELEMETRY_CELL_VOLTAGE(8)/100, TELEMETRY_CELL_VOLTAGE(8)%100, TELEMETRY_CELL_VOLTAGE(9)/100, TELEMETRY_CELL_VOLTAGE(9)%100, TELEMETRY_CELL_VOLTAGE(10)/100, TELEMETRY_CELL_VOLTAGE(10)%100, TELEMETRY_CELL_VOLTAGE(11)/100, TELEMETRY_CELL_VOLTAGE(11)%100,
|
#if defined(CPUARM)
|
||||||
#define TELEMETRY_CELLS_FORMAT "%d.%d,%d.%02d,%d.%02d,%d.%02d,%d.%02d,%d.%02d,%d.%02d,%d.%02d,%d.%02d,%d.%02d,%d.%02d,%d.%02d,%d.%02d,"
|
#define TELEMETRY_CELLS_ARGS frskyData.hub.cellsSum / 10, frskyData.hub.cellsSum % 10, TELEMETRY_CELL_VOLTAGE(0)/100, TELEMETRY_CELL_VOLTAGE(0)%100, TELEMETRY_CELL_VOLTAGE(1)/100, TELEMETRY_CELL_VOLTAGE(1)%100, TELEMETRY_CELL_VOLTAGE(2)/100, TELEMETRY_CELL_VOLTAGE(2)%100, TELEMETRY_CELL_VOLTAGE(3)/100, TELEMETRY_CELL_VOLTAGE(3)%100, TELEMETRY_CELL_VOLTAGE(4)/100, TELEMETRY_CELL_VOLTAGE(4)%100, TELEMETRY_CELL_VOLTAGE(5)/100, TELEMETRY_CELL_VOLTAGE(5)%100, TELEMETRY_CELL_VOLTAGE(6)/100, TELEMETRY_CELL_VOLTAGE(6)%100, TELEMETRY_CELL_VOLTAGE(7)/100, TELEMETRY_CELL_VOLTAGE(7)%100, TELEMETRY_CELL_VOLTAGE(8)/100, TELEMETRY_CELL_VOLTAGE(8)%100, TELEMETRY_CELL_VOLTAGE(9)/100, TELEMETRY_CELL_VOLTAGE(9)%100, TELEMETRY_CELL_VOLTAGE(10)/100, TELEMETRY_CELL_VOLTAGE(10)%100, TELEMETRY_CELL_VOLTAGE(11)/100, TELEMETRY_CELL_VOLTAGE(11)%100,
|
||||||
#define TELEMETRY_CELLS_LABEL "Cell volts,Cell 1,Cell 2,Cell 3,Cell 4,Cell 5,Cell 6,Cell 7,Cell 8,Cell 9,Cell 10,Cell 11,Cell 12,"
|
#define TELEMETRY_CELLS_FORMAT "%d.%d,%d.%02d,%d.%02d,%d.%02d,%d.%02d,%d.%02d,%d.%02d,%d.%02d,%d.%02d,%d.%02d,%d.%02d,%d.%02d,%d.%02d,"
|
||||||
|
#define TELEMETRY_CELLS_LABEL "Cell volts,Cell 1,Cell 2,Cell 3,Cell 4,Cell 5,Cell 6,Cell 7,Cell 8,Cell 9,Cell 10,Cell 11,Cell 12,"
|
||||||
|
#else
|
||||||
|
#define TELEMETRY_CELLS_ARGS frskyData.hub.cellsSum / 10, frskyData.hub.cellsSum % 10, TELEMETRY_CELL_VOLTAGE(0)/100, TELEMETRY_CELL_VOLTAGE(0)%100, TELEMETRY_CELL_VOLTAGE(1)/100, TELEMETRY_CELL_VOLTAGE(1)%100, TELEMETRY_CELL_VOLTAGE(2)/100, TELEMETRY_CELL_VOLTAGE(2)%100, TELEMETRY_CELL_VOLTAGE(3)/100, TELEMETRY_CELL_VOLTAGE(3)%100, TELEMETRY_CELL_VOLTAGE(4)/100, TELEMETRY_CELL_VOLTAGE(4)%100, TELEMETRY_CELL_VOLTAGE(5)/100, TELEMETRY_CELL_VOLTAGE(5)%100,
|
||||||
|
#define TELEMETRY_CELLS_FORMAT "%d.%d,%d.%02d,%d.%02d,%d.%02d,%d.%02d,%d.%02d,%d.%02d,"
|
||||||
|
#define TELEMETRY_CELLS_LABEL "Cell volts,Cell 1,Cell 2,Cell 3,Cell 4,Cell 5,Cell 6,"
|
||||||
|
#endif
|
||||||
#define TELEMETRY_CURRENT_FORMAT "%d.%d,"
|
#define TELEMETRY_CURRENT_FORMAT "%d.%d,"
|
||||||
#define TELEMETRY_CURRENT_ARGS frskyData.hub.current / 10, frskyData.hub.current % 10,
|
#define TELEMETRY_CURRENT_ARGS frskyData.hub.current / 10, frskyData.hub.current % 10,
|
||||||
#define TELEMETRY_VFAS_FORMAT "%d.%d,"
|
#define TELEMETRY_VFAS_FORMAT "%d.%d,"
|
||||||
|
@ -405,6 +412,7 @@ enum AlarmLevel {
|
||||||
#define TELEMETRY_BARO_ALT_ARGS frskyData.hub.baroAltitude_bp,
|
#define TELEMETRY_BARO_ALT_ARGS frskyData.hub.baroAltitude_bp,
|
||||||
#define TELEMETRY_GPS_ALT_FORMAT "%d,"
|
#define TELEMETRY_GPS_ALT_FORMAT "%d,"
|
||||||
#define TELEMETRY_GPS_ALT_ARGS frskyData.hub.gpsAltitude_bp,
|
#define TELEMETRY_GPS_ALT_ARGS frskyData.hub.gpsAltitude_bp,
|
||||||
|
#define TELEMETRY_SPEED_UNIT (IS_IMPERIAL_ENABLE() ? SPEED_UNIT_IMP : SPEED_UNIT_METR)
|
||||||
#define TELEMETRY_GPS_SPEED_FORMAT "%d,"
|
#define TELEMETRY_GPS_SPEED_FORMAT "%d,"
|
||||||
#define TELEMETRY_GPS_SPEED_ARGS frskyData.hub.gpsSpeed_bp,
|
#define TELEMETRY_GPS_SPEED_ARGS frskyData.hub.gpsSpeed_bp,
|
||||||
#if defined(CPUARM)
|
#if defined(CPUARM)
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue