From c41c7469b87e3af598a88f61c8a64ec4c10c0937 Mon Sep 17 00:00:00 2001 From: Andre Bernet Date: Sat, 19 Apr 2014 20:17:04 +0200 Subject: [PATCH 1/5] Steps of 10 during key repeats for telemetry values - was awfully long now we have more resolution --- radio/src/gui/menu_model.cpp | 2 ++ radio/src/gui/menus.cpp | 14 ++++++++++++-- radio/src/gui/menus.h | 1 + radio/src/keys.h | 1 + 4 files changed, 16 insertions(+), 2 deletions(-) diff --git a/radio/src/gui/menu_model.cpp b/radio/src/gui/menu_model.cpp index b0d7b6b1b..3c9eae936 100644 --- a/radio/src/gui/menu_model.cpp +++ b/radio/src/gui/menu_model.cpp @@ -4361,6 +4361,7 @@ void menuModelLogicalSwitchOne(uint8_t event) putsTelemetryChannel(CSWONE_2ND_COLUMN, y, v1_val - MIXSRC_FIRST_TELEM, convertCswTelemValue(cs), attr|LEFT); v2_max = maxTelemValue(v1_val - MIXSRC_FIRST_TELEM + 1); v2_min = minTelemValue(v1_val - MIXSRC_FIRST_TELEM + 1); + INCDEC_SET_FLAG(INCDEC_REP10 | NO_INCDEC_MARKS); if (cs->v2 < v2_min || cs->v2 > v2_max) { cs->v2 = 0; eeDirty(EE_MODEL); @@ -4645,6 +4646,7 @@ void menuModelLogicalSwitches(uint8_t event) v2_max = maxTelemValue(v1_val - MIXSRC_FIRST_TELEM + 1); #if defined(CPUARM) v2_min = minTelemValue(v1_val - MIXSRC_FIRST_TELEM + 1); + INCDEC_SET_FLAG(INCDEC_REP10 | NO_INCDEC_MARKS); if (cs->v2 < v2_min || cs->v2 > v2_max) { cs->v2 = 0; eeDirty(EE_MODEL); diff --git a/radio/src/gui/menus.cpp b/radio/src/gui/menus.cpp index 6aeb994c3..0c8e0a136 100644 --- a/radio/src/gui/menus.cpp +++ b/radio/src/gui/menus.cpp @@ -165,7 +165,12 @@ int16_t checkIncDec(uint8_t event, int16_t val, int16_t i_min, int16_t i_max, ui #endif #if defined(CPUARM) do { - newval++; + if (IS_KEY_REPT(event) && (i_flags & INCDEC_REP10)) { + newval+=10; + } + else { + newval++; + } } while (isValueAvailable && !isValueAvailable(newval) && newval<=i_max); if (newval > i_max) { newval = val; @@ -185,7 +190,12 @@ int16_t checkIncDec(uint8_t event, int16_t val, int16_t i_min, int16_t i_max, ui #endif #if defined(CPUARM) do { - newval--; + if (IS_KEY_REPT(event) && (i_flags & INCDEC_REP10)) { + newval-=10; + } + else { + newval--; + } } while (isValueAvailable && !isValueAvailable(newval) && newval>=i_min); if (newval < i_min) { newval = val; diff --git a/radio/src/gui/menus.h b/radio/src/gui/menus.h index 33160f079..7def27e21 100644 --- a/radio/src/gui/menus.h +++ b/radio/src/gui/menus.h @@ -170,6 +170,7 @@ extern int8_t s_editMode; // global editmode #define INCDEC_SWITCH 0x08 #define INCDEC_SOURCE 0x10 #define DBLKEYS_1000 0x20 +#define INCDEC_REP10 0x40 // mawrow special values #define TITLE_ROW ((uint8_t)-1) diff --git a/radio/src/keys.h b/radio/src/keys.h index 350ab81d5..e468aa507 100755 --- a/radio/src/keys.h +++ b/radio/src/keys.h @@ -130,6 +130,7 @@ enum EnumKeys { #define IS_KEY_BREAK(evt) (((evt)&0xe0) == _MSK_KEY_BREAK) #define IS_KEY_FIRST(evt) (((evt)&0xe0) == _MSK_KEY_FIRST) #define IS_KEY_LONG(evt) (((evt)&0xe0) == _MSK_KEY_LONG) +#define IS_KEY_REPT(evt) (((evt)&0xe0) == _MSK_KEY_REPT) #define EVT_ENTRY 0xbf #define EVT_ENTRY_UP 0xbe From 2eed4ea8e2df676d03c6db693123015cf90b181e Mon Sep 17 00:00:00 2001 From: Andre Bernet Date: Sat, 19 Apr 2014 20:49:11 +0200 Subject: [PATCH 2/5] Main window position restored (fix #996) --- companion/src/mainwindow.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/companion/src/mainwindow.cpp b/companion/src/mainwindow.cpp index 76236c61c..141a2a6f5 100644 --- a/companion/src/mainwindow.cpp +++ b/companion/src/mainwindow.cpp @@ -102,6 +102,7 @@ MainWindow::MainWindow(): updateMenus(); restoreState(g.mainWinState()); + restoreGeometry(g.mainWinGeo()); setUnifiedTitleAndToolBarOnMac(true); this->setWindowIcon(QIcon(":/icon.png")); From c4eb1182df1a13793ce178243a607017e2ff694f Mon Sep 17 00:00:00 2001 From: bsongis Date: Sun, 20 Apr 2014 09:30:22 +0200 Subject: [PATCH 3/5] Fixes #998 --- radio/src/lua.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/radio/src/lua.cpp b/radio/src/lua.cpp index 8211ebd5b..fd2ec873f 100644 --- a/radio/src/lua.cpp +++ b/radio/src/lua.cpp @@ -637,9 +637,9 @@ static int luaModelGetOutput(lua_State *L) lua_pushtableboolean(L, "symetrical", limit->symetrical); lua_pushtableboolean(L, "revert", limit->revert); if (limit->curve) - lua_pushtablenil(L, "curve"); - else lua_pushtablenumber(L, "curve", limit->curve-1); + else + lua_pushtablenil(L, "curve"); } else { lua_pushnil(L); From 352066c7d18e89cca02f520c56ce73216785b866 Mon Sep 17 00:00:00 2001 From: bsongis Date: Sun, 20 Apr 2014 09:45:18 +0200 Subject: [PATCH 4/5] Merge bug in AppPreferencesDialog: Cancel button broken! --- companion/src/apppreferencesdialog.ui | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/companion/src/apppreferencesdialog.ui b/companion/src/apppreferencesdialog.ui index f3c967885..3e01c7c14 100644 --- a/companion/src/apppreferencesdialog.ui +++ b/companion/src/apppreferencesdialog.ui @@ -1146,5 +1146,21 @@ May be different from firmware language + + buttonBox + rejected() + AppPreferencesDialog + reject() + + + 408 + 835 + + + 286 + 274 + + + From 7f4d72c072adcb935134bbfd3f0d8d73e622a8f6 Mon Sep 17 00:00:00 2001 From: Andre Bernet Date: Sun, 20 Apr 2014 14:23:16 +0200 Subject: [PATCH 5/5] "Backup EEPROM" translatable --- radio/src/gui/menu_general.cpp | 2 +- radio/src/translations.cpp | 3 ++- radio/src/translations.h | 3 ++- radio/src/translations/cz.h.txt | 1 + radio/src/translations/de.h.txt | 1 + radio/src/translations/en.h.txt | 1 + radio/src/translations/es.h.txt | 1 + radio/src/translations/fi.h.txt | 1 + radio/src/translations/fr.h.txt | 1 + radio/src/translations/it.h.txt | 1 + radio/src/translations/pl.h.txt | 1 + radio/src/translations/pt.h.txt | 1 + radio/src/translations/se.h.txt | 1 + 13 files changed, 15 insertions(+), 3 deletions(-) diff --git a/radio/src/gui/menu_general.cpp b/radio/src/gui/menu_general.cpp index 35dfdc987..2459bfd04 100644 --- a/radio/src/gui/menu_general.cpp +++ b/radio/src/gui/menu_general.cpp @@ -1190,7 +1190,7 @@ void menuGeneralVersion(uint8_t event) #endif #if defined(PCBTARANIS) - lcd_putsLeft(7*FH, "\004[ENTER Long] to backup the EEPROM"); + lcd_putsLeft(7*FH, STR_EEBACKUP); if (event == EVT_KEY_LONG(KEY_ENTER)) { backupEeprom(); } diff --git a/radio/src/translations.cpp b/radio/src/translations.cpp index fc2e4bd25..0fa37e668 100644 --- a/radio/src/translations.cpp +++ b/radio/src/translations.cpp @@ -467,7 +467,8 @@ const pm_char STR_PATH_TOO_LONG[] PROGMEM = TR_PATH_TOO_LONG; const pm_char STR_VIEW_TEXT[] PROGMEM = TR_VIEW_TEXT; const pm_char STR_FLASH_BOOTLOADER[] PROGMEM = TR_FLASH_BOOTLOADER; const pm_char STR_WRITING[] PROGMEM = TR_WRITING; -const pm_char STR_CONFIRM_FORMAT[] PROGMEM = TR_CONFIRM_FORMAT; +const pm_char STR_CONFIRM_FORMAT[] PROGMEM = TR_CONFIRM_FORMAT; +const pm_char STR_EEBACKUP[] PROGMEM = TR_EEBACKUP; #if LCD_W >= 212 const pm_char STR_MODELNAME[] PROGMEM = TR_MODELNAME; diff --git a/radio/src/translations.h b/radio/src/translations.h index a786eefd5..2fff18ae0 100644 --- a/radio/src/translations.h +++ b/radio/src/translations.h @@ -618,7 +618,8 @@ extern const pm_char STR_PATH_TOO_LONG[]; extern const pm_char STR_VIEW_TEXT[]; extern const pm_char STR_FLASH_BOOTLOADER[]; extern const pm_char STR_WRITING[]; -extern const pm_char STR_CONFIRM_FORMAT[]; +extern const pm_char STR_CONFIRM_FORMAT[]; +extern const pm_char STR_EEBACKUP[]; #if defined(VOICE) && defined(CPUARM) struct LanguagePack { diff --git a/radio/src/translations/cz.h.txt b/radio/src/translations/cz.h.txt index 074c38796..9158b80a5 100644 --- a/radio/src/translations/cz.h.txt +++ b/radio/src/translations/cz.h.txt @@ -773,6 +773,7 @@ #define TR_SCRIPT "Skript" #define TR_INPUTS "Vstupy" #define TR_OUTPUTS "Výstupy" +#define TR_EEBACKUP "\004[ENTER Long] to backup the EEPROM" #if defined(MAVLINK) #define TR_MAVLINK_RC_RSSI_SCALE_LABEL "Max RSSI" diff --git a/radio/src/translations/de.h.txt b/radio/src/translations/de.h.txt index 65eea4c2d..05d7540ef 100644 --- a/radio/src/translations/de.h.txt +++ b/radio/src/translations/de.h.txt @@ -777,6 +777,7 @@ #define TR_SCRIPT "Lua-Script" #define TR_INPUTS "Inputs" #define TR_OUTPUTS "Outputs" +#define TR_EEBACKUP "\004[ENTER Long] to backup the EEPROM" #if defined(MAVLINK) #define TR_MAVLINK_RC_RSSI_SCALE_LABEL "Max RSSI" diff --git a/radio/src/translations/en.h.txt b/radio/src/translations/en.h.txt index 3ed7c9d0e..1b087d325 100644 --- a/radio/src/translations/en.h.txt +++ b/radio/src/translations/en.h.txt @@ -777,6 +777,7 @@ #define TR_SCRIPT "Script" #define TR_INPUTS "Inputs" #define TR_OUTPUTS "Outputs" +#define TR_EEBACKUP "\004[ENTER Long] to backup the EEPROM" #if defined(MAVLINK) #define TR_MAVLINK_RC_RSSI_SCALE_LABEL "Max RSSI" diff --git a/radio/src/translations/es.h.txt b/radio/src/translations/es.h.txt index f91ef07e2..2fceee467 100644 --- a/radio/src/translations/es.h.txt +++ b/radio/src/translations/es.h.txt @@ -773,6 +773,7 @@ #define TR_SCRIPT "Script" #define TR_INPUTS "Inputs" #define TR_OUTPUTS "Outputs" +#define TR_EEBACKUP "\004[ENTER Long] to backup the EEPROM" #if defined(MAVLINK) #define TR_MAVLINK_RC_RSSI_SCALE_LABEL "Max RSSI" diff --git a/radio/src/translations/fi.h.txt b/radio/src/translations/fi.h.txt index 54558a30e..3e094d87c 100644 --- a/radio/src/translations/fi.h.txt +++ b/radio/src/translations/fi.h.txt @@ -773,6 +773,7 @@ #define TR_SCRIPT "Script" #define TR_INPUTS "Inputs" #define TR_OUTPUTS "Outputs" +#define TR_EEBACKUP "\004[ENTER Long] to backup the EEPROM" #if defined(MAVLINK) #define TR_MAVLINK_RC_RSSI_SCALE_LABEL "Max RSSI" diff --git a/radio/src/translations/fr.h.txt b/radio/src/translations/fr.h.txt index 6fc1521dc..af481a1ef 100644 --- a/radio/src/translations/fr.h.txt +++ b/radio/src/translations/fr.h.txt @@ -773,6 +773,7 @@ #define TR_SCRIPT "Script" #define TR_INPUTS "Entrées" #define TR_OUTPUTS "Sorties" +#define TR_EEBACKUP "\004[ENTER Long]: Sauvegarder l'EEPROM" #if defined(MAVLINK) #define TR_MAVLINK_RC_RSSI_SCALE_LABEL "RSSI Max" diff --git a/radio/src/translations/it.h.txt b/radio/src/translations/it.h.txt index a1552b616..24cfdb453 100644 --- a/radio/src/translations/it.h.txt +++ b/radio/src/translations/it.h.txt @@ -773,6 +773,7 @@ #define TR_SCRIPT "Script" #define TR_INPUTS "Inputs" #define TR_OUTPUTS "Outputs" +#define TR_EEBACKUP "\004[ENTER Long] to backup the EEPROM" #if defined(MAVLINK) #define TR_MAVLINK_RC_RSSI_SCALE_LABEL "Max RSSI" diff --git a/radio/src/translations/pl.h.txt b/radio/src/translations/pl.h.txt index 4c7845b36..18c1c21b7 100644 --- a/radio/src/translations/pl.h.txt +++ b/radio/src/translations/pl.h.txt @@ -773,6 +773,7 @@ #define TR_SCRIPT "Skrypt" #define TR_INPUTS "Wejścia" #define TR_OUTPUTS "Wyjścia" +#define TR_EEBACKUP "\004[ENTER Long] to backup the EEPROM" #if defined(MAVLINK) #define TR_MAVLINK_RC_RSSI_SCALE_LABEL "Maks RSSI" diff --git a/radio/src/translations/pt.h.txt b/radio/src/translations/pt.h.txt index b895ba6e7..dd14c5ed2 100644 --- a/radio/src/translations/pt.h.txt +++ b/radio/src/translations/pt.h.txt @@ -773,6 +773,7 @@ #define TR_SCRIPT "Script" #define TR_INPUTS "Inputs" #define TR_OUTPUTS "Outputs" +#define TR_EEBACKUP "\004[ENTER Long] to backup the EEPROM" #if defined(MAVLINK) #define TR_MAVLINK_RC_RSSI_SCALE_LABEL "Max RSSI" diff --git a/radio/src/translations/se.h.txt b/radio/src/translations/se.h.txt index b892839dd..085a74532 100644 --- a/radio/src/translations/se.h.txt +++ b/radio/src/translations/se.h.txt @@ -773,6 +773,7 @@ #define TR_SCRIPT "Programkod" #define TR_INPUTS "Input" #define TR_OUTPUTS "Outputs" +#define TR_EEBACKUP "\004[ENTER Long] to backup the EEPROM" #if defined(MAVLINK) #define TR_MAVLINK_RC_RSSI_SCALE_LABEL "Max RSSI"