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

Gyro setup UI

Browse Source
This commit is contained in:
3djc
2019-04-03 11:52:05 +02:00
parent 7b6314abd1
commit 5a855df928
15 changed files with 79 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/gui/128x64/radio_setup.cpp
+34
View File
@@ -70,6 +70,9 @@ enum MenuRadioSetupItems {
CASE_HAPTIC(ITEM_SETUP_HAPTIC_MODE)
CASE_HAPTIC(ITEM_SETUP_HAPTIC_LENGTH)
CASE_HAPTIC(ITEM_SETUP_HAPTIC_STRENGTH)
CASE_GYRO(ITEM_SETUP_GYRO_LABEL)
CASE_GYRO(ITEM_SETUP_GYRO_MAX)
CASE_GYRO(ITEM_SETUP_GYRO_OFFSET)
ITEM_SETUP_CONTRAST,
ITEM_SETUP_ALARMS_LABEL,
ITEM_SETUP_BATTERY_WARNING,
@@ -149,6 +152,9 @@ void menuRadioSetup(event_t event)
CASE_HAPTIC(0)
CASE_HAPTIC(0)
CASE_HAPTIC(0)
CASE_GYRO(LABEL(GYRO))
CASE_GYRO(0)
CASE_GYRO(0)
0, LABEL(ALARMS), 0, CASE_CAPACITY(0)
CASE_PCBSKY9X(0)
0, 0, 0, 0, IF_ROTARY_ENCODERS(0)
@@ -370,7 +376,35 @@ void menuRadioSetup(event_t event)
SLIDER_5POS(y, g_eeGeneral.hapticStrength, STR_HAPTICSTRENGTH, event, attr);
break;
#endif
#if defined(GYRO)
case ITEM_SETUP_GYRO_LABEL:
lcdDrawTextAlignedLeft(y, STR_GYRO_LABEL);
break;
case ITEM_SETUP_GYRO_MAX:
lcdDrawTextAlignedLeft(y, STR_GYRO_MAX);
lcdDrawNumber(RADIO_SETUP_2ND_COLUMN, y, 30 + g_eeGeneral.gyroMax, attr|LEFT);
lcdDrawChar(lcdLastRightPos, y, '@', attr);
if (attr) {
CHECK_INCDEC_GENVAR(event, g_eeGeneral.gyroMax, -20, 60);
lcdDrawText(LCD_W-4*FW, y, "(");
lcdDrawNumber(lcdLastRightPos, y, max(abs(gyro.outputs[0]), abs(gyro.outputs[1])) * 180 / 1024);
lcdDrawText(lcdLastRightPos, y, ")");
}
break;
case ITEM_SETUP_GYRO_OFFSET:
lcdDrawTextAlignedLeft(y, STR_GYRO_OFFSET);
lcdDrawNumber(RADIO_SETUP_2ND_COLUMN, y, g_eeGeneral.gyroOffset, attr|LEFT);
lcdDrawChar(lcdLastRightPos, y, '@', attr);
if (attr) {
CHECK_INCDEC_GENVAR(event, g_eeGeneral.gyroOffset, 10, 90);
lcdDrawText(LCD_W-4*FW, y, "(");
lcdDrawNumber(lcdLastRightPos, y, gyro.outputs[0] * 180 / 1024);
lcdDrawText(lcdLastRightPos, y, ")");
}
break;
#endif
case ITEM_SETUP_CONTRAST:
lcdDrawTextAlignedLeft(y, STR_CONTRAST);
lcdDrawNumber(RADIO_SETUP_2ND_COLUMN, y, g_eeGeneral.contrast, attr|LEFT);
radio/src/opentx.h
+6
View File
@@ -57,6 +57,12 @@
#define CASE_VARIO(x)
#endif
#if defined(GYRO)
#define CASE_GYRO(x) x,
#else
#define CASE_GYRO(x)
#endif
#if defined(LUA)
#define CASE_LUA(x) x,
#else
radio/src/translations.cpp
+3
View File
@@ -208,6 +208,9 @@ const char STR_SPKRPITCH[] = TR_SPKRPITCH;
#if defined(HAPTIC)
const char STR_HAPTIC_LABEL[] = TR_HAPTIC_LABEL;
const char STR_HAPTICSTRENGTH[] = TR_HAPTICSTRENGTH;
const char STR_GYRO_LABEL[] = TR_GYRO_LABEL;
const char STR_GYRO_OFFSET[] = TR_GYRO_OFFSET;
const char STR_GYRO_MAX[] = TR_GYRO_MAX;
#endif
const char STR_CONTRAST[] = TR_CONTRAST;
const char STR_ALARMS_LABEL[] = TR_ALARMS_LABEL;
radio/src/translations.h
+3
View File
@@ -426,6 +426,9 @@ extern const char STR_BEEP_LENGTH[];
extern const char STR_SPKRPITCH[];
extern const char STR_HAPTIC_LABEL[];
extern const char STR_HAPTICSTRENGTH[];
extern const char STR_GYRO_LABEL[];
extern const char STR_GYRO_OFFSET[];
extern const char STR_GYRO_MAX[];
extern const char STR_CONTRAST[];
extern const char STR_ALARMS_LABEL[];
extern const char STR_BATTERY_RANGE[];
radio/src/translations/cz.h.txt
+3
View File
@@ -631,6 +631,9 @@
#define TR_SPKRPITCH INDENT"Tón"
#define TR_HAPTIC_LABEL "Vibrace"
#define TR_HAPTICSTRENGTH INDENT"Síla"
#define TR_GYRO_LABEL "Gyro"
#define TR_GYRO_OFFSET INDENT "Offset"
#define TR_GYRO_MAX INDENT "Max"
#define TR_CONTRAST "Kontrast LCD"
#define TR_ALARMS_LABEL "Alarmy"
#define TR_BATTERY_RANGE TR("Ukazatel bat.", "Ukazatel baterie")
radio/src/translations/de.h.txt
+3
View File
@@ -636,6 +636,9 @@
#define TR_SPKRPITCH INDENT "Beep-Freq. +/-"
#define TR_HAPTIC_LABEL "Haptik"
#define TR_HAPTICSTRENGTH INDENT "Stärke"
#define TR_GYRO_LABEL "Gyro"
#define TR_GYRO_OFFSET INDENT "Offset"
#define TR_GYRO_MAX INDENT "Max"
#define TR_CONTRAST "LCD-Kontrast"
#define TR_ALARMS_LABEL "Alarme"
#define TR_BATTERY_RANGE TR("Akku Bereich", "Akku Spgannungsbereich") // Symbol Akku Ladezustand
radio/src/translations/en.h.txt
+3
View File
@@ -642,6 +642,9 @@
#define TR_SPKRPITCH INDENT "Beep pitch"
#define TR_HAPTIC_LABEL "Haptic"
#define TR_HAPTICSTRENGTH INDENT "Strength"
#define TR_GYRO_LABEL "Gyro"
#define TR_GYRO_OFFSET INDENT "Offset"
#define TR_GYRO_MAX INDENT "Max"
#define TR_CONTRAST "Contrast"
#define TR_ALARMS_LABEL "Alarms"
#define TR_BATTERY_RANGE TR("Battery range", "Battery meter range")
radio/src/translations/es.h.txt
+3
View File
@@ -639,6 +639,9 @@
#define TR_SPKRPITCH INDENT"Tono"
#define TR_HAPTIC_LABEL "Tactil"
#define TR_HAPTICSTRENGTH INDENT"Intensidad"
#define TR_GYRO_LABEL "Gyro"
#define TR_GYRO_OFFSET INDENT "Offset"
#define TR_GYRO_MAX INDENT "Max"
#define TR_CONTRAST "Contraste"
#define TR_ALARMS_LABEL "Alarmas"
#define TR_BATTERY_RANGE TR("Rango bateria","Rango medidor Bater")
radio/src/translations/fi.h.txt
+3
View File
@@ -631,6 +631,9 @@
#define TR_SPKRPITCH INDENT"Pitch"
#define TR_HAPTIC_LABEL "Haptic"
#define TR_HAPTICSTRENGTH INDENT"Strength"
#define TR_GYRO_LABEL "Gyro"
#define TR_GYRO_OFFSET INDENT "Offset"
#define TR_GYRO_MAX INDENT "Max"
#define TR_CONTRAST "Contrast"
#define TR_ALARMS_LABEL "Alarms"
#define TR_BATTERY_RANGE TR("Battery range","Battery meter range")
radio/src/translations/fr.h.txt
+3
View File
@@ -648,6 +648,9 @@
#define TR_SPKRPITCH INDENT "Tonalité"
#define TR_HAPTIC_LABEL "Vibreur"
#define TR_HAPTICSTRENGTH INDENT "Force"
#define TR_GYRO_LABEL "Gyro"
#define TR_GYRO_OFFSET INDENT "Offset"
#define TR_GYRO_MAX INDENT "Max"
#define TR_CONTRAST "Contraste"
#define TR_ALARMS_LABEL "Alarmes"
#define TR_BATTERY_RANGE "Plage batterie"
radio/src/translations/it.h.txt
+3
View File
@@ -637,6 +637,9 @@
#define TR_SPKRPITCH INDENT"Tono"
#define TR_HAPTIC_LABEL "Vibraz"
#define TR_HAPTICSTRENGTH INDENT"Forza"
#define TR_GYRO_LABEL "Gyro"
#define TR_GYRO_OFFSET INDENT "Offset"
#define TR_GYRO_MAX INDENT "Max"
#define TR_CONTRAST "Contrasto"
#define TR_ALARMS_LABEL "Allarmi"
#define TR_BATTERY_RANGE TR("Interv. Batt", "Intervallo batteria")
radio/src/translations/nl.h.txt
+3
View File
@@ -632,6 +632,9 @@
#define TR_SPKRPITCH INDENT "Piep-Freq. +/-"
#define TR_HAPTIC_LABEL "Haptic"
#define TR_HAPTICSTRENGTH INDENT "Sterkte"
#define TR_GYRO_LABEL "Gyro"
#define TR_GYRO_OFFSET INDENT "Offset"
#define TR_GYRO_MAX INDENT "Max"
#define TR_CONTRAST "LCD-Kontrast"
#define TR_ALARMS_LABEL "Alarm"
#define TR_BATTERY_RANGE TR("Accu Bereik", "Accu Spngs-Bereik") // Symbol Akku Ladezustand
radio/src/translations/pl.h.txt
+3
View File
@@ -638,6 +638,9 @@
#define TR_SPKRPITCH INDENT"Dźwięk"
#define TR_HAPTIC_LABEL "Wibracja"
#define TR_HAPTICSTRENGTH INDENT"Siła"
#define TR_GYRO_LABEL "Gyro"
#define TR_GYRO_OFFSET INDENT "Offset"
#define TR_GYRO_MAX INDENT "Max"
#define TR_CONTRAST "Kontrast"
#define TR_ALARMS_LABEL "Alarmy"
#define TR_BATTERY_RANGE TR("PokażPasBat.", "Pokaż pasek bateri")
radio/src/translations/pt.h.txt
+3
View File
@@ -638,6 +638,9 @@
#define TR_SPKRPITCH INDENT"Pitch"
#define TR_HAPTIC_LABEL "Vibrar"
#define TR_HAPTICSTRENGTH INDENT"Forca"
#define TR_GYRO_LABEL "Gyro"
#define TR_GYRO_OFFSET INDENT "Offset"
#define TR_GYRO_MAX INDENT "Max"
#define TR_CONTRAST "Contraste"
#define TR_ALARMS_LABEL "Alarmes"
#define TR_BATTERY_RANGE "Battery Range"
radio/src/translations/se.h.txt
+3
View File
@@ -650,6 +650,9 @@
#define TR_SPKRPITCH INDENT "Pip-ton"
#define TR_HAPTIC_LABEL "Vibrator"
#define TR_HAPTICSTRENGTH INDENT"Styrka"
#define TR_GYRO_LABEL "Gyro"
#define TR_GYRO_OFFSET INDENT "Offset"
#define TR_GYRO_MAX INDENT "Max"
#define TR_CONTRAST "Kontrast"
#define TR_ALARMS_LABEL "Alarm"
#define TR_BATTERY_RANGE "Batteri-MinMax"