@@ -55,13 +55,13 @@ class RadioKeyDiagsWindow : public Window
|
|||||||
|
|
||||||
void paint(BitmapBuffer * dc) override
|
void paint(BitmapBuffer * dc) override
|
||||||
{
|
{
|
||||||
#if !defined(PCBNV14)
|
|
||||||
constexpr coord_t KEY_COLUMN = 6;
|
constexpr coord_t KEY_COLUMN = 6;
|
||||||
|
#if !defined(PCBNV14)
|
||||||
constexpr coord_t SWITCHES_COLUMN = LCD_W / 2 - 20;
|
constexpr coord_t SWITCHES_COLUMN = LCD_W / 2 - 20;
|
||||||
constexpr coord_t TRIM_COLUMN = LCD_W - 120;
|
constexpr coord_t TRIM_COLUMN = LCD_W - 120;
|
||||||
#else
|
#else
|
||||||
constexpr coord_t SWITCHES_COLUMN = LCD_W / 6;
|
constexpr coord_t SWITCHES_COLUMN = LCD_W / 3;
|
||||||
constexpr coord_t TRIM_COLUMN = LCD_W / 2;
|
constexpr coord_t TRIM_COLUMN = 2 * LCD_W / 3;
|
||||||
#endif
|
#endif
|
||||||
constexpr coord_t TRIM_MINUS_COLUMN = TRIM_COLUMN + 60;
|
constexpr coord_t TRIM_MINUS_COLUMN = TRIM_COLUMN + 60;
|
||||||
constexpr coord_t TRIM_PLUS_COLUMN = TRIM_MINUS_COLUMN + 20;
|
constexpr coord_t TRIM_PLUS_COLUMN = TRIM_MINUS_COLUMN + 20;
|
||||||
@@ -82,6 +82,16 @@ class RadioKeyDiagsWindow : public Window
|
|||||||
dc->drawText(KEY_COLUMN, y, STR_ROTARY_ENCODER);
|
dc->drawText(KEY_COLUMN, y, STR_ROTARY_ENCODER);
|
||||||
dc->drawNumber(70, y, rotencValue, 0);
|
dc->drawNumber(70, y, rotencValue, 0);
|
||||||
#endif
|
#endif
|
||||||
|
#else // defined(PCBNV14)
|
||||||
|
// KEYS
|
||||||
|
{
|
||||||
|
coord_t y = 1;
|
||||||
|
dc->drawTextAtIndex(KEY_COLUMN, y, STR_VKEYS, KEY_ENTER, 0);
|
||||||
|
displayKeyState(dc, 70, y, KEY_ENTER);
|
||||||
|
y += FH;
|
||||||
|
dc->drawTextAtIndex(KEY_COLUMN, y, STR_VKEYS, KEY_EXIT, 0);
|
||||||
|
displayKeyState(dc, 70, y, KEY_EXIT);
|
||||||
|
}
|
||||||
#endif
|
#endif
|
||||||
// SWITCHES
|
// SWITCHES
|
||||||
for (uint8_t i = 0; i < NUM_SWITCHES; i++) {
|
for (uint8_t i = 0; i < NUM_SWITCHES; i++) {
|
||||||
|
|||||||
@@ -54,7 +54,7 @@ void TimeEdit::onEvent(event_t event)
|
|||||||
if (editMode) {
|
if (editMode) {
|
||||||
if (event == EVT_ROTARY_RIGHT) {
|
if (event == EVT_ROTARY_RIGHT) {
|
||||||
int value = getValue();
|
int value = getValue();
|
||||||
value += rotencSpeed * step;
|
value += ROTARY_ENCODER_SPEED() * step;
|
||||||
if (value <= vmax)
|
if (value <= vmax)
|
||||||
setValue(value);
|
setValue(value);
|
||||||
else
|
else
|
||||||
@@ -63,7 +63,7 @@ void TimeEdit::onEvent(event_t event)
|
|||||||
}
|
}
|
||||||
else if (event == EVT_ROTARY_LEFT) {
|
else if (event == EVT_ROTARY_LEFT) {
|
||||||
int value = getValue();
|
int value = getValue();
|
||||||
value -= rotencSpeed * step;
|
value -= ROTARY_ENCODER_SPEED() * step;
|
||||||
if (value >= vmin)
|
if (value >= vmin)
|
||||||
setValue(value);
|
setValue(value);
|
||||||
else
|
else
|
||||||
|
|||||||
@@ -80,7 +80,8 @@ set(SOFTWARE_KEYBOARD ON)
|
|||||||
|
|
||||||
set(FIRMWARE_DEPENDENCIES datacopy)
|
set(FIRMWARE_DEPENDENCIES datacopy)
|
||||||
|
|
||||||
add_definitions(-DSTM32F429_439xx -DSDRAM -DCOLORLCD -DLIBOPENUI -DHARDWARE_TOUCH -DSOFTWARE_KEYBOARD)
|
add_definitions(-DSTM32F429_439xx -DSDRAM -DCOLORLCD -DLIBOPENUI
|
||||||
|
-DHARDWARE_TOUCH -DHARDWARE_KEYS -DSOFTWARE_KEYBOARD)
|
||||||
add_definitions(-DEEPROM_VARIANT=0 -DAUDIO -DVOICE -DRTCLOCK)
|
add_definitions(-DEEPROM_VARIANT=0 -DAUDIO -DVOICE -DRTCLOCK)
|
||||||
add_definitions(-DGPS_USART_BAUDRATE=${INTERNAL_GPS_BAUDRATE})
|
add_definitions(-DGPS_USART_BAUDRATE=${INTERNAL_GPS_BAUDRATE})
|
||||||
add_definitions(-DPWR_BUTTON_${PWR_BUTTON})
|
add_definitions(-DPWR_BUTTON_${PWR_BUTTON})
|
||||||
|
|||||||
@@ -142,18 +142,18 @@ void stop_trainer_capture();
|
|||||||
// Keys driver
|
// Keys driver
|
||||||
enum EnumKeys
|
enum EnumKeys
|
||||||
{
|
{
|
||||||
KEY_ENTER,
|
|
||||||
KEY_EXIT,
|
|
||||||
KEY_PGUP,
|
KEY_PGUP,
|
||||||
KEY_PGDN,
|
KEY_PGDN,
|
||||||
KEY_UP,
|
KEY_ENTER,
|
||||||
KEY_MODEL = KEY_UP, // TODO: just fixed for compile error, seems this is quite different from horus definition.
|
KEY_MODEL,
|
||||||
KEY_DOWN,
|
KEY_UP = KEY_MODEL,
|
||||||
KEY_RIGHT,
|
KEY_EXIT,
|
||||||
KEY_LEFT,
|
KEY_DOWN = KEY_EXIT,
|
||||||
KEY_TELEM,
|
KEY_TELEM,
|
||||||
KEY_MENU,
|
KEY_RIGHT = KEY_TELEM,
|
||||||
KEY_RADIO,
|
KEY_RADIO,
|
||||||
|
KEY_LEFT = KEY_RADIO,
|
||||||
|
|
||||||
TRM_BASE,
|
TRM_BASE,
|
||||||
TRM_LH_DWN = TRM_BASE,
|
TRM_LH_DWN = TRM_BASE,
|
||||||
TRM_LH_UP,
|
TRM_LH_UP,
|
||||||
@@ -165,9 +165,8 @@ enum EnumKeys
|
|||||||
TRM_RH_UP,
|
TRM_RH_UP,
|
||||||
TRM_LS_DWN,
|
TRM_LS_DWN,
|
||||||
TRM_LS_UP,
|
TRM_LS_UP,
|
||||||
TRM_LEFT_CLICK,
|
TRM_LAST = TRM_LS_UP,
|
||||||
TRM_RIGHT_CLICK,
|
|
||||||
TRM_LAST = TRM_RIGHT_CLICK,
|
|
||||||
NUM_KEYS
|
NUM_KEYS
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -23,32 +23,25 @@
|
|||||||
uint32_t readKeys()
|
uint32_t readKeys()
|
||||||
{
|
{
|
||||||
uint32_t result = 0;
|
uint32_t result = 0;
|
||||||
bool getKeys = true;
|
|
||||||
/*#if defined(LUA)
|
// Arrow keys on right trim joystick
|
||||||
getKeys = (luaState & INTERPRETER_RUNNING_STANDALONE_SCRIPT);
|
// is only supported within bootloader
|
||||||
#endif*/ //TODO: not sure why has LUA condition here, this construct is not in horus target
|
#if defined(BOOT)
|
||||||
if (getKeys) {
|
if (TRIMS_GPIO_REG_RVD & TRIMS_GPIO_PIN_RVD)
|
||||||
if (TRIMS_GPIO_REG_LHL & TRIMS_GPIO_PIN_LHL)
|
result |= 1 << KEY_DOWN;
|
||||||
result |= 1 << KEY_PGDN;
|
if (TRIMS_GPIO_REG_RVU & TRIMS_GPIO_PIN_RVU)
|
||||||
if (TRIMS_GPIO_REG_LHR & TRIMS_GPIO_PIN_LHR)
|
result |= 1 << KEY_UP;
|
||||||
result |= 1 << KEY_PGUP;
|
if (TRIMS_GPIO_REG_RHL & TRIMS_GPIO_PIN_RHL)
|
||||||
if (TRIMS_GPIO_REG_LVD & TRIMS_GPIO_PIN_LVD)
|
result |= 1 << KEY_LEFT;
|
||||||
result |= 1 << KEY_TELEM;
|
if (TRIMS_GPIO_REG_RHR & TRIMS_GPIO_PIN_RHR)
|
||||||
if (TRIMS_GPIO_REG_LVU & TRIMS_GPIO_PIN_LVU)
|
result |= 1 << KEY_RIGHT;
|
||||||
result |= 1 << KEY_MENU;
|
#endif
|
||||||
if (TRIMS_GPIO_REG_RVD & TRIMS_GPIO_PIN_RVD)
|
|
||||||
result |= 1 << KEY_DOWN;
|
// Enter and Exit are always supported
|
||||||
if (TRIMS_GPIO_REG_RVU & TRIMS_GPIO_PIN_RVU)
|
if (TRIMS_GPIO_REG_RPRESS & TRIMS_GPIO_PIN_RPRESS)
|
||||||
result |= 1 << KEY_UP;
|
result |= 1 << KEY_ENTER;
|
||||||
if (TRIMS_GPIO_REG_RHL & TRIMS_GPIO_PIN_RHL)
|
if (TRIMS_GPIO_REG_LPRESS & TRIMS_GPIO_PIN_LPRESS)
|
||||||
result |= 1 << KEY_LEFT;
|
result |= 1 << KEY_EXIT;
|
||||||
if (TRIMS_GPIO_REG_RHR & TRIMS_GPIO_PIN_RHR)
|
|
||||||
result |= 1 << KEY_RIGHT;
|
|
||||||
if (TRIMS_GPIO_REG_RPRESS & TRIMS_GPIO_PIN_RPRESS)
|
|
||||||
result |= 1 << KEY_ENTER;
|
|
||||||
if (TRIMS_GPIO_REG_LPRESS & TRIMS_GPIO_PIN_LPRESS)
|
|
||||||
result |= 1 << KEY_EXIT;
|
|
||||||
}
|
|
||||||
|
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
@@ -56,13 +49,7 @@ uint32_t readKeys()
|
|||||||
uint32_t readTrims()
|
uint32_t readTrims()
|
||||||
{
|
{
|
||||||
uint32_t result = 0;
|
uint32_t result = 0;
|
||||||
bool getTrim = true;
|
|
||||||
/*#if defined(LUA)
|
|
||||||
if(luaState & INTERPRETER_RUNNING_STANDALONE_SCRIPT) {
|
|
||||||
getTrim = false;
|
|
||||||
}
|
|
||||||
#endif*/ //TODO: not sure why has LUA condition here, this construct is not in horus target
|
|
||||||
if(!getTrim) return result;
|
|
||||||
if (TRIMS_GPIO_REG_LHL & TRIMS_GPIO_PIN_LHL)
|
if (TRIMS_GPIO_REG_LHL & TRIMS_GPIO_PIN_LHL)
|
||||||
result |= 1 << (TRM_LH_DWN - TRM_BASE);
|
result |= 1 << (TRM_LH_DWN - TRM_BASE);
|
||||||
if (TRIMS_GPIO_REG_LHR & TRIMS_GPIO_PIN_LHR)
|
if (TRIMS_GPIO_REG_LHR & TRIMS_GPIO_PIN_LHR)
|
||||||
@@ -79,10 +66,6 @@ uint32_t readTrims()
|
|||||||
result |= 1 << (TRM_RH_DWN - TRM_BASE);
|
result |= 1 << (TRM_RH_DWN - TRM_BASE);
|
||||||
if (TRIMS_GPIO_REG_RHR & TRIMS_GPIO_PIN_RHR)
|
if (TRIMS_GPIO_REG_RHR & TRIMS_GPIO_PIN_RHR)
|
||||||
result |= 1 << (TRM_RH_UP - TRM_BASE);
|
result |= 1 << (TRM_RH_UP - TRM_BASE);
|
||||||
if (TRIMS_GPIO_REG_RPRESS & TRIMS_GPIO_PIN_RPRESS)
|
|
||||||
result |= 1 << (TRM_RIGHT_CLICK - TRM_BASE);
|
|
||||||
if (TRIMS_GPIO_REG_LPRESS & TRIMS_GPIO_PIN_LPRESS)
|
|
||||||
result |= 1 << (TRM_LEFT_CLICK - TRM_BASE);
|
|
||||||
|
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
@@ -94,7 +77,7 @@ bool trimDown(uint8_t idx)
|
|||||||
|
|
||||||
bool keyDown()
|
bool keyDown()
|
||||||
{
|
{
|
||||||
return 0;
|
return readKeys() || readTrims();
|
||||||
}
|
}
|
||||||
|
|
||||||
/* TODO common to ARM */
|
/* TODO common to ARM */
|
||||||
@@ -105,6 +88,7 @@ void readKeysAndTrims()
|
|||||||
uint8_t index = 0;
|
uint8_t index = 0;
|
||||||
uint32_t in = readKeys();
|
uint32_t in = readKeys();
|
||||||
uint32_t trims = readTrims();
|
uint32_t trims = readTrims();
|
||||||
|
|
||||||
for (i = 0; i < TRM_BASE; i++) {
|
for (i = 0; i < TRM_BASE; i++) {
|
||||||
keys[index++].input(in & (1 << i));
|
keys[index++].input(in & (1 << i));
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -177,3 +177,5 @@ constexpr LcdFlags TABLE_BODY_FONT = FONT(STD);
|
|||||||
constexpr int CJK_FIRST_LETTER_INDEX = 128 - 32 + 21;
|
constexpr int CJK_FIRST_LETTER_INDEX = 128 - 32 + 21;
|
||||||
constexpr coord_t CHAR_SPACING = 0;
|
constexpr coord_t CHAR_SPACING = 0;
|
||||||
|
|
||||||
|
// Disable rotary encoder, as the NV14 does not have one
|
||||||
|
#define ROTARY_ENCODER_SPEED() 0
|
||||||
|
|||||||
@@ -274,7 +274,7 @@ void OpenTxSimulator::rotaryEncoderEvent(int steps)
|
|||||||
key = KEY_DOWN;
|
key = KEY_DOWN;
|
||||||
else if (steps < 0)
|
else if (steps < 0)
|
||||||
key = KEY_UP;
|
key = KEY_UP;
|
||||||
#elif defined(HARDWARE_KEYS)
|
#elif defined(KEYS_GPIO_REG_PLUS) && defined(KEYS_GPIO_REG_MINUS)
|
||||||
if (steps > 0)
|
if (steps > 0)
|
||||||
key = KEY_MINUS;
|
key = KEY_MINUS;
|
||||||
else if (steps < 0)
|
else if (steps < 0)
|
||||||
|
|||||||
@@ -337,7 +337,7 @@
|
|||||||
|
|
||||||
#if defined(PCBFRSKY)
|
#if defined(PCBFRSKY)
|
||||||
#define TR_ENTER "[ENTER]"
|
#define TR_ENTER "[ENTER]"
|
||||||
#elif !defined(HARDWARE_KEYS)
|
#elif defined(PCBNV14)
|
||||||
#define TR_ENTER "[NEXT]"
|
#define TR_ENTER "[NEXT]"
|
||||||
#else
|
#else
|
||||||
#define TR_ENTER "[MENU]"
|
#define TR_ENTER "[MENU]"
|
||||||
|
|||||||
@@ -289,7 +289,7 @@
|
|||||||
#define LEN_VSWASHTYPE "\004"
|
#define LEN_VSWASHTYPE "\004"
|
||||||
#define TR_VSWASHTYPE "---\0""120\0""120X""140\0""90\0"
|
#define TR_VSWASHTYPE "---\0""120\0""120X""140\0""90\0"
|
||||||
|
|
||||||
#if defined(PCBHORUS)
|
#if defined(PCBHORUS) || defined(PCBNV14)
|
||||||
#define LEN_VKEYS "\005"
|
#define LEN_VKEYS "\005"
|
||||||
#define TR_VKEYS "PGUP\0""PGDN\0""ENTER""MDL\0 ""RTN\0 ""TELE\0""SYS\0 "
|
#define TR_VKEYS "PGUP\0""PGDN\0""ENTER""MDL\0 ""RTN\0 ""TELE\0""SYS\0 "
|
||||||
#elif defined(RADIO_FAMILY_JUMPER_T12)
|
#elif defined(RADIO_FAMILY_JUMPER_T12)
|
||||||
@@ -404,7 +404,7 @@
|
|||||||
|
|
||||||
#if defined(PCBTARANIS) || defined(PCBHORUS)
|
#if defined(PCBTARANIS) || defined(PCBHORUS)
|
||||||
#define TR_ENTER "[ENTER]"
|
#define TR_ENTER "[ENTER]"
|
||||||
#elif !defined(HARDWARE_KEYS)
|
#elif defined(PCBNV14)
|
||||||
#define TR_ENTER "[NEXT]"
|
#define TR_ENTER "[NEXT]"
|
||||||
#else
|
#else
|
||||||
#define TR_ENTER "[MENU]"
|
#define TR_ENTER "[MENU]"
|
||||||
|
|||||||
@@ -292,7 +292,7 @@
|
|||||||
#define LEN_VSWASHTYPE "\004"
|
#define LEN_VSWASHTYPE "\004"
|
||||||
#define TR_VSWASHTYPE "--- ""120 ""120X""140 ""90\0"
|
#define TR_VSWASHTYPE "--- ""120 ""120X""140 ""90\0"
|
||||||
|
|
||||||
#if defined(PCBHORUS)
|
#if defined(PCBHORUS) || defined(PCBNV14)
|
||||||
#define LEN_VKEYS "\005"
|
#define LEN_VKEYS "\005"
|
||||||
#define TR_VKEYS "PGUP\0""PGDN\0""ENTER""MDL\0 ""RTN\0 ""TELE\0""SYS\0 "
|
#define TR_VKEYS "PGUP\0""PGDN\0""ENTER""MDL\0 ""RTN\0 ""TELE\0""SYS\0 "
|
||||||
#elif defined(PCBXLITE)
|
#elif defined(PCBXLITE)
|
||||||
@@ -410,7 +410,7 @@
|
|||||||
|
|
||||||
#if defined(PCBFRSKY)
|
#if defined(PCBFRSKY)
|
||||||
#define TR_ENTER "[ENTER]"
|
#define TR_ENTER "[ENTER]"
|
||||||
#elif !defined(HARDWARE_KEYS)
|
#elif defined(PCBNV14)
|
||||||
#define TR_ENTER "[NEXT]"
|
#define TR_ENTER "[NEXT]"
|
||||||
#else
|
#else
|
||||||
#define TR_ENTER "[MENU]"
|
#define TR_ENTER "[MENU]"
|
||||||
|
|||||||
@@ -292,7 +292,7 @@
|
|||||||
#define LEN_VSWASHTYPE "\004"
|
#define LEN_VSWASHTYPE "\004"
|
||||||
#define TR_VSWASHTYPE "---\0""120\0""120X""140\0""90\0"
|
#define TR_VSWASHTYPE "---\0""120\0""120X""140\0""90\0"
|
||||||
|
|
||||||
#if defined(PCBHORUS)
|
#if defined(PCBHORUS) || defined(PCBNV14)
|
||||||
#define LEN_VKEYS "\005"
|
#define LEN_VKEYS "\005"
|
||||||
#define TR_VKEYS "PGUP\0""PGDN\0""ENTER""MDL\0 ""RTN\0 ""TELE\0""SYS\0 "
|
#define TR_VKEYS "PGUP\0""PGDN\0""ENTER""MDL\0 ""RTN\0 ""TELE\0""SYS\0 "
|
||||||
#elif defined(PCBXLITE)
|
#elif defined(PCBXLITE)
|
||||||
@@ -410,7 +410,7 @@
|
|||||||
|
|
||||||
#if defined(PCBFRSKY)
|
#if defined(PCBFRSKY)
|
||||||
#define TR_ENTER "[ENTER]"
|
#define TR_ENTER "[ENTER]"
|
||||||
#elif !defined(HARDWARE_KEYS)
|
#elif defined(PCBNV14)
|
||||||
#define TR_ENTER "[NEXT]"
|
#define TR_ENTER "[NEXT]"
|
||||||
#else
|
#else
|
||||||
#define TR_ENTER "[MENU]"
|
#define TR_ENTER "[MENU]"
|
||||||
|
|||||||
@@ -289,7 +289,7 @@
|
|||||||
#define LEN_VSWASHTYPE "\004"
|
#define LEN_VSWASHTYPE "\004"
|
||||||
#define TR_VSWASHTYPE "---\0""120\0""120X""140\0""90\0"
|
#define TR_VSWASHTYPE "---\0""120\0""120X""140\0""90\0"
|
||||||
|
|
||||||
#if defined(PCBHORUS)
|
#if defined(PCBHORUS) || defined(PCBNV14)
|
||||||
#define LEN_VKEYS "\005"
|
#define LEN_VKEYS "\005"
|
||||||
#define TR_VKEYS "PGUP\0""PGDN\0""ENTER""MDL\0 ""RTN\0 ""TELE\0""SYS\0 "
|
#define TR_VKEYS "PGUP\0""PGDN\0""ENTER""MDL\0 ""RTN\0 ""TELE\0""SYS\0 "
|
||||||
#elif defined(PCBXLITE)
|
#elif defined(PCBXLITE)
|
||||||
@@ -407,7 +407,7 @@
|
|||||||
|
|
||||||
#if defined(PCBTARANIS) || defined(PCBHORUS)
|
#if defined(PCBTARANIS) || defined(PCBHORUS)
|
||||||
#define TR_ENTER "[ENTER]"
|
#define TR_ENTER "[ENTER]"
|
||||||
#elif !defined(HARDWARE_KEYS)
|
#elif defined(PCBNV14)
|
||||||
#define TR_ENTER "[NEXT]"
|
#define TR_ENTER "[NEXT]"
|
||||||
#else
|
#else
|
||||||
#define TR_ENTER "[MENU]"
|
#define TR_ENTER "[MENU]"
|
||||||
|
|||||||
@@ -310,7 +310,7 @@
|
|||||||
#define LEN_VSWASHTYPE "\004"
|
#define LEN_VSWASHTYPE "\004"
|
||||||
#define TR_VSWASHTYPE "---\0""120\0""120X""140\0""90\0"
|
#define TR_VSWASHTYPE "---\0""120\0""120X""140\0""90\0"
|
||||||
|
|
||||||
#if defined(PCBHORUS)
|
#if defined(PCBHORUS) || defined(PCBNV14)
|
||||||
#define LEN_VKEYS "\005"
|
#define LEN_VKEYS "\005"
|
||||||
#define TR_VKEYS "PGUP\0""PGDN\0""ENTER""MDL\0 ""RTN\0 ""TELE\0""SYS\0 "
|
#define TR_VKEYS "PGUP\0""PGDN\0""ENTER""MDL\0 ""RTN\0 ""TELE\0""SYS\0 "
|
||||||
#elif defined(PCBXLITE)
|
#elif defined(PCBXLITE)
|
||||||
@@ -417,7 +417,7 @@
|
|||||||
|
|
||||||
#if defined(PCBTARANIS) || defined(PCBHORUS)
|
#if defined(PCBTARANIS) || defined(PCBHORUS)
|
||||||
#define TR_ENTER "[ENTER]"
|
#define TR_ENTER "[ENTER]"
|
||||||
#elif !defined(HARDWARE_KEYS)
|
#elif defined(PCBNV14)
|
||||||
#define TR_ENTER "[NEXT]"
|
#define TR_ENTER "[NEXT]"
|
||||||
#else
|
#else
|
||||||
#define TR_ENTER "[MENU]"
|
#define TR_ENTER "[MENU]"
|
||||||
|
|||||||
@@ -312,7 +312,7 @@
|
|||||||
#define LEN_VSWASHTYPE "\004"
|
#define LEN_VSWASHTYPE "\004"
|
||||||
#define TR_VSWASHTYPE "--- ""120 ""120X""140 ""90\0"
|
#define TR_VSWASHTYPE "--- ""120 ""120X""140 ""90\0"
|
||||||
|
|
||||||
#if defined(PCBHORUS)
|
#if defined(PCBHORUS) || defined(PCBNV14)
|
||||||
#define LEN_VKEYS "\005"
|
#define LEN_VKEYS "\005"
|
||||||
#define TR_VKEYS "PGUP\0""PGDN\0""ENTER""MDL\0 ""RTN\0 ""TELE\0""SYS\0 "
|
#define TR_VKEYS "PGUP\0""PGDN\0""ENTER""MDL\0 ""RTN\0 ""TELE\0""SYS\0 "
|
||||||
#elif defined(PCBXLITE)
|
#elif defined(PCBXLITE)
|
||||||
@@ -427,7 +427,7 @@
|
|||||||
|
|
||||||
#if defined(PCBFRSKY)
|
#if defined(PCBFRSKY)
|
||||||
#define TR_ENTER "[ENTER]"
|
#define TR_ENTER "[ENTER]"
|
||||||
#elif !defined(HARDWARE_KEYS)
|
#elif defined(PCBNV14)
|
||||||
#define TR_ENTER "[NEXT]"
|
#define TR_ENTER "[NEXT]"
|
||||||
#else
|
#else
|
||||||
#define TR_ENTER "[MENU]"
|
#define TR_ENTER "[MENU]"
|
||||||
|
|||||||
@@ -316,7 +316,7 @@
|
|||||||
#define LEN_VSWASHTYPE "\004"
|
#define LEN_VSWASHTYPE "\004"
|
||||||
#define TR_VSWASHTYPE "---\0""120\0""120X""140\0""90\0"
|
#define TR_VSWASHTYPE "---\0""120\0""120X""140\0""90\0"
|
||||||
|
|
||||||
#if defined(PCBHORUS)
|
#if defined(PCBHORUS) || defined(PCBNV14)
|
||||||
#define LEN_VKEYS "\005"
|
#define LEN_VKEYS "\005"
|
||||||
#define TR_VKEYS "PGUP\0""PGDN\0""ENTER""MDL\0 ""RTN\0 ""TELE\0""SYS\0 "
|
#define TR_VKEYS "PGUP\0""PGDN\0""ENTER""MDL\0 ""RTN\0 ""TELE\0""SYS\0 "
|
||||||
#elif defined(PCBXLITE)
|
#elif defined(PCBXLITE)
|
||||||
@@ -432,7 +432,7 @@
|
|||||||
|
|
||||||
#if defined(PCBTARANIS) || defined(PCBHORUS)
|
#if defined(PCBTARANIS) || defined(PCBHORUS)
|
||||||
#define TR_ENTER "[ENTER]"
|
#define TR_ENTER "[ENTER]"
|
||||||
#elif !defined(HARDWARE_KEYS)
|
#elif defined(PCBNV14)
|
||||||
#define TR_ENTER "[NEXT]"
|
#define TR_ENTER "[NEXT]"
|
||||||
#else
|
#else
|
||||||
#define TR_ENTER "[MENU]"
|
#define TR_ENTER "[MENU]"
|
||||||
|
|||||||
@@ -293,7 +293,7 @@
|
|||||||
#define LEN_VSWASHTYPE "\004"
|
#define LEN_VSWASHTYPE "\004"
|
||||||
#define TR_VSWASHTYPE "---\0""120\0""120X""140\0""90\0"
|
#define TR_VSWASHTYPE "---\0""120\0""120X""140\0""90\0"
|
||||||
|
|
||||||
#if defined(PCBHORUS)
|
#if defined(PCBHORUS) || defined(PCBNV14)
|
||||||
#define LEN_VKEYS "\005"
|
#define LEN_VKEYS "\005"
|
||||||
#define TR_VKEYS "PGUP\0""PGDN\0""ENTER""MDL\0 ""RTN\0 ""TELE\0""SYS\0 "
|
#define TR_VKEYS "PGUP\0""PGDN\0""ENTER""MDL\0 ""RTN\0 ""TELE\0""SYS\0 "
|
||||||
#elif defined(RADIO_FAMILY_JUMPER_T12)
|
#elif defined(RADIO_FAMILY_JUMPER_T12)
|
||||||
@@ -409,7 +409,7 @@
|
|||||||
|
|
||||||
#if defined(PCBFRSKY)
|
#if defined(PCBFRSKY)
|
||||||
#define TR_ENTER "[ENTER]"
|
#define TR_ENTER "[ENTER]"
|
||||||
#elif !defined(HARDWARE_KEYS)
|
#elif defined(PCBNV14)
|
||||||
#define TR_ENTER "[NEXT]"
|
#define TR_ENTER "[NEXT]"
|
||||||
#else
|
#else
|
||||||
#define TR_ENTER "[MENU]"
|
#define TR_ENTER "[MENU]"
|
||||||
|
|||||||
@@ -310,7 +310,7 @@
|
|||||||
#define LEN_VSWASHTYPE "\004"
|
#define LEN_VSWASHTYPE "\004"
|
||||||
#define TR_VSWASHTYPE "---\0""120\0""120X""140\0""90\0"
|
#define TR_VSWASHTYPE "---\0""120\0""120X""140\0""90\0"
|
||||||
|
|
||||||
#if defined(PCBHORUS)
|
#if defined(PCBHORUS) || defined(PCBNV14)
|
||||||
#define LEN_VKEYS "\005"
|
#define LEN_VKEYS "\005"
|
||||||
#define TR_VKEYS "PGUP\0""PGDN\0""ENTER""MDL\0 ""RTN\0 ""TELE\0""SYS\0 "
|
#define TR_VKEYS "PGUP\0""PGDN\0""ENTER""MDL\0 ""RTN\0 ""TELE\0""SYS\0 "
|
||||||
#elif defined(PCBXLITE)
|
#elif defined(PCBXLITE)
|
||||||
@@ -428,7 +428,7 @@
|
|||||||
|
|
||||||
#if defined(PCBTARANIS) || defined(PCBHORUS)
|
#if defined(PCBTARANIS) || defined(PCBHORUS)
|
||||||
#define TR_ENTER "[ENTER]"
|
#define TR_ENTER "[ENTER]"
|
||||||
#elif !defined(HARDWARE_KEYS)
|
#elif defined(PCBNV14)
|
||||||
#define TR_ENTER "[NEXT]"
|
#define TR_ENTER "[NEXT]"
|
||||||
#else
|
#else
|
||||||
#define TR_ENTER "[MENU]"
|
#define TR_ENTER "[MENU]"
|
||||||
|
|||||||
@@ -306,7 +306,7 @@
|
|||||||
#define LEN_VSWASHTYPE "\004"
|
#define LEN_VSWASHTYPE "\004"
|
||||||
#define TR_VSWASHTYPE "--- ""120 ""120X""140 ""90\0"
|
#define TR_VSWASHTYPE "--- ""120 ""120X""140 ""90\0"
|
||||||
|
|
||||||
#if defined(PCBHORUS)
|
#if defined(PCBHORUS) || defined(PCBNV14)
|
||||||
#define LEN_VKEYS "\005"
|
#define LEN_VKEYS "\005"
|
||||||
#define TR_VKEYS "PGUP\0""PGDN\0""ENTER""MDL\0 ""RTN\0 ""TELE\0""SYS\0 "
|
#define TR_VKEYS "PGUP\0""PGDN\0""ENTER""MDL\0 ""RTN\0 ""TELE\0""SYS\0 "
|
||||||
#elif defined(RADIO_FAMILY_JUMPER_T12)
|
#elif defined(RADIO_FAMILY_JUMPER_T12)
|
||||||
@@ -421,7 +421,7 @@
|
|||||||
|
|
||||||
#if defined(PCBTARANIS) || defined(PCBHORUS)
|
#if defined(PCBTARANIS) || defined(PCBHORUS)
|
||||||
#define TR_ENTER "[ENTER]"
|
#define TR_ENTER "[ENTER]"
|
||||||
#elif !defined(HARDWARE_KEYS)
|
#elif defined(PCBNV14)
|
||||||
#define TR_ENTER "[NEXT]"
|
#define TR_ENTER "[NEXT]"
|
||||||
#else
|
#else
|
||||||
#define TR_ENTER "[MENU]"
|
#define TR_ENTER "[MENU]"
|
||||||
|
|||||||
@@ -310,7 +310,7 @@
|
|||||||
#define LEN_VSWASHTYPE "\004"
|
#define LEN_VSWASHTYPE "\004"
|
||||||
#define TR_VSWASHTYPE "--- ""120 ""120X""140 ""90\0 "
|
#define TR_VSWASHTYPE "--- ""120 ""120X""140 ""90\0 "
|
||||||
|
|
||||||
#if defined(PCBHORUS)
|
#if defined(PCBHORUS) || defined(PCBNV14)
|
||||||
#define LEN_VKEYS "\005"
|
#define LEN_VKEYS "\005"
|
||||||
#define TR_VKEYS "PGUP\0""PGDN\0""ENTER""MDL\0 ""RTN\0 ""TELE\0""SYS\0 "
|
#define TR_VKEYS "PGUP\0""PGDN\0""ENTER""MDL\0 ""RTN\0 ""TELE\0""SYS\0 "
|
||||||
#elif defined(RADIO_FAMILY_JUMPER_T12)
|
#elif defined(RADIO_FAMILY_JUMPER_T12)
|
||||||
@@ -426,7 +426,7 @@
|
|||||||
|
|
||||||
#if defined(PCBFRSKY)
|
#if defined(PCBFRSKY)
|
||||||
#define TR_ENTER "[ENTER]"
|
#define TR_ENTER "[ENTER]"
|
||||||
#elif !defined(HARDWARE_KEYS)
|
#elif defined(PCBNV14)
|
||||||
#define TR_ENTER "[NEXT]"
|
#define TR_ENTER "[NEXT]"
|
||||||
#else
|
#else
|
||||||
#define TR_ENTER "[MENU]"
|
#define TR_ENTER "[MENU]"
|
||||||
|
|||||||
@@ -337,7 +337,7 @@
|
|||||||
|
|
||||||
#if defined(PCBFRSKY)
|
#if defined(PCBFRSKY)
|
||||||
#define TR_ENTER "[ENTER]"
|
#define TR_ENTER "[ENTER]"
|
||||||
#elif !defined(HARDWARE_KEYS)
|
#elif defined(PCBNV14)
|
||||||
#define TR_ENTER "[NEXT]"
|
#define TR_ENTER "[NEXT]"
|
||||||
#else
|
#else
|
||||||
#define TR_ENTER "[MENU]"
|
#define TR_ENTER "[MENU]"
|
||||||
|
|||||||
Reference in New Issue
Block a user