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

Merge branch 'upstream/next'

Browse Source
This commit is contained in:
Damjan Adamic
2014-04-20 22:17:25 +02:00
parent 27600ba37e 7f4d72c072
commit 3d35273f4f
20 changed files with 50 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
companion/src/apppreferencesdialog.ui
+16
View File
@@ -1146,5 +1146,21 @@ May be different from firmware language</string>
</hint>
</hints>
</connection>
<connection>
<sender>buttonBox</sender>
<signal>rejected()</signal>
<receiver>AppPreferencesDialog</receiver>
<slot>reject()</slot>
<hints>
<hint type="sourcelabel">
<x>408</x>
<y>835</y>
</hint>
<hint type="destinationlabel">
<x>286</x>
<y>274</y>
</hint>
</hints>
</connection>
</connections>
</ui>
companion/src/mainwindow.cpp
+1
View File
@@ -102,6 +102,7 @@ MainWindow::MainWindow():
updateMenus();
restoreState(g.mainWinState());
restoreGeometry(g.mainWinGeo());
setUnifiedTitleAndToolBarOnMac(true);
this->setWindowIcon(QIcon(":/icon.png"));
radio/src/gui/menu_general.cpp
+1 -1
View File
@@ -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();
}
radio/src/gui/menu_model.cpp
+2
View File
@@ -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);
radio/src/gui/menus.cpp
+12 -2
View File
@@ -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;
radio/src/gui/menus.h
+1
View File
@@ -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)
radio/src/keys.h
+1
View File
@@ -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
radio/src/lua.cpp
+2 -2
View File
@@ -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);
radio/src/translations.cpp
+2 -1
View File
@@ -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;
radio/src/translations.h
+2 -1
View File
@@ -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 {
radio/src/translations/cz.h.txt
+1
View File
@@ -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"
radio/src/translations/de.h.txt
+1
View File
@@ -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"
radio/src/translations/en.h.txt
+1
View File
@@ -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"
radio/src/translations/es.h.txt
+1
View File
@@ -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"
radio/src/translations/fi.h.txt
+1
View File
@@ -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"
radio/src/translations/fr.h.txt
+1
View File
@@ -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"
radio/src/translations/it.h.txt
+1
View File
@@ -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"
radio/src/translations/pl.h.txt
+1
View File
@@ -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"
radio/src/translations/pt.h.txt
+1
View File
@@ -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"
radio/src/translations/se.h.txt
+1
View File
@@ -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"