diff --git a/radio/src/gui/colorlcd/timeedit.cpp b/radio/src/gui/colorlcd/timeedit.cpp index 804eb4b9c..8fe23dc6c 100644 --- a/radio/src/gui/colorlcd/timeedit.cpp +++ b/radio/src/gui/colorlcd/timeedit.cpp @@ -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 diff --git a/radio/src/targets/nv14/CMakeLists.txt b/radio/src/targets/nv14/CMakeLists.txt index ad5dda406..242b0bd09 100644 --- a/radio/src/targets/nv14/CMakeLists.txt +++ b/radio/src/targets/nv14/CMakeLists.txt @@ -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}) diff --git a/radio/src/targets/nv14/libopenui_config.h b/radio/src/targets/nv14/libopenui_config.h index f23ad216b..72773a4e4 100644 --- a/radio/src/targets/nv14/libopenui_config.h +++ b/radio/src/targets/nv14/libopenui_config.h @@ -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 diff --git a/radio/src/translations/cn.h.txt b/radio/src/translations/cn.h.txt index 9ae808ca3..1e0b03293 100644 --- a/radio/src/translations/cn.h.txt +++ b/radio/src/translations/cn.h.txt @@ -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]" diff --git a/radio/src/translations/cz.h.txt b/radio/src/translations/cz.h.txt index aad86571b..58248fecb 100644 --- a/radio/src/translations/cz.h.txt +++ b/radio/src/translations/cz.h.txt @@ -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]" diff --git a/radio/src/translations/de.h.txt b/radio/src/translations/de.h.txt index 7b99fb514..e2db8c03c 100644 --- a/radio/src/translations/de.h.txt +++ b/radio/src/translations/de.h.txt @@ -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]" diff --git a/radio/src/translations/en.h.txt b/radio/src/translations/en.h.txt index c37f99bf4..b30e08652 100644 --- a/radio/src/translations/en.h.txt +++ b/radio/src/translations/en.h.txt @@ -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]" diff --git a/radio/src/translations/es.h.txt b/radio/src/translations/es.h.txt index de969b1a6..666e960a6 100644 --- a/radio/src/translations/es.h.txt +++ b/radio/src/translations/es.h.txt @@ -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]" diff --git a/radio/src/translations/fi.h.txt b/radio/src/translations/fi.h.txt index 06c3476bc..ce657eeab 100644 --- a/radio/src/translations/fi.h.txt +++ b/radio/src/translations/fi.h.txt @@ -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]" diff --git a/radio/src/translations/fr.h.txt b/radio/src/translations/fr.h.txt index 546ebaf41..d1005b541 100644 --- a/radio/src/translations/fr.h.txt +++ b/radio/src/translations/fr.h.txt @@ -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]" diff --git a/radio/src/translations/it.h.txt b/radio/src/translations/it.h.txt index e1b095635..efaa97448 100644 --- a/radio/src/translations/it.h.txt +++ b/radio/src/translations/it.h.txt @@ -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]" diff --git a/radio/src/translations/nl.h.txt b/radio/src/translations/nl.h.txt index f40c93a1a..93b210d68 100644 --- a/radio/src/translations/nl.h.txt +++ b/radio/src/translations/nl.h.txt @@ -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]" diff --git a/radio/src/translations/pl.h.txt b/radio/src/translations/pl.h.txt index 7e74be8e5..0e8c9cb18 100644 --- a/radio/src/translations/pl.h.txt +++ b/radio/src/translations/pl.h.txt @@ -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]" diff --git a/radio/src/translations/pt.h.txt b/radio/src/translations/pt.h.txt index b301eb6ab..672bfb9e3 100644 --- a/radio/src/translations/pt.h.txt +++ b/radio/src/translations/pt.h.txt @@ -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]" diff --git a/radio/src/translations/se.h.txt b/radio/src/translations/se.h.txt index bf6604dec..585b82000 100644 --- a/radio/src/translations/se.h.txt +++ b/radio/src/translations/se.h.txt @@ -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]" diff --git a/radio/src/translations/tw.h.txt b/radio/src/translations/tw.h.txt index 32d4c3a97..86fdd0bfa 100644 --- a/radio/src/translations/tw.h.txt +++ b/radio/src/translations/tw.h.txt @@ -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]"