Merge remote-tracking branch 'origin/next' into

bsongis/Issue592_sticky_switches

Conflicts:
	radio/src/gui/menu_model.cpp
This commit is contained in:
Bertrand Songis
2014-02-05 08:01:40 +01:00
54 changed files with 32439 additions and 30506 deletions
+6 -8
View File
@@ -1037,19 +1037,17 @@ void menuGeneralVersion(uint8_t event)
{
SIMPLE_MENU(STR_MENUVERSION, menuTabDiag, e_Vers, 1);
lcd_putsLeft(2*FH, stamp1);
lcd_putsLeft(3*FH, stamp2);
lcd_putsLeft(4*FH, stamp3);
lcd_putsLeft(2*FH, vers_stamp);
#if defined(PCBSKY9X) && !defined(REVA)
if (Coproc_valid == 1) {
lcd_putsLeft(5*FH, PSTR("CoPr:"));
lcd_outdez8(10*FW, 5*FH, Coproc_read);
lcd_putsLeft(6*FH, PSTR("CoPr:"));
lcd_outdez8(10*FW, 6*FH, Coproc_read);
}
else {
lcd_putsLeft(5*FH, PSTR("CoPr: ---"));
lcd_putsLeft(6*FH, PSTR("CoPr: ---"));
}
#endif
lcd_putsLeft(7*FH, eeprom_stamp);
#endif
}
void displayKeyState(uint8_t x, uint8_t y, EnumKeys key)
+5 -4
View File
@@ -2271,7 +2271,8 @@ void DrawCurve(uint8_t offset=0)
uint8_t i = 0;
do {
point_t point = getPoint(i++);
point_t point = getPoint(i);
i++;
if (point.x == 0) break;
lcd_filled_rect(point.x-offset, point.y-1, 3, 3, SOLID, FORCE); // do markup square
} while(1);
@@ -3239,7 +3240,7 @@ static uint8_t s_copySrcCh;
#define MIX_LINE_SRC_POS 4*FW-1
#if LCD_W >= 212
#define EXPO_LINE_WEIGHT_POS 8*FW+1
#define EXPO_LINE_WEIGHT_POS 8*FW+3
#define EXPO_LINE_SRC_POS 9*FW-2
#define EXPO_LINE_CURVE_POS 12*FW+4
#define EXPO_LINE_SWITCH_POS 17*FW-1
@@ -3251,7 +3252,7 @@ static uint8_t s_copySrcCh;
#define MIX_LINE_SWITCH_POS 16*FW+1
#define MIX_LINE_DELAY_POS 19*FW+2
#elif defined(CPUARM)
#define EXPO_LINE_WEIGHT_POS 7*FW-1
#define EXPO_LINE_WEIGHT_POS 7*FW+1
#define EXPO_LINE_EXPO_POS 10*FW+5
#define EXPO_LINE_SWITCH_POS 11*FW+2
#define EXPO_LINE_SIDE_POS 14*FW+2
@@ -3263,7 +3264,7 @@ static uint8_t s_copySrcCh;
#define MIX_LINE_SWITCH_POS 16*FW
#define MIX_LINE_DELAY_POS 19*FW+7
#else
#define EXPO_LINE_WEIGHT_POS 7*FW-1
#define EXPO_LINE_WEIGHT_POS 7*FW+1
#define EXPO_LINE_EXPO_POS 11*FW
#define EXPO_LINE_SWITCH_POS 11*FW+4
#if MAX_PHASES == 6
+1 -3
View File
@@ -57,15 +57,13 @@ void menuStatisticsView(uint8_t event)
return;
}
lcd_puts( 1*FW, FH*1, STR_TM1TM2);
lcd_puts( 1*FW, FH*0, STR_TOTTM1TM2THRTHP);
putsTime( 5*FW+5*FWNUM+1, FH*1, timersStates[0].val, 0, 0);
putsTime( 12*FW+5*FWNUM+1, FH*1, timersStates[1].val, 0, 0);
lcd_puts( 1*FW, FH*2, STR_THRTHP);
putsTime( 5*FW+5*FWNUM+1, FH*2, s_timeCumThr, 0, 0);
putsTime( 12*FW+5*FWNUM+1, FH*2, s_timeCum16ThrP/16, 0, 0);
lcd_puts( 17*FW, FH*0, STR_TOT);
putsTime( 12*FW+5*FWNUM+1, FH*0, s_timeCumTot, 0, 0);
#if defined(PCBTARANIS)