[Horus] Cosmetics
This commit is contained in:
@@ -113,7 +113,7 @@ bool menuGeneralSetup(evt_t event)
|
||||
LABEL(SOUND), 0, 0, 0, 0, 0, 0, 0,
|
||||
CASE_VARIO(LABEL(VARIO)) CASE_VARIO(0) CASE_VARIO(0) CASE_VARIO(0) CASE_VARIO(0)
|
||||
CASE_HAPTIC(LABEL(HAPTIC)) CASE_HAPTIC(0) CASE_HAPTIC(0) CASE_HAPTIC(0)
|
||||
LABEL(ALARMS), 0, 0, 0,
|
||||
LABEL(ALARMS), 0, 0, 0,
|
||||
LABEL(BACKLIGHT), 0, 0, 0, 0, 0,
|
||||
CASE_GPS(LABEL(GPS)) CASE_GPS(0) CASE_GPS(0) CASE_PXX(0) 0, 0, 0, 0, 0, 0, 1/*to force edit mode*/ });
|
||||
|
||||
@@ -141,14 +141,14 @@ bool menuGeneralSetup(evt_t event)
|
||||
uint8_t rowattr = (menuHorizontalPosition==j ? attr : 0);
|
||||
switch (j) {
|
||||
case 0:
|
||||
lcdDrawNumber(RADIO_SETUP_2ND_COLUMN, y, t.tm_year+1900, LEFT|flags|rowattr);
|
||||
lcdDrawNumber(RADIO_SETUP_2ND_COLUMN, y, t.tm_year+1900, flags|rowattr);
|
||||
if (rowattr && s_editMode>0) t.tm_year = checkIncDec(event, t.tm_year, 112, 200, 0);
|
||||
lcdDrawText(lcdNextPos+4, y, "-", flags);
|
||||
lcdDrawText(lcdNextPos+3, y, "-", flags);
|
||||
break;
|
||||
case 1:
|
||||
lcdDrawNumber(lcdNextPos+4, y, t.tm_mon+1, LEFT|flags|rowattr|LEADING0, 2);
|
||||
lcdDrawNumber(lcdNextPos+3, y, t.tm_mon+1, flags|rowattr|LEADING0, 2);
|
||||
if (rowattr && s_editMode>0) t.tm_mon = checkIncDec(event, t.tm_mon, 0, 11, 0);
|
||||
lcdDrawText(lcdNextPos+4, y, "-", flags);
|
||||
lcdDrawText(lcdNextPos+3, y, "-", flags);
|
||||
break;
|
||||
case 2:
|
||||
{
|
||||
@@ -156,7 +156,7 @@ bool menuGeneralSetup(evt_t event)
|
||||
int8_t dlim = (((((year%4==0) && (year%100!=0)) || (year%400==0)) && (t.tm_mon==1)) ? 1 : 0);
|
||||
static const pm_uint8_t dmon[] PROGMEM = { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 };
|
||||
dlim += pgm_read_byte(&dmon[t.tm_mon]);
|
||||
lcdDrawNumber(lcdNextPos+4, y, t.tm_mday, LEFT|flags|rowattr|LEADING0, 2);
|
||||
lcdDrawNumber(lcdNextPos+3, y, t.tm_mday, flags|rowattr|LEADING0, 2);
|
||||
if (rowattr && s_editMode>0) t.tm_mday = checkIncDec(event, t.tm_mday, 1, dlim, 0);
|
||||
break;
|
||||
}
|
||||
@@ -180,17 +180,17 @@ bool menuGeneralSetup(evt_t event)
|
||||
switch (j) {
|
||||
case 0:
|
||||
if (rowattr && s_editMode>0) t.tm_hour = checkIncDec(event, t.tm_hour, 0, 23, 0);
|
||||
lcdDrawNumber(RADIO_SETUP_2ND_COLUMN, y, t.tm_hour, flags|rowattr|LEFT|LEADING0, 2);
|
||||
lcdDrawText(lcdNextPos+4, y, ":", flags);
|
||||
lcdDrawNumber(RADIO_SETUP_2ND_COLUMN, y, t.tm_hour, flags|rowattr|LEADING0, 2);
|
||||
lcdDrawText(lcdNextPos+3, y, ":", flags);
|
||||
break;
|
||||
case 1:
|
||||
if (rowattr && s_editMode>0) t.tm_min = checkIncDec(event, t.tm_min, 0, 59, 0);
|
||||
lcdDrawNumber(lcdNextPos+4, y, t.tm_min, flags|rowattr|LEFT|LEADING0, 2);
|
||||
lcdDrawText(lcdNextPos+4, y, ":", flags);
|
||||
lcdDrawNumber(lcdNextPos+3, y, t.tm_min, flags|rowattr|LEADING0, 2);
|
||||
lcdDrawText(lcdNextPos+3, y, ":", flags);
|
||||
break;
|
||||
case 2:
|
||||
if (rowattr && s_editMode>0) t.tm_sec = checkIncDec(event, t.tm_sec, 0, 59, 0);
|
||||
lcdDrawNumber(lcdNextPos+4, y, t.tm_sec, flags|rowattr|LEFT|LEADING0, 2);
|
||||
lcdDrawNumber(lcdNextPos+3, y, t.tm_sec, flags|rowattr|LEADING0, 2);
|
||||
break;
|
||||
}
|
||||
}
|
||||
@@ -207,8 +207,8 @@ bool menuGeneralSetup(evt_t event)
|
||||
flags |= INVERS;
|
||||
}
|
||||
lcdDrawNumber(RADIO_SETUP_2ND_COLUMN, y, 90+g_eeGeneral.vBatMin, flags|(menuHorizontalPosition==0 ? attr : 0)|PREC1|LEFT);
|
||||
lcdDrawText(lcdNextPos+4, y, "-", flags);
|
||||
lcdDrawNumber(lcdNextPos+4, y, 120+g_eeGeneral.vBatMax, flags|(menuHorizontalPosition>0 ? attr : 0)|PREC1|LEFT);
|
||||
lcdDrawText(lcdNextPos+3, y, "-", flags);
|
||||
lcdDrawNumber(lcdNextPos+3, y, 120+g_eeGeneral.vBatMax, flags|(menuHorizontalPosition>0 ? attr : 0)|PREC1|LEFT);
|
||||
lcdDrawText(lcdNextPos+1, y, "V", flags);
|
||||
if (attr && s_editMode>0) {
|
||||
if (menuHorizontalPosition==0)
|
||||
|
||||
Reference in New Issue
Block a user