Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-26 01:35:21 +03:00
Code Issues Wiki Activity

Cosmetics

Browse source
This commit is contained in:
Andre Bernet 2015-09-06 17:10:58 +02:00
parent c2ee6d2eaf
commit 461d994dea
5 changed files with 11 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
companion/src/firmwares/opentx/opentxinterface.cpp
View file

@ -93,7 +93,7 @@ const int OpenTxEepromInterface::getEEpromSize()
case BOARD_SKY9X: case BOARD_SKY9X:
return EESIZE_SKY9X; return EESIZE_SKY9X;
case BOARD_9XRPRO: case BOARD_9XRPRO:
case BOARD_AR9X: case BOARD_AR9X:
return EESIZE_9XRPRO; return EESIZE_9XRPRO;
case BOARD_TARANIS: case BOARD_TARANIS:
case BOARD_TARANIS_PLUS: case BOARD_TARANIS_PLUS:

12
radio/src/gui/9X/menu_general_diaganas.cpp
View file

@ -38,7 +38,7 @@
void menuGeneralDiagAna(uint8_t event) void menuGeneralDiagAna(uint8_t event)
{ {
#if defined(PCBSKY9X) && !defined(REVA) && !defined(AR9X) #if defined(TX_CAPACITY_MEASUREMENT)
#define ANAS_ITEMS_COUNT 4 #define ANAS_ITEMS_COUNT 4
#elif defined(PCBSKY9X) #elif defined(PCBSKY9X)
#define ANAS_ITEMS_COUNT 3 #define ANAS_ITEMS_COUNT 3
@ -93,19 +93,19 @@ void menuGeneralDiagAna(uint8_t event)
#endif #endif
if (m_posVert==1) CHECK_INCDEC_GENVAR(event, g_eeGeneral.txVoltageCalibration, -127, 127); if (m_posVert==1) CHECK_INCDEC_GENVAR(event, g_eeGeneral.txVoltageCalibration, -127, 127);
#if defined(PCBSKY9X) && !defined(REVA) && !defined(AR9X) #if defined(TX_CAPACITY_MEASUREMENT)
lcd_putsLeft(6*FH+1, STR_CURRENT_CALIB); lcd_putsLeft(6*FH+1, STR_CURRENT_CALIB);
putsValueWithUnit(LEN_CALIB_FIELDS*FW+4*FW, 6*FH+1, getCurrent(), UNIT_MILLIAMPS, (m_posVert==2 ? INVERS : 0)) ; putsValueWithUnit(LEN_CALIB_FIELDS*FW+4*FW, 6*FH+1, getCurrent(), UNIT_MILLIAMPS, (m_posVert==2 ? INVERS : 0)) ;
if (m_posVert==2) CHECK_INCDEC_GENVAR(event, g_eeGeneral.txCurrentCalibration, -49, 49); if (m_posVert==2) CHECK_INCDEC_GENVAR(event, g_eeGeneral.txCurrentCalibration, -49, 49);
#endif #endif
#if defined(PCBSKY9X) #if defined(PCBSKY9X)
#if defined(AR9X) #if defined(TX_CAPACITY_MEASUREMENT)
#define TEMP_CALIB_POS 6*FH+1
#define TEMP_CALIB_MENU_POS 2
#else
#define TEMP_CALIB_POS 7*FH+1 #define TEMP_CALIB_POS 7*FH+1
#define TEMP_CALIB_MENU_POS 3 #define TEMP_CALIB_MENU_POS 3
#else
#define TEMP_CALIB_POS 6*FH+1
#define TEMP_CALIB_MENU_POS 2
#endif #endif
lcd_putsLeft(TEMP_CALIB_POS, STR_TEMP_CALIB); lcd_putsLeft(TEMP_CALIB_POS, STR_TEMP_CALIB);

2
radio/src/gui/9X/menu_general_setup.cpp
View file

@ -394,7 +394,7 @@ void menuGeneralSetup(uint8_t event)
break; break;
} }
#if defined(PCBSKY9X) && !defined(AR9X) #if defined(TX_CAPACITY_MEASUREMENT)
case ITEM_SETUP_CAPACITY_WARNING: case ITEM_SETUP_CAPACITY_WARNING:
lcd_putsLeft(y, STR_CAPAWARNING); lcd_putsLeft(y, STR_CAPAWARNING);
putsValueWithUnit(RADIO_SETUP_2ND_COLUMN, y, g_eeGeneral.mAhWarn*50, UNIT_MAH, attr|LEFT) ; putsValueWithUnit(RADIO_SETUP_2ND_COLUMN, y, g_eeGeneral.mAhWarn*50, UNIT_MAH, attr|LEFT) ;

2
radio/src/gui/9X/view_statistics.cpp
View file

@ -151,7 +151,7 @@ void menuStatisticsDebug(uint8_t event)
} }
#endif #endif
#if defined(PCBSKY9X) && !defined(REVA) #if defined(TX_CAPACITY_MEASUREMENT)
// current // current
lcd_putsLeft(MENU_DEBUG_Y_CURRENT, STR_CPU_CURRENT); lcd_putsLeft(MENU_DEBUG_Y_CURRENT, STR_CPU_CURRENT);
putsValueWithUnit(MENU_DEBUG_COL1_OFS, MENU_DEBUG_Y_CURRENT, getCurrent(), UNIT_MILLIAMPS, LEFT); putsValueWithUnit(MENU_DEBUG_COL1_OFS, MENU_DEBUG_Y_CURRENT, getCurrent(), UNIT_MILLIAMPS, LEFT);

3
radio/src/opentx.h
View file

@ -208,7 +208,8 @@
#define CASE_REV9E(x) #define CASE_REV9E(x)
#endif #endif
#if defined(PCBSKY9X) && !defined(AR9X) #if defined(PCBSKY9X) && !defined(AR9X) && !defined(REVA)
#define TX_CAPACITY_MEASUREMENT
#define CASE_CAPACITY(x) x, #define CASE_CAPACITY(x) x,
#else #else
#define CASE_CAPACITY(x) #define CASE_CAPACITY(x)