Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-19 06:15:10 +03:00
Code Issues Wiki Activity

BeepAnaCenter was shifted since S3 introduction

Browse source
This commit is contained in:
bsongis 2014-03-20 18:13:29 +01:00
parent 77c822b772
commit 553ac3b9f5
12 changed files with 17 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

5
radio/src/eeprom_conversions.cpp
View file

@ -427,7 +427,12 @@ void ConvertModel_215_to_216(ModelData &model)
g_model.extendedLimits = oldModel.extendedLimits; g_model.extendedLimits = oldModel.extendedLimits;
g_model.extendedTrims = oldModel.extendedTrims; g_model.extendedTrims = oldModel.extendedTrims;
g_model.throttleReversed = oldModel.throttleReversed; g_model.throttleReversed = oldModel.throttleReversed;
#if defined(PCBTARANIS)
g_model.beepANACenter = (oldModel.beepANACenter & 0x3f) | ((oldModel.beepANACenter & 0xc0) << 1);
#else
g_model.beepANACenter = oldModel.beepANACenter; g_model.beepANACenter = oldModel.beepANACenter;
#endif
for (uint8_t i=0; i<64; i++) { for (uint8_t i=0; i<64; i++) {
MixData & mix = g_model.mixData[i]; MixData & mix = g_model.mixData[i];

3
radio/src/gui/menu_model.cpp
View file

@ -1285,8 +1285,9 @@ void menuModelSetup(uint8_t event)
case ITEM_MODEL_BEEP_CENTER: case ITEM_MODEL_BEEP_CENTER:
lcd_putsLeft(y, STR_BEEPCTR); lcd_putsLeft(y, STR_BEEPCTR);
for (uint8_t i=0; i<NUM_STICKS+NUM_POTS+NUM_ROTARY_ENCODERS; i++) for (uint8_t i=0; i<NUM_STICKS+NUM_POTS+NUM_ROTARY_ENCODERS; i++) {
lcd_putsiAtt(MODEL_SETUP_2ND_COLUMN+i*FW, y, STR_RETA123, i, ((m_posHorz==i) && attr) ? BLINK|INVERS : (((g_model.beepANACenter & ((BeepANACenter)1<<i)) || (attr && m_posHorz<0)) ? INVERS : 0 ) ); lcd_putsiAtt(MODEL_SETUP_2ND_COLUMN+i*FW, y, STR_RETA123, i, ((m_posHorz==i) && attr) ? BLINK|INVERS : (((g_model.beepANACenter & ((BeepANACenter)1<<i)) || (attr && m_posHorz<0)) ? INVERS : 0 ) );
}
if (attr && CURSOR_ON_CELL) { if (attr && CURSOR_ON_CELL) {
if (event==EVT_KEY_BREAK(KEY_ENTER) || p1valdiff) { if (event==EVT_KEY_BREAK(KEY_ENTER) || p1valdiff) {
if (READ_ONLY_UNLOCKED()) { if (READ_ONLY_UNLOCKED()) {

2
radio/src/translations/cz.h.txt
View file

@ -110,7 +110,7 @@
#define TR_RETA123 "SVPK123ab" #define TR_RETA123 "SVPK123ab"
#endif #endif
#elif defined(PCBTARANIS) #elif defined(PCBTARANIS)
#define TR_RETA123 "SVPK12LR" #define TR_RETA123 "SVPK123LR"
#else #else
#define TR_RETA123 "SVPK123" #define TR_RETA123 "SVPK123"
#endif #endif

2
radio/src/translations/de.h.txt
View file

@ -107,7 +107,7 @@
#define TR_RETA123 "SHGQ123ab" #define TR_RETA123 "SHGQ123ab"
#endif #endif
#elif defined(PCBTARANIS) #elif defined(PCBTARANIS)
#define TR_RETA123 "SHGQ12LR" #define TR_RETA123 "SHGQ123LR"
#else #else
#define TR_RETA123 "SHGQ123" #define TR_RETA123 "SHGQ123"
#endif #endif

2
radio/src/translations/en.h.txt
View file

@ -110,7 +110,7 @@
#define TR_RETA123 "RETA123ab" #define TR_RETA123 "RETA123ab"
#endif #endif
#elif defined(PCBTARANIS) #elif defined(PCBTARANIS)
#define TR_RETA123 "RETA12LR" #define TR_RETA123 "RETA123LR"
#else #else
#define TR_RETA123 "RETA123" #define TR_RETA123 "RETA123"
#endif #endif

2
radio/src/translations/es.h.txt
View file

@ -110,7 +110,7 @@
#define TR_RETA123 "RETA123ab" #define TR_RETA123 "RETA123ab"
#endif #endif
#elif defined(PCBTARANIS) #elif defined(PCBTARANIS)
#define TR_RETA123 "RETA12LR" #define TR_RETA123 "RETA123LR"
#else #else
#define TR_RETA123 "RETA123" #define TR_RETA123 "RETA123"
#endif #endif

2
radio/src/translations/fi.h.txt
View file

@ -110,7 +110,7 @@
#define TR_RETA123 "RETA123ab" #define TR_RETA123 "RETA123ab"
#endif #endif
#elif defined(PCBTARANIS) #elif defined(PCBTARANIS)
#define TR_RETA123 "RETA12LR" #define TR_RETA123 "RETA123LR"
#else #else
#define TR_RETA123 "RETA123" #define TR_RETA123 "RETA123"
#endif #endif

2
radio/src/translations/fr.h.txt
View file

@ -107,7 +107,7 @@
#define TR_RETA123 "DPGA123ab" #define TR_RETA123 "DPGA123ab"
#endif #endif
#elif defined(PCBTARANIS) #elif defined(PCBTARANIS)
#define TR_RETA123 "DPGA12LR" #define TR_RETA123 "DPGA123LR"
#else #else
#define TR_RETA123 "DPGA123" #define TR_RETA123 "DPGA123"
#endif #endif

2
radio/src/translations/it.h.txt
View file

@ -110,7 +110,7 @@
#define TR_RETA123 "RETA123ab" #define TR_RETA123 "RETA123ab"
#endif #endif
#elif defined(PCBTARANIS) #elif defined(PCBTARANIS)
#define TR_RETA123 "RETA12LR" #define TR_RETA123 "RETA123LR"
#else #else
#define TR_RETA123 "RETA123" #define TR_RETA123 "RETA123"
#endif #endif

2
radio/src/translations/pl.h.txt
View file

@ -110,7 +110,7 @@
#define TR_RETA123 "KWGL123ab" #define TR_RETA123 "KWGL123ab"
#endif #endif
#elif defined(PCBTARANIS) #elif defined(PCBTARANIS)
#define TR_RETA123 "KWGL12LR" #define TR_RETA123 "KWGL123LR"
#else #else
#define TR_RETA123 "KWGL123" #define TR_RETA123 "KWGL123"
#endif #endif

2
radio/src/translations/pt.h.txt
View file

@ -110,7 +110,7 @@
#define TR_RETA123 "LPMA123ab" #define TR_RETA123 "LPMA123ab"
#endif #endif
#elif defined(PCBTARANIS) #elif defined(PCBTARANIS)
#define TR_RETA123 "LPMA12LR" #define TR_RETA123 "LPMA123LR"
#else #else
#define TR_RETA123 "LPMA123" #define TR_RETA123 "LPMA123"
#endif #endif

2
radio/src/translations/se.h.txt
View file

@ -110,7 +110,7 @@
#define TR_RETA123 "RHGS123ab" #define TR_RETA123 "RHGS123ab"
#endif #endif
#elif defined(PCBTARANIS) #elif defined(PCBTARANIS)
#define TR_RETA123 "RHGS12HV" #define TR_RETA123 "RHGS123HV"
#else #else
#define TR_RETA123 "RHGS123" #define TR_RETA123 "RHGS123"
#endif #endif