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

Cosmetics mostly

Browse Source
This commit is contained in:
3djc
2019-02-22 07:24:31 +01:00
parent c76992c126
commit 2dc061ec44
16 changed files with 36 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/gui/128x64/model_setup.cpp
+8 -6
View File
@@ -323,11 +323,11 @@ void runPopupRegister(event_t event)
drawMessageBox();
lcdDrawText(WARNING_LINE_X, WARNING_LINE_Y - 3, "Reg. ID");
lcdDrawText(WARNING_LINE_X, WARNING_LINE_Y - 3, STR_REG_ID);
editName(WARNING_LINE_X + 8*FW, WARNING_LINE_Y - 3, g_model.modelRegistrationID, PXX2_LEN_REGISTRATION_ID, event, menuVerticalPosition == 0);
if (reusableBuffer.modelSetup.pxx2.registerStep >= REGISTER_RX_NAME_RECEIVED) {
lcdDrawText(WARNING_LINE_X, WARNING_LINE_Y - 2 + FH, "Rx Name");
lcdDrawText(WARNING_LINE_X, WARNING_LINE_Y - 2 + FH, STR_RX_NAME);
editName(WARNING_LINE_X + 8*FW, WARNING_LINE_Y - 2 + FH, reusableBuffer.modelSetup.pxx2.registerRxName, PXX2_LEN_RX_NAME, event, menuVerticalPosition == 1);
}
@@ -394,7 +394,7 @@ void menuModelSetup(event_t event)
IF_PXX2(0), // RxNum
ANTENNA_ROW
IF_INTERNAL_MODULE_ON(FAILSAFE_ROWS(INTERNAL_MODULE)), // Module start channel (pxx2 always send 16)
IF_PXX2_RECEIVER_DISPLAYED(INTERNAL_MODULE, 0, 1), // Range check and Register buttons
IF_PXX2(1), // Range check and Register buttons
IF_PXX2_RECEIVER_DISPLAYED(INTERNAL_MODULE, 0, (uint8_t)-1), // Receiver Name
IF_PXX2_RECEIVER_DISPLAYED(INTERNAL_MODULE, 0, 0), // Receiver Range
IF_PXX2_RECEIVER_DISPLAYED(INTERNAL_MODULE, 0, 0), // Receiver Telemetry
@@ -1158,7 +1158,7 @@ void menuModelSetup(event_t event)
case ITEM_MODEL_EXTERNAL_MODULE_PXX2_RANGE_REGISTER:
{
uint8_t moduleIdx = CURRENT_MODULE_EDITED(k);
lcdDrawTextAlignedLeft(y, INDENT "Module");
lcdDrawTextAlignedLeft(y, STR_MODULE);
lcdDrawText(MODEL_SETUP_2ND_COLUMN, y, STR_MODULE_RANGE, (menuHorizontalPosition == 0 ? attr : 0));
lcdDrawText(lcdLastRightPos, y, "[Reg]", (menuHorizontalPosition == 1 ? attr : 0));
if (attr) {
@@ -1191,8 +1191,8 @@ void menuModelSetup(event_t event)
case ITEM_MODEL_EXTERNAL_MODULE_PXX2_ADD_RECEIVER:
{
uint8_t moduleIdx = CURRENT_MODULE_EDITED(k);
lcdDrawText(INDENT_WIDTH, y, "Receiver");
lcdDrawText(MODEL_SETUP_2ND_COLUMN, y, "[Add]", attr);
lcdDrawTextAlignedLeft(y, STR_RECEIVER);
lcdDrawText(MODEL_SETUP_2ND_COLUMN, y, STR_RXADD_BUTTON, attr);
if (attr && s_editMode > 0) {
if (g_model.moduleData[moduleIdx].pxx2.receivers[0].enabled) {
g_model.moduleData[moduleIdx].pxx2.receivers[1].enabled = 0x01;
@@ -1206,6 +1206,7 @@ void menuModelSetup(event_t event)
}
killEvents(event);
s_editMode = 0;
storageDirty(EE_MODEL);
}
}
break;
@@ -1294,6 +1295,7 @@ void menuModelSetup(event_t event)
memclear(&g_model.moduleData[moduleIdx].pxx2.receivers[receiverIdx], sizeof(ReceiverData));
s_editMode = 0;
killEvents(event);
storageDirty(EE_MODEL);
}
}
}
radio/src/io/frsky_pxx2.h
+1 -1
View File
@@ -21,7 +21,7 @@
#ifndef _IO_PXX2_H_
#define _IO_PXX2_H_
#include "fifo.h"
#include "../fifo.h"
#define PXX2_BAUDRATE 230400
#define PXX2_PERIOD 4 // 4ms
radio/src/telemetry/frsky.h
+1 -1
View File
@@ -23,7 +23,7 @@
#include "../definitions.h"
#include "telemetry_holders.h"
#include "io/frsky_pxx2.h"
#include "../io/frsky_pxx2.h"
// Receive buffer state machine state enum
enum FrSkyDataState {
radio/src/translations.cpp
+2
View File
@@ -584,6 +584,7 @@ const char STR_BLCOLOR[] = TR_BLCOLOR;
const char STR_TRAINER[] = TR_TRAINER;
const char STR_MODULE_BIND[] = TR_MODULE_BIND;
const char STR_RXADD_BUTTON[] = TR_RXADD_BUTTON;
const char STR_BINDING_1_8_TELEM_ON[] = TR_BINDING_CH1_8_TELEM_ON;
const char STR_BINDING_1_8_TELEM_OFF[] = TR_BINDING_CH1_8_TELEM_OFF;
const char STR_BINDING_9_16_TELEM_ON[] = TR_BINDING_CH9_16_TELEM_ON;
@@ -652,6 +653,7 @@ const char STR_BLCOLOR[] = TR_BLCOLOR;
const char STR_BYTES[] = TR_BYTES;
const char STR_ANTENNAPROBLEM[] = TR_ANTENNAPROBLEM;
const char STR_MODULE[] = TR_MODULE;
const char STR_RX_NAME[] = TR_RX_NAME;
const char STR_ENABLE_POPUP[] = TR_ENABLE_POPUP;
const char STR_DISABLE_POPUP[] = TR_DISABLE_POPUP;
const char STR_POPUP[] = TR_POPUP;
radio/src/translations.h
+2
View File
@@ -849,6 +849,7 @@ extern const char STR_EXPONAME[];
extern const char STR_TRAINER[];
extern const char STR_MODULE_BIND[];
extern const char STR_RXADD_BUTTON[];
extern const char STR_BINDING_1_8_TELEM_ON[];
extern const char STR_BINDING_1_8_TELEM_OFF[];
extern const char STR_BINDING_9_16_TELEM_ON[];
@@ -917,6 +918,7 @@ extern const char STR_MULTI_RFPOWER[];
extern const char STR_BYTES[];
extern const char STR_ANTENNAPROBLEM[];
extern const char STR_MODULE[];
extern const char STR_RX_NAME[];
extern const char STR_ENABLE_POPUP[];
extern const char STR_DISABLE_POPUP[];
extern const char STR_POPUP[];
radio/src/translations/cz.h.txt
+2
View File
@@ -961,6 +961,7 @@
#define TR_BUZZER INDENT"Pípák"
#define TR_BYTES "[B]"
#define TR_MODULE_BIND BUTTON(TR("Bnd", "Bind"))
#define TR_RXADD_BUTTON "BUTTON(Add)"
#define TR_MODULE_RANGE BUTTON(TR("Rng", "Range"))
#define TR_DEL_BUTTON BUTTON(TR("Del", "Delete"))
#define TR_RESET_BTN BUTTON("Reset")
@@ -969,6 +970,7 @@
#define TR_ANTENNAPROBLEM CENTER "Problém s TX anténou!"
#define TR_MODELIDUSED TR("ID již použito","ID modelu je již použito")
#define TR_MODULE INDENT "Modul"
#define TR_RX_NAME "Rx Name"
#define TR_TELEMETRY_TYPE TR("Typ", "Typ telemetrie")
#define TR_TELEMETRY_SENSORS "Senzory"
#define TR_VALUE "Hodnota"
radio/src/translations/de.h.txt
+2
View File
@@ -966,6 +966,7 @@
#define TR_BUZZER INDENT "Summer"
#define TR_BYTES "Bytes"
#define TR_MODULE_BIND BUTTON(TR("Bnd","Bind")) //9XR-Pro
#define TR_RXADD_BUTTON "BUTTON(Add)"
#define TR_MODULE_RANGE BUTTON(TR("Rng", "Range")) //9XR-Pro
#define TR_DEL_BUTTON BUTTON(TR("Del", "Delete"))
#define TR_RESET_BTN BUTTON("Reset")
@@ -974,6 +975,7 @@
#define TR_ANTENNAPROBLEM CENTER "TX-Antennenproblem!"
#define TR_MODELIDUSED TR("ID schon benutzt", "Modell-ID schon benutzt")
#define TR_MODULE INDENT "Modul-Typ"
#define TR_RX_NAME "Rx Name"
#define TR_TELEMETRY_TYPE TR("Typ", "Telemetrietyp")
#define TR_TELEMETRY_SENSORS "Sensoren"
#define TR_VALUE "Wert"
radio/src/translations/en.h.txt
+2
View File
@@ -965,6 +965,7 @@
#define TR_BUZZER INDENT "Buzzer"
#define TR_BYTES "bytes"
#define TR_MODULE_BIND BUTTON(TR("Bnd", "Bind"))
#define TR_RXADD_BUTTON BUTTON("Add")
#define TR_MODULE_RANGE BUTTON(TR("Rng", "Range"))
#define TR_DEL_BUTTON BUTTON(TR("Del", "Delete"))
#define TR_RESET_BTN BUTTON("Reset")
@@ -977,6 +978,7 @@
#define TR_MODELIDUSED TR("ID used in:","Receiver ID used in:")
#endif
#define TR_MODULE INDENT "Module"
#define TR_RX_NAME "Rx Name"
#define TR_TELEMETRY_TYPE TR("Type", "Telemetry type")
#define TR_TELEMETRY_SENSORS "Sensors"
#define TR_VALUE "Value"
radio/src/translations/es.h.txt
+2
View File
@@ -972,6 +972,7 @@
#define TR_BUZZER INDENT"Zumbador"
#define TR_BYTES "bytes"
#define TR_MODULE_BIND "[Enlace]"
#define TR_RXADD_BUTTON "BUTTON(Add)"
#define TR_MODULE_RANGE "[Limites]"
#define TR_DEL_BUTTON BUTTON(TR("Del", "Delete"))
#define TR_RESET_BTN "[Reset]"
@@ -980,6 +981,7 @@
#define TR_ANTENNAPROBLEM CENTER "¡Problema antena TX!"
#define TR_MODELIDUSED TR("ID en uso", "ID modelo en uso")
#define TR_MODULE INDENT "Modulo"
#define TR_RX_NAME "Rx Name"
#define TR_TELEMETRY_TYPE TR("Type", "Telemetry Type")
#define TR_TELEMETRY_SENSORS "Sensors"
#define TR_VALUE "Value"
radio/src/translations/fi.h.txt
+2
View File
@@ -964,6 +964,7 @@
#define TR_BUZZER INDENT"Buzzer"
#define TR_BYTES "bytes"
#define TR_MODULE_BIND "[Bind]"
#define TR_RXADD_BUTTON "BUTTON(Add)"
#define TR_MODULE_RANGE "[Range]"
#define TR_DEL_BUTTON BUTTON(TR("Del", "Delete"))
#define TR_RESET_BTN "[Reset]"
@@ -972,6 +973,7 @@
#define TR_ANTENNAPROBLEM CENTER "TX Antenna problem!"
#define TR_MODELIDUSED TR("ID used in:", "Receiver ID used in:")
#define TR_MODULE INDENT "Module"
#define TR_RX_NAME "Rx Name"
#define TR_TELEMETRY_TYPE TR("Type", "Telemetry Type")
#define TR_TELEMETRY_SENSORS "Sensors"
#define TR_VALUE "Value"
radio/src/translations/fr.h.txt
+2
View File
@@ -976,6 +976,7 @@
#define TR_BUZZER INDENT "Bipeur"
#define TR_BYTES "bytes"
#define TR_MODULE_BIND BUTTON(TR("Bnd", "Bind"))
#define TR_RXADD_BUTTON "BUTTON(Add)"
#define TR_MODULE_RANGE BUTTON(TR("Prt", "Port."))
#define TR_DEL_BUTTON BUTTON(TR("Del", "Delete"))
#define TR_RESET_BTN BUTTON("RAZ")
@@ -984,6 +985,7 @@
#define TR_ANTENNAPROBLEM CENTER "Antenne radio défectueuse!"
#define TR_MODELIDUSED TR("ID affecté à :", "No de récepteur utilisé par :")
#define TR_MODULE INDENT "Type de module"
#define TR_RX_NAME "Rx Name"
#define TR_TELEMETRY_TYPE TR("Type tél.", "Type télémétrie")
#define TR_TELEMETRY_SENSORS "Capteurs"
#define TR_VALUE "Valeur"
radio/src/translations/it.h.txt
+2
View File
@@ -966,6 +966,7 @@
#define TR_BUZZER INDENT"Buzzer"
#define TR_BYTES "Bytes"
#define TR_MODULE_BIND "[Bind]"
#define TR_RXADD_BUTTON "BUTTON(Add)"
#define TR_MODULE_RANGE "[Range]"
#define TR_DEL_BUTTON BUTTON(TR("Del", "Delete"))
#define TR_RESET_BTN "[Reset]"
@@ -974,6 +975,7 @@
#define TR_ANTENNAPROBLEM CENTER "Problemi antenna TX!"
#define TR_MODELIDUSED TR("ID già usato","ID Modello già usato")
#define TR_MODULE INDENT "Modulo"
#define TR_RX_NAME "Rx Name"
#define TR_TELEMETRY_TYPE "Tipo Telemetria"
#define TR_TELEMETRY_SENSORS "Sensori"
#define TR_VALUE "Valore"
radio/src/translations/nl.h.txt
+2
View File
@@ -967,6 +967,7 @@
#define TR_BUZZER INDENT "Zoemer"
#define TR_BYTES "bytes"
#define TR_MODULE_BIND TR("[Bnd]", "[Bind]")
#define TR_RXADD_BUTTON "BUTTON(Add)"
#define TR_MODULE_RANGE TR("[Rng]", "[Range]")
#define TR_DEL_BUTTON BUTTON(TR("Del", "Delete"))
#define TR_RESET_BTN "[Reset]"
@@ -975,6 +976,7 @@
#define TR_ANTENNAPROBLEM CENTER "TX-Antenneprobleem!"
#define TR_MODELIDUSED TR("ID al gebruikt", "Model-ID al gebruikt")
#define TR_MODULE INDENT "Module-Type"
#define TR_RX_NAME "Rx Name"
#define TR_TELEMETRY_TYPE TR("Type", "Telemetrietype")
#define TR_TELEMETRY_SENSORS "Sensoren"
#define TR_VALUE "Waarde"
radio/src/translations/pl.h.txt
+2
View File
@@ -967,6 +967,7 @@
#define TR_BUZZER INDENT"Brzęczyk"
#define TR_BYTES "bajty"
#define TR_MODULE_BIND TR("[BND]","[Bind]")
#define TR_RXADD_BUTTON "BUTTON(Add)"
#define TR_MODULE_RANGE TR("[Zas]","Zasięg")
#define TR_DEL_BUTTON BUTTON(TR("Del", "Delete"))
#define TR_RESET_BTN "[Reset]"
@@ -975,6 +976,7 @@
#define TR_ANTENNAPROBLEM CENTER "Problem z anteną TX"
#define TR_MODELIDUSED TR("ID zajęte","ID modelu zajęte")
#define TR_MODULE INDENT "Moduł "
#define TR_RX_NAME "Rx Name"
#define TR_TELEMETRY_TYPE TR("Typ ", "Typ Telemetrii")
#define TR_TELEMETRY_SENSORS "Czujniki"
#define TR_VALUE "Wartość"
radio/src/translations/pt.h.txt
+2
View File
@@ -971,6 +971,7 @@
#define TR_BUZZER INDENT"Buzzer"
#define TR_BYTES "bytes"
#define TR_MODULE_BIND "[Bind]"
#define TR_RXADD_BUTTON "BUTTON(Add)"
#define TR_MODULE_RANGE "[Range]"
#define TR_DEL_BUTTON BUTTON(TR("Del", "Delete"))
#define TR_RESET_BTN "[Reset]"
@@ -979,6 +980,7 @@
#define TR_ANTENNAPROBLEM CENTER "TX Antenna problem!"
#define TR_MODELIDUSED TR("ID used in:", "Receiver ID used in:")
#define TR_MODULE INDENT "Module"
#define TR_RX_NAME "Rx Name"
#define TR_TELEMETRY_TYPE TR("Type", "Telemetry Type")
#define TR_TELEMETRY_SENSORS "Sensors"
#define TR_VALUE "Value"
radio/src/translations/se.h.txt
+2
View File
@@ -980,6 +980,7 @@
#define TR_BUZZER INDENT"Summer"
#define TR_BYTES "byte"
#define TR_MODULE_BIND TR("[Bnd]", "[Bind]")
#define TR_RXADD_BUTTON "BUTTON(Add)"
#define TR_MODULE_RANGE TR("[Tst]", "[Testa]")
#define TR_DEL_BUTTON BUTTON(TR("Del", "Delete"))
#define TR_RESET_BTN "[Nollställ]"
@@ -988,6 +989,7 @@
#define TR_ANTENNAPROBLEM CENTER "Fel på TX-antennen"
#define TR_MODELIDUSED TR("ID finns redan","ModellID används redan")
#define TR_MODULE INDENT "Modul"
#define TR_RX_NAME "Rx Name"
#define TR_TELEMETRY_TYPE "Telemetrityp"
#define TR_TELEMETRY_SENSORS "Sensorer"
#define TR_VALUE "Värde"