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

cosmetics

Browse Source
This commit is contained in:
3djc
2019-04-03 12:57:41 +02:00
parent dd2403cbd5
commit 60d5e16526
14 changed files with 34 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/gui/128x64/radio_setup.cpp
+7 -5
View File
@@ -376,17 +376,18 @@ 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);
lcdDrawText(INDENT_WIDTH, y, STR_GYRO_MAX);
lcdDrawNumber(RADIO_SETUP_2ND_COLUMN, y, GYRO_MAX_DEFAULT + g_eeGeneral.gyroMax, attr|LEFT);
lcdDrawChar(lcdLastRightPos, y, '@', attr);
if (attr) {
CHECK_INCDEC_GENVAR(event, g_eeGeneral.gyroMax, -20, 60);
CHECK_INCDEC_GENVAR(event, g_eeGeneral.gyroMax, GYRO_MAX_DEFAULT - GYRO_MAX_RANGE, GYRO_MAX_DEFAULT + GYRO_MAX_RANGE);
lcdDrawText(LCD_W-4*FW, y, "(");
lcdDrawNumber(lcdLastRightPos, y, max(abs(gyro.outputs[0]), abs(gyro.outputs[1])) * 180 / 1024);
lcdDrawText(lcdLastRightPos, y, ")");
@@ -394,17 +395,18 @@ void menuRadioSetup(event_t event)
break;
case ITEM_SETUP_GYRO_OFFSET:
lcdDrawTextAlignedLeft(y, STR_GYRO_OFFSET);
lcdDrawText(INDENT_WIDTH, 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);
CHECK_INCDEC_GENVAR(event, g_eeGeneral.gyroOffset, GYRO_OFFSET_MIN, GYRO_OFFSET_MAX);
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/storage/datacopy.cpp
+1 -1
View File
@@ -1,4 +1,4 @@
//This file was auto-generated by generate_datacopy.py script on Wed Apr 3 12:26:41 2019. Do not edit this file!
//This file was auto-generated by generate_datacopy.py script on Wed Apr 3 12:29:34 2019. Do not edit this file!
radio/src/targets/taranis/board.h
+4
View File
@@ -811,5 +811,9 @@ extern DMAFifo<32> serial2RxFifo;
#define GYRO_BUFFER_LENGTH (GYRO_VALUES_COUNT * sizeof(int16_t))
int gyroInit();
int gyroRead(uint8_t buffer[GYRO_BUFFER_LENGTH]);
#define GYRO_MAX_DEFAULT 30
#define GYRO_MAX_RANGE 60
#define GYRO_OFFSET_MIN 10
#define GYRO_OFFSET_MAX 90
#endif // _BOARD_H_
radio/src/translations/cz.h.txt
+2 -2
View File
@@ -632,8 +632,8 @@
#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_GYRO_OFFSET "Offset"
#define TR_GYRO_MAX "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
+2 -2
View File
@@ -637,8 +637,8 @@
#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_GYRO_OFFSET "Offset"
#define TR_GYRO_MAX "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
+2 -2
View File
@@ -643,8 +643,8 @@
#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_GYRO_OFFSET "Offset"
#define TR_GYRO_MAX "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
+2 -2
View File
@@ -640,8 +640,8 @@
#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_GYRO_OFFSET "Offset"
#define TR_GYRO_MAX "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
+2 -2
View File
@@ -632,8 +632,8 @@
#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_GYRO_OFFSET "Offset"
#define TR_GYRO_MAX "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
+2 -2
View File
@@ -649,8 +649,8 @@
#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_GYRO_OFFSET "Offset"
#define TR_GYRO_MAX "Max"
#define TR_CONTRAST "Contraste"
#define TR_ALARMS_LABEL "Alarmes"
#define TR_BATTERY_RANGE "Plage batterie"
radio/src/translations/it.h.txt
+2 -2
View File
@@ -638,8 +638,8 @@
#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_GYRO_OFFSET "Offset"
#define TR_GYRO_MAX "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
+2 -2
View File
@@ -633,8 +633,8 @@
#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_GYRO_OFFSET "Offset"
#define TR_GYRO_MAX "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
+2 -2
View File
@@ -639,8 +639,8 @@
#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_GYRO_OFFSET "Offset"
#define TR_GYRO_MAX "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
+2 -2
View File
@@ -639,8 +639,8 @@
#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_GYRO_OFFSET "Offset"
#define TR_GYRO_MAX "Max"
#define TR_CONTRAST "Contraste"
#define TR_ALARMS_LABEL "Alarmes"
#define TR_BATTERY_RANGE "Battery Range"
radio/src/translations/se.h.txt
+2 -2
View File
@@ -651,8 +651,8 @@
#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_GYRO_OFFSET "Offset"
#define TR_GYRO_MAX "Max"
#define TR_CONTRAST "Kontrast"
#define TR_ALARMS_LABEL "Alarm"
#define TR_BATTERY_RANGE "Batteri-MinMax"