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

Merge remote-tracking branch 'origin/next' into

Browse Source 
bsongis/Taranis_6Positions_Pot

Conflicts:
	radio/src/myeeprom.h
This commit is contained in:
Bertrand Songis
2014-01-31 11:28:34 +01:00
parent b4c6d123c8 ce2b033ccb
commit 38145a02f4
1167 changed files with 24904 additions and 51440 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/gui/menu_general.cpp
+37 -10
View File
@@ -62,7 +62,7 @@ LanguagePack * languagePacks[] = {
&itLanguagePack,
&plLanguagePack,
&ptLanguagePack,
&skLanguagePack,
&skLanguagePack,
&seLanguagePack,
NULL
};
@@ -75,7 +75,7 @@ enum EnumTabDiag {
e_Vers,
e_Keys,
e_Ana,
IF_PCBSKY9X(e_Hardware)
IF_CPUARM(e_Hardware)
e_Calib
};
@@ -95,7 +95,7 @@ const MenuFuncP_PROGMEM menuTabDiag[] PROGMEM = {
menuGeneralVersion,
menuGeneralDiagKeys,
menuGeneralDiagAna,
IF_PCBSKY9X(menuGeneralHardware)
IF_CPUARM(menuGeneralHardware)
menuGeneralCalib
};
@@ -258,7 +258,7 @@ void menuGeneralSetup(uint8_t event)
case ITEM_SETUP_TIME:
lcd_putsLeft(y, STR_TIME);
lcd_putc(RADIO_SETUP_TIME_COLUMN-1, y, ':'); lcd_putc(RADIO_SETUP_TIME_COLUMN+3*FW-4, y, ':');
lcd_putc(RADIO_SETUP_TIME_COLUMN+1, y, ':'); lcd_putc(RADIO_SETUP_TIME_COLUMN+3*FW-2, y, ':');
for (uint8_t j=0; j<3; j++) {
uint8_t rowattr = (m_posHorz==j ? attr : 0);
switch (j) {
@@ -1065,13 +1065,14 @@ void menuGeneralDiagKeys(uint8_t event)
lcd_puts(14*FW, 3*FH, STR_VTRIM);
for(uint8_t i=0; i<9; i++) {
uint8_t y = i*FH; //+FH;
#if !defined(PCBTARANIS)
if(i>(SW_ID0-SW_BASE)) y-=FH; //overwrite ID0
uint8_t y = i*FH-FH;
if(i==(SW_ID0-SW_BASE)) continue; //ignore ID0
putsSwitches(8*FW, y, i+1, 0); //ohne off,on
displayKeyState(11*FW+2, y, (EnumKeys)(SW_BASE+i));
#endif
#else
uint8_t y = i*FH;
#endif
if (i<8) {
y = i/2*FH+FH*4;
lcd_img(14*FW, y, sticks, i/2, 0);
@@ -1113,7 +1114,7 @@ void menuGeneralDiagAna(uint8_t event)
uint8_t y = 1+FH+(i/2)*FH;
uint8_t x = i&1 ? 64+5 : 0;
putsStrIdx(x, y, PSTR("A"), i+1);
lcd_putc(x+2*FWNUM, y, ':');
lcd_putc(lcdNextPos, y, ':');
lcd_outhex4(x+3*FW-1, y, anaIn(i));
lcd_outdez8(x+10*FW-1, y, (int16_t)calibratedStick[CONVERT_MODE(i)]*25/256);
}
@@ -1165,7 +1166,33 @@ void menuGeneralDiagAna(uint8_t event)
#endif
}
#if defined(PCBSKY9X)
#if defined(PCBTARANIS)
enum menuGeneralHwItems {
ITEM_SETUP_HW_UART3_MODE,
ITEM_SETUP_HW_MAX
};
#define HW_SETTINGS_COLUMN 15*FW
void menuGeneralHardware(uint8_t event)
{
MENU(STR_HARDWARE, menuTabDiag, e_Hardware, ITEM_SETUP_HW_MAX+1, {0});
uint8_t sub = m_posVert - 1;
for (uint8_t i=0; i<ITEM_SETUP_HW_MAX; i++) {
uint8_t y = 1 + 1*FH + i*FH;
uint8_t attr = (sub == i ? ((s_editMode>0) ? BLINK|INVERS : INVERS) : 0);
switch(i) {
case ITEM_SETUP_HW_UART3_MODE:
g_eeGeneral.hw_uartMode = selectMenuItem(HW_SETTINGS_COLUMN, y, STR_UART3MODE, STR_UART3MODES, g_eeGeneral.hw_uartMode, 0, 2, attr, event);
break;
}
}
}
#elif defined(PCBSKY9X)
enum menuGeneralHwItems {
ITEM_SETUP_HW_OPTREX_DISPLAY,
ITEM_SETUP_HW_STICKS_GAINS_LABELS,