piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #534 from EdgeTX/nv14-trim-clicks

Browse Source 
Nv14 trim clicks
This commit is contained in:
Raphael Coeffic
2021-08-01 11:24:33 +02:00
committed by GitHub
parent 704c03a422 fde67702d2
commit 78e127a8a1
20 changed files with 76 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/gui/colorlcd/radio_diagkeys.cpp
+13 -3
View File
@@ -55,13 +55,13 @@ class RadioKeyDiagsWindow : public Window
void paint(BitmapBuffer * dc) override
{
#if !defined(PCBNV14)
constexpr coord_t KEY_COLUMN = 6;
#if !defined(PCBNV14)
constexpr coord_t SWITCHES_COLUMN = LCD_W / 2 - 20;
constexpr coord_t TRIM_COLUMN = LCD_W - 120;
#else
constexpr coord_t SWITCHES_COLUMN = LCD_W / 6;
constexpr coord_t TRIM_COLUMN = LCD_W / 2;
constexpr coord_t SWITCHES_COLUMN = LCD_W / 3;
constexpr coord_t TRIM_COLUMN = 2 * LCD_W / 3;
#endif
constexpr coord_t TRIM_MINUS_COLUMN = TRIM_COLUMN + 60;
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->drawNumber(70, y, rotencValue, 0);
#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
// SWITCHES
for (uint8_t i = 0; i < NUM_SWITCHES; i++) {
radio/src/gui/colorlcd/timeedit.cpp
+2 -2
View File
@@ -54,7 +54,7 @@ void TimeEdit::onEvent(event_t event)
if (editMode) {
if (event == EVT_ROTARY_RIGHT) {
int value = getValue();
value += rotencSpeed * step;
value += ROTARY_ENCODER_SPEED() * step;
if (value <= vmax)
setValue(value);
else
@@ -63,7 +63,7 @@ void TimeEdit::onEvent(event_t event)
}
else if (event == EVT_ROTARY_LEFT) {
int value = getValue();
value -= rotencSpeed * step;
value -= ROTARY_ENCODER_SPEED() * step;
if (value >= vmin)
setValue(value);
else
radio/src/targets/nv14/CMakeLists.txt
+2 -1
View File
@@ -80,7 +80,8 @@ set(SOFTWARE_KEYBOARD ON)
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(-DGPS_USART_BAUDRATE=${INTERNAL_GPS_BAUDRATE})
add_definitions(-DPWR_BUTTON_${PWR_BUTTON})
radio/src/targets/nv14/board.h
+10 -11
View File
@@ -142,18 +142,18 @@ void stop_trainer_capture();
// Keys driver
enum EnumKeys
{
KEY_ENTER,
KEY_EXIT,
KEY_PGUP,
KEY_PGDN,
KEY_UP,
KEY_MODEL = KEY_UP, // TODO: just fixed for compile error, seems this is quite different from horus definition.
KEY_DOWN,
KEY_RIGHT,
KEY_LEFT,
KEY_ENTER,
KEY_MODEL,
KEY_UP = KEY_MODEL,
KEY_EXIT,
KEY_DOWN = KEY_EXIT,
KEY_TELEM,
KEY_MENU,
KEY_RIGHT = KEY_TELEM,
KEY_RADIO,
KEY_LEFT = KEY_RADIO,
TRM_BASE,
TRM_LH_DWN = TRM_BASE,
TRM_LH_UP,
@@ -165,9 +165,8 @@ enum EnumKeys
TRM_RH_UP,
TRM_LS_DWN,
TRM_LS_UP,
TRM_LEFT_CLICK,
TRM_RIGHT_CLICK,
TRM_LAST = TRM_RIGHT_CLICK,
TRM_LAST = TRM_LS_UP,
NUM_KEYS
};
radio/src/targets/nv14/keys_driver.cpp
+22 -38
View File
@@ -23,32 +23,25 @@
uint32_t readKeys()
{
uint32_t result = 0;
bool getKeys = true;
/*#if defined(LUA)
getKeys = (luaState & INTERPRETER_RUNNING_STANDALONE_SCRIPT);
#endif*/ //TODO: not sure why has LUA condition here, this construct is not in horus target
if (getKeys) {
if (TRIMS_GPIO_REG_LHL & TRIMS_GPIO_PIN_LHL)
result |= 1 << KEY_PGDN;
if (TRIMS_GPIO_REG_LHR & TRIMS_GPIO_PIN_LHR)
result |= 1 << KEY_PGUP;
if (TRIMS_GPIO_REG_LVD & TRIMS_GPIO_PIN_LVD)
result |= 1 << KEY_TELEM;
if (TRIMS_GPIO_REG_LVU & TRIMS_GPIO_PIN_LVU)
result |= 1 << KEY_MENU;
if (TRIMS_GPIO_REG_RVD & TRIMS_GPIO_PIN_RVD)
result |= 1 << KEY_DOWN;
if (TRIMS_GPIO_REG_RVU & TRIMS_GPIO_PIN_RVU)
result |= 1 << KEY_UP;
if (TRIMS_GPIO_REG_RHL & TRIMS_GPIO_PIN_RHL)
result |= 1 << KEY_LEFT;
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;
}
// Arrow keys on right trim joystick
// is only supported within bootloader
#if defined(BOOT)
if (TRIMS_GPIO_REG_RVD & TRIMS_GPIO_PIN_RVD)
result |= 1 << KEY_DOWN;
if (TRIMS_GPIO_REG_RVU & TRIMS_GPIO_PIN_RVU)
result |= 1 << KEY_UP;
if (TRIMS_GPIO_REG_RHL & TRIMS_GPIO_PIN_RHL)
result |= 1 << KEY_LEFT;
if (TRIMS_GPIO_REG_RHR & TRIMS_GPIO_PIN_RHR)
result |= 1 << KEY_RIGHT;
#endif
// Enter and Exit are always supported
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;
}
@@ -56,13 +49,7 @@ uint32_t readKeys()
uint32_t readTrims()
{
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)
result |= 1 << (TRM_LH_DWN - TRM_BASE);
if (TRIMS_GPIO_REG_LHR & TRIMS_GPIO_PIN_LHR)
@@ -79,10 +66,6 @@ uint32_t readTrims()
result |= 1 << (TRM_RH_DWN - TRM_BASE);
if (TRIMS_GPIO_REG_RHR & TRIMS_GPIO_PIN_RHR)
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;
}
@@ -94,7 +77,7 @@ bool trimDown(uint8_t idx)
bool keyDown()
{
return 0;
return readKeys() || readTrims();
}
/* TODO common to ARM */
@@ -105,6 +88,7 @@ void readKeysAndTrims()
uint8_t index = 0;
uint32_t in = readKeys();
uint32_t trims = readTrims();
for (i = 0; i < TRM_BASE; i++) {
keys[index++].input(in & (1 << i));
}
radio/src/targets/nv14/libopenui_config.h
+2
View File
@@ -177,3 +177,5 @@ constexpr LcdFlags TABLE_BODY_FONT = FONT(STD);
constexpr int CJK_FIRST_LETTER_INDEX = 128 - 32 + 21;
constexpr coord_t CHAR_SPACING = 0;
// Disable rotary encoder, as the NV14 does not have one
#define ROTARY_ENCODER_SPEED() 0
radio/src/targets/simu/opentxsimulator.cpp
+1 -1
View File
@@ -274,7 +274,7 @@ void OpenTxSimulator::rotaryEncoderEvent(int steps)
key = KEY_DOWN;
else if (steps < 0)
key = KEY_UP;
#elif defined(HARDWARE_KEYS)
#elif defined(KEYS_GPIO_REG_PLUS) && defined(KEYS_GPIO_REG_MINUS)
if (steps > 0)
key = KEY_MINUS;
else if (steps < 0)
radio/src/translations/cn.h.txt
+1 -1
View File
@@ -337,7 +337,7 @@
#if defined(PCBFRSKY)
#define TR_ENTER "[ENTER]"
#elif !defined(HARDWARE_KEYS)
#elif defined(PCBNV14)
#define TR_ENTER "[NEXT]"
#else
#define TR_ENTER "[MENU]"
radio/src/translations/cz.h.txt
+2 -2
View File
@@ -289,7 +289,7 @@
#define LEN_VSWASHTYPE "\004"
#define TR_VSWASHTYPE "---\0""120\0""120X""140\0""90\0"
#if defined(PCBHORUS)
#if defined(PCBHORUS) || defined(PCBNV14)
#define LEN_VKEYS "\005"
#define TR_VKEYS "PGUP\0""PGDN\0""ENTER""MDL\0 ""RTN\0 ""TELE\0""SYS\0 "
#elif defined(RADIO_FAMILY_JUMPER_T12)
@@ -404,7 +404,7 @@
#if defined(PCBTARANIS) || defined(PCBHORUS)
#define TR_ENTER "[ENTER]"
#elif !defined(HARDWARE_KEYS)
#elif defined(PCBNV14)
#define TR_ENTER "[NEXT]"
#else
#define TR_ENTER "[MENU]"
radio/src/translations/de.h.txt
+2 -2
View File
@@ -292,7 +292,7 @@
#define LEN_VSWASHTYPE "\004"
#define TR_VSWASHTYPE "--- ""120 ""120X""140 ""90\0"
#if defined(PCBHORUS)
#if defined(PCBHORUS) || defined(PCBNV14)
#define LEN_VKEYS "\005"
#define TR_VKEYS "PGUP\0""PGDN\0""ENTER""MDL\0 ""RTN\0 ""TELE\0""SYS\0 "
#elif defined(PCBXLITE)
@@ -410,7 +410,7 @@
#if defined(PCBFRSKY)
#define TR_ENTER "[ENTER]"
#elif !defined(HARDWARE_KEYS)
#elif defined(PCBNV14)
#define TR_ENTER "[NEXT]"
#else
#define TR_ENTER "[MENU]"
radio/src/translations/en.h.txt
+2 -2
View File
@@ -292,7 +292,7 @@
#define LEN_VSWASHTYPE "\004"
#define TR_VSWASHTYPE "---\0""120\0""120X""140\0""90\0"
#if defined(PCBHORUS)
#if defined(PCBHORUS) || defined(PCBNV14)
#define LEN_VKEYS "\005"
#define TR_VKEYS "PGUP\0""PGDN\0""ENTER""MDL\0 ""RTN\0 ""TELE\0""SYS\0 "
#elif defined(PCBXLITE)
@@ -410,7 +410,7 @@
#if defined(PCBFRSKY)
#define TR_ENTER "[ENTER]"
#elif !defined(HARDWARE_KEYS)
#elif defined(PCBNV14)
#define TR_ENTER "[NEXT]"
#else
#define TR_ENTER "[MENU]"
radio/src/translations/es.h.txt
+2 -2
View File
@@ -289,7 +289,7 @@
#define LEN_VSWASHTYPE "\004"
#define TR_VSWASHTYPE "---\0""120\0""120X""140\0""90\0"
#if defined(PCBHORUS)
#if defined(PCBHORUS) || defined(PCBNV14)
#define LEN_VKEYS "\005"
#define TR_VKEYS "PGUP\0""PGDN\0""ENTER""MDL\0 ""RTN\0 ""TELE\0""SYS\0 "
#elif defined(PCBXLITE)
@@ -407,7 +407,7 @@
#if defined(PCBTARANIS) || defined(PCBHORUS)
#define TR_ENTER "[ENTER]"
#elif !defined(HARDWARE_KEYS)
#elif defined(PCBNV14)
#define TR_ENTER "[NEXT]"
#else
#define TR_ENTER "[MENU]"
radio/src/translations/fi.h.txt
+2 -2
View File
@@ -310,7 +310,7 @@
#define LEN_VSWASHTYPE "\004"
#define TR_VSWASHTYPE "---\0""120\0""120X""140\0""90\0"
#if defined(PCBHORUS)
#if defined(PCBHORUS) || defined(PCBNV14)
#define LEN_VKEYS "\005"
#define TR_VKEYS "PGUP\0""PGDN\0""ENTER""MDL\0 ""RTN\0 ""TELE\0""SYS\0 "
#elif defined(PCBXLITE)
@@ -417,7 +417,7 @@
#if defined(PCBTARANIS) || defined(PCBHORUS)
#define TR_ENTER "[ENTER]"
#elif !defined(HARDWARE_KEYS)
#elif defined(PCBNV14)
#define TR_ENTER "[NEXT]"
#else
#define TR_ENTER "[MENU]"
radio/src/translations/fr.h.txt
+2 -2
View File
@@ -312,7 +312,7 @@
#define LEN_VSWASHTYPE "\004"
#define TR_VSWASHTYPE "--- ""120 ""120X""140 ""90\0"
#if defined(PCBHORUS)
#if defined(PCBHORUS) || defined(PCBNV14)
#define LEN_VKEYS "\005"
#define TR_VKEYS "PGUP\0""PGDN\0""ENTER""MDL\0 ""RTN\0 ""TELE\0""SYS\0 "
#elif defined(PCBXLITE)
@@ -427,7 +427,7 @@
#if defined(PCBFRSKY)
#define TR_ENTER "[ENTER]"
#elif !defined(HARDWARE_KEYS)
#elif defined(PCBNV14)
#define TR_ENTER "[NEXT]"
#else
#define TR_ENTER "[MENU]"
radio/src/translations/it.h.txt
+2 -2
View File
@@ -316,7 +316,7 @@
#define LEN_VSWASHTYPE "\004"
#define TR_VSWASHTYPE "---\0""120\0""120X""140\0""90\0"
#if defined(PCBHORUS)
#if defined(PCBHORUS) || defined(PCBNV14)
#define LEN_VKEYS "\005"
#define TR_VKEYS "PGUP\0""PGDN\0""ENTER""MDL\0 ""RTN\0 ""TELE\0""SYS\0 "
#elif defined(PCBXLITE)
@@ -432,7 +432,7 @@
#if defined(PCBTARANIS) || defined(PCBHORUS)
#define TR_ENTER "[ENTER]"
#elif !defined(HARDWARE_KEYS)
#elif defined(PCBNV14)
#define TR_ENTER "[NEXT]"
#else
#define TR_ENTER "[MENU]"
radio/src/translations/nl.h.txt
+2 -2
View File
@@ -293,7 +293,7 @@
#define LEN_VSWASHTYPE "\004"
#define TR_VSWASHTYPE "---\0""120\0""120X""140\0""90\0"
#if defined(PCBHORUS)
#if defined(PCBHORUS) || defined(PCBNV14)
#define LEN_VKEYS "\005"
#define TR_VKEYS "PGUP\0""PGDN\0""ENTER""MDL\0 ""RTN\0 ""TELE\0""SYS\0 "
#elif defined(RADIO_FAMILY_JUMPER_T12)
@@ -409,7 +409,7 @@
#if defined(PCBFRSKY)
#define TR_ENTER "[ENTER]"
#elif !defined(HARDWARE_KEYS)
#elif defined(PCBNV14)
#define TR_ENTER "[NEXT]"
#else
#define TR_ENTER "[MENU]"
radio/src/translations/pl.h.txt
+2 -2
View File
@@ -310,7 +310,7 @@
#define LEN_VSWASHTYPE "\004"
#define TR_VSWASHTYPE "---\0""120\0""120X""140\0""90\0"
#if defined(PCBHORUS)
#if defined(PCBHORUS) || defined(PCBNV14)
#define LEN_VKEYS "\005"
#define TR_VKEYS "PGUP\0""PGDN\0""ENTER""MDL\0 ""RTN\0 ""TELE\0""SYS\0 "
#elif defined(PCBXLITE)
@@ -428,7 +428,7 @@
#if defined(PCBTARANIS) || defined(PCBHORUS)
#define TR_ENTER "[ENTER]"
#elif !defined(HARDWARE_KEYS)
#elif defined(PCBNV14)
#define TR_ENTER "[NEXT]"
#else
#define TR_ENTER "[MENU]"
radio/src/translations/pt.h.txt
+2 -2
View File
@@ -306,7 +306,7 @@
#define LEN_VSWASHTYPE "\004"
#define TR_VSWASHTYPE "--- ""120 ""120X""140 ""90\0"
#if defined(PCBHORUS)
#if defined(PCBHORUS) || defined(PCBNV14)
#define LEN_VKEYS "\005"
#define TR_VKEYS "PGUP\0""PGDN\0""ENTER""MDL\0 ""RTN\0 ""TELE\0""SYS\0 "
#elif defined(RADIO_FAMILY_JUMPER_T12)
@@ -421,7 +421,7 @@
#if defined(PCBTARANIS) || defined(PCBHORUS)
#define TR_ENTER "[ENTER]"
#elif !defined(HARDWARE_KEYS)
#elif defined(PCBNV14)
#define TR_ENTER "[NEXT]"
#else
#define TR_ENTER "[MENU]"
radio/src/translations/se.h.txt
+2 -2
View File
@@ -310,7 +310,7 @@
#define LEN_VSWASHTYPE "\004"
#define TR_VSWASHTYPE "--- ""120 ""120X""140 ""90\0 "
#if defined(PCBHORUS)
#if defined(PCBHORUS) || defined(PCBNV14)
#define LEN_VKEYS "\005"
#define TR_VKEYS "PGUP\0""PGDN\0""ENTER""MDL\0 ""RTN\0 ""TELE\0""SYS\0 "
#elif defined(RADIO_FAMILY_JUMPER_T12)
@@ -426,7 +426,7 @@
#if defined(PCBFRSKY)
#define TR_ENTER "[ENTER]"
#elif !defined(HARDWARE_KEYS)
#elif defined(PCBNV14)
#define TR_ENTER "[NEXT]"
#else
#define TR_ENTER "[MENU]"
radio/src/translations/tw.h.txt
+1 -1
View File
@@ -337,7 +337,7 @@
#if defined(PCBFRSKY)
#define TR_ENTER "[ENTER]"
#elif !defined(HARDWARE_KEYS)
#elif defined(PCBNV14)
#define TR_ENTER "[NEXT]"
#else
#define TR_ENTER "[MENU]"