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

fix(b&w): Various rotenc. inversion bugs on radio and simu (#4405)

Browse Source
This commit is contained in:
Peter Feerick
2023-12-18 19:36:38 +10:00
committed by GitHub
parent 9b9e831a5e
commit 3f425e0b46
20 changed files with 23 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
companion/src/simulation/simulateduiwidgetBoxer.cpp
+2 -2
View File
@@ -25,10 +25,10 @@ SimulatedUIWidgetBoxer::SimulatedUIWidgetBoxer(SimulatorInterface *simulator, QW
act = new RadioUiAction(13, QList<int>() << Qt::Key_Right, SIMU_STR_HLP_KEY_RGT, SIMU_STR_HLP_ACT_TELE);
addRadioWidget(ui->leftbuttons->addArea(QRect(72, 149, 62, 24), "Boxer/left-tele.png", act));
act = new RadioUiAction(4, QList<int>() << Qt::Key_PageDown, SIMU_STR_HLP_KEY_PGDN, SIMU_STR_HLP_ACT_PGDN);
act = new RadioUiAction(5, QList<int>() << Qt::Key_PageDown, SIMU_STR_HLP_KEY_PGDN, SIMU_STR_HLP_ACT_PGDN);
addRadioWidget(ui->leftbuttons->addArea(QRect(72, 79, 62, 24), "Boxer/left-pagedn.png", act));
act = new RadioUiAction(5, QList<int>() << Qt::Key_PageUp, SIMU_STR_HLP_KEY_PGUP, SIMU_STR_HLP_ACT_PGUP);
act = new RadioUiAction(4, QList<int>() << Qt::Key_PageUp, SIMU_STR_HLP_KEY_PGUP, SIMU_STR_HLP_ACT_PGUP);
addRadioWidget(ui->leftbuttons->addArea(QRect(72, 114, 62, 24), "Boxer/left-pageup.png", act));
act = new RadioUiAction(1, QList<int>() << Qt::Key_Down << Qt::Key_Delete << Qt::Key_Escape << Qt::Key_Backspace, SIMU_STR_HLP_KEYS_EXIT, SIMU_STR_HLP_ACT_EXIT);
radio/src/gui/common/stdlcd/popups.cpp
+2 -1
View File
@@ -97,7 +97,8 @@ const char * runPopupMenu(event_t event)
event_t eventTemp = event;
#if defined(ROTARY_ENCODER_NAVIGATION) && !defined(COLORLCD)
if (g_eeGeneral.rotEncMode >= ROTARY_ENCODER_MODE_INVERT_BOTH) {
if (g_eeGeneral.rotEncMode == ROTARY_ENCODER_MODE_INVERT_VERT_HORZ_ALT ||
g_eeGeneral.rotEncMode == ROTARY_ENCODER_MODE_INVERT_VERT_HORZ_NORM) {
if (eventTemp == EVT_ROTARY_LEFT) {
eventTemp = EVT_ROTARY_RIGHT;
} else if (eventTemp == EVT_ROTARY_RIGHT) {
radio/src/targets/simu/opentxsimulator.cpp
+2 -1
View File
@@ -301,7 +301,8 @@ void OpenTxSimulator::rotaryEncoderEvent(int steps)
#if defined(ROTARY_ENCODER_NAVIGATION) && !defined(USE_HATS_AS_KEYS)
static uint32_t last_tick = 0;
if (steps != 0) {
if (g_eeGeneral.rotEncMode >= ROTARY_ENCODER_MODE_INVERT_BOTH) steps *= -1;
if (g_eeGeneral.rotEncMode == ROTARY_ENCODER_MODE_INVERT_BOTH)
steps *= -1;
rotencValue += steps * ROTARY_ENCODER_GRANULARITY;
// TODO: set rotencDt
uint32_t now = RTOS_GET_MS();
radio/src/translations/cn.h
+1 -1
View File
@@ -176,7 +176,7 @@
#if defined(COLORLCD)
#define TR_ROTARY_ENC_OPT "正常","反向"
#else
#define TR_ROTARY_ENC_OPT "正常","反向","V-I H-N","V-I H-A","V-N-E-I"
#define TR_ROTARY_ENC_OPT "正常","反向","V-I H-N","V-I H-A","V-N E-I"
#endif
#if defined(IMU)
radio/src/translations/cz.h
+1 -1
View File
@@ -188,7 +188,7 @@
#if defined(COLORLCD)
#define TR_ROTARY_ENC_OPT "Normal","Invertován"
#else
#define TR_ROTARY_ENC_OPT "Normal","Invertován","V-I H-N","V-I H-A","V-N-E-I"
#define TR_ROTARY_ENC_OPT "Normal","Invertován","V-I H-N","V-I H-A","V-N E-I"
#endif
#if defined(IMU)
radio/src/translations/da.h
+1 -1
View File
@@ -183,7 +183,7 @@
#if defined(COLORLCD)
#define TR_ROTARY_ENC_OPT "Normal","Invers"
#else
#define TR_ROTARY_ENC_OPT "Normal","Invers","V-I H-N","V-I H-A","V-N-E-I"
#define TR_ROTARY_ENC_OPT "Normal","Invers","V-I H-N","V-I H-A","V-N E-I"
#endif
#if defined(IMU)
radio/src/translations/de.h
+1 -1
View File
@@ -178,7 +178,7 @@
#if defined(COLORLCD)
#define TR_ROTARY_ENC_OPT "Normal","Inverted"
#else
#define TR_ROTARY_ENC_OPT "Normal","Inverted","V-I H-N","V-I H-A","V-N-E-I"
#define TR_ROTARY_ENC_OPT "Normal","Inverted","V-I H-N","V-I H-A","V-N E-I"
#endif
#if defined(IMU)
radio/src/translations/en.h
+1 -1
View File
@@ -180,7 +180,7 @@
#if defined(COLORLCD)
#define TR_ROTARY_ENC_OPT "Normal","Inverted"
#else
#define TR_ROTARY_ENC_OPT "Normal","Inverted","V-I H-N","V-I H-A","V-N-E-I"
#define TR_ROTARY_ENC_OPT "Normal","Inverted","V-I H-N","V-I H-A","V-N E-I"
#endif
#if defined(IMU)
radio/src/translations/es.h
+1 -1
View File
@@ -176,7 +176,7 @@
#if defined(COLORLCD)
#define TR_ROTARY_ENC_OPT "Normal","Inverted"
#else
#define TR_ROTARY_ENC_OPT "Normal","Inverted","V-I H-N","V-I H-A","V-N-E-I"
#define TR_ROTARY_ENC_OPT "Normal","Inverted","V-I H-N","V-I H-A","V-N E-I"
#endif
#if defined(IMU)
radio/src/translations/fi.h
+1 -1
View File
@@ -187,7 +187,7 @@
#if defined(COLORLCD)
#define TR_ROTARY_ENC_OPT "Normal","Inverted"
#else
#define TR_ROTARY_ENC_OPT "Normal","Inverted","V-I H-N","V-I H-A","V-N-E-I"
#define TR_ROTARY_ENC_OPT "Normal","Inverted","V-I H-N","V-I H-A","V-N E-I"
#endif
#if defined(IMU)
radio/src/translations/fr.h
+1 -1
View File
@@ -185,7 +185,7 @@
#if defined(COLORLCD)
#define TR_ROTARY_ENC_OPT "Normal","Inversé"
#else
#define TR_ROTARY_ENC_OPT "Normal","Inversé","V-I H-N","V-I H-A","V-N-E-I"
#define TR_ROTARY_ENC_OPT "Normal","Inversé","V-I H-N","V-I H-A","V-N E-I"
#endif
#if defined(IMU)
radio/src/translations/he.h
+1 -1
View File
@@ -184,7 +184,7 @@
#if defined(COLORLCD)
#define TR_ROTARY_ENC_OPT "רגיל","הפוך"
#else
#define TR_ROTARY_ENC_OPT "רגיל","הפוך","V-I H-N","V-I H-A","V-N-E-I"
#define TR_ROTARY_ENC_OPT "רגיל","הפוך","V-I H-N","V-I H-A","V-N E-I"
#endif
#if defined(IMU)
radio/src/translations/it.h
+1 -1
View File
@@ -181,7 +181,7 @@
#if defined(COLORLCD)
#define TR_ROTARY_ENC_OPT "Normale","Invertito"
#else
#define TR_ROTARY_ENC_OPT "Normale","Invertito","V-I H-N","V-I H-A","V-N-E-I"
#define TR_ROTARY_ENC_OPT "Normale","Invertito","V-I H-N","V-I H-A","V-N E-I"
#endif
#if defined(IMU)
radio/src/translations/jp.h
+1 -1
View File
@@ -180,7 +180,7 @@
#if defined(COLORLCD)
#define TR_ROTARY_ENC_OPT "標準","リバース"
#else
#define TR_ROTARY_ENC_OPT "標準","リバース","V-I H-N","V-I H-A","V-N-E-I"
#define TR_ROTARY_ENC_OPT "標準","リバース","V-I H-N","V-I H-A","V-N E-I"
#endif
#if defined(IMU)
radio/src/translations/nl.h
+1 -1
View File
@@ -177,7 +177,7 @@
#if defined(COLORLCD)
#define TR_ROTARY_ENC_OPT "Normal","Inverted"
#else
#define TR_ROTARY_ENC_OPT "Normal","Inverted","V-I H-N","V-I H-A","V-N-E-I"
#define TR_ROTARY_ENC_OPT "Normal","Inverted","V-I H-N","V-I H-A","V-N E-I"
#endif
#if defined(IMU)
radio/src/translations/pl.h
+1 -1
View File
@@ -176,7 +176,7 @@
#if defined(COLORLCD)
#define TR_ROTARY_ENC_OPT "Normal","Inverted"
#else
#define TR_ROTARY_ENC_OPT "Normal","Inverted","V-I H-N","V-I H-A","V-N-E-I"
#define TR_ROTARY_ENC_OPT "Normal","Inverted","V-I H-N","V-I H-A","V-N E-I"
#endif
#if defined(IMU)
radio/src/translations/pt.h
+1 -1
View File
@@ -183,7 +183,7 @@
#if defined(COLORLCD)
#define TR_ROTARY_ENC_OPT "Normal","Invert"
#else
#define TR_ROTARY_ENC_OPT "Normal","Invert","V-I H-N","V-I H-A","V-N-E-I"
#define TR_ROTARY_ENC_OPT "Normal","Invert","V-I H-N","V-I H-A","V-N E-I"
#endif
#if defined(IMU)
radio/src/translations/ru.h
+1 -1
View File
@@ -182,7 +182,7 @@
#if defined(COLORLCD)
#define TR_ROTARY_ENC_OPT "Норм","Перевер"
#else
#define TR_ROTARY_ENC_OPT "Норм","Перевер","V-I H-N","V-I H-A","V-N-E-I"
#define TR_ROTARY_ENC_OPT "Норм","Перевер","V-I H-N","V-I H-A","V-N E-I"
#endif
#if defined(IMU)
radio/src/translations/se.h
+1 -1
View File
@@ -173,7 +173,7 @@
#if defined(COLORLCD)
#define TR_ROTARY_ENC_OPT "Normal","Inverterad"
#else
#define TR_ROTARY_ENC_OPT "Normal","Inverterad","V-I H-N","V-I H-A","V-N-E-I"
#define TR_ROTARY_ENC_OPT "Normal","Inverterad","V-I H-N","V-I H-A","V-N E-I"
#endif
#define TR_ON_ONE_SWITCHES "PÅ","Ett"
radio/src/translations/tw.h
+1 -1
View File
@@ -181,7 +181,7 @@
#if defined(COLORLCD)
#define TR_ROTARY_ENC_OPT "正常","反向"
#else
#define TR_ROTARY_ENC_OPT "正常","反向","V-I H-N","V-I H-A","V-N-E-I"
#define TR_ROTARY_ENC_OPT "正常","反向","V-I H-N","V-I H-A","V-N E-I"
#endif
#if defined(IMU)