[all] Shift in timer modes (negative toggle modes, I wonder if I shouldn't remove them, as I don't see how they can be useful...)
This commit is contained in:
@@ -1029,7 +1029,7 @@ void menuModelSetup(uint8_t event)
|
|||||||
div_t qr = div(timer->start, 60);
|
div_t qr = div(timer->start, 60);
|
||||||
switch (m_posHorz) {
|
switch (m_posHorz) {
|
||||||
case 0:
|
case 0:
|
||||||
CHECK_INCDEC_MODELVAR(event, timer->mode, -2*(MAX_PSWITCH+NUM_CSW)-1, TMR_VAROFS-1+2*(MAX_PSWITCH+NUM_CSW));
|
CHECK_INCDEC_MODELVAR(event, timer->mode, -2*(MAX_PSWITCH+NUM_CSW), TMR_VAROFS-1+2*(MAX_PSWITCH+NUM_CSW));
|
||||||
break;
|
break;
|
||||||
case 1:
|
case 1:
|
||||||
CHECK_INCDEC_MODELVAR_ZERO(event, qr.quot, 59);
|
CHECK_INCDEC_MODELVAR_ZERO(event, qr.quot, 59);
|
||||||
|
|||||||
+4
-4
@@ -947,10 +947,6 @@ void putsCurve(xcoord_t x, uint8_t y, int8_t idx, LcdFlags att)
|
|||||||
|
|
||||||
void putsTmrMode(xcoord_t x, uint8_t y, int8_t mode, LcdFlags att)
|
void putsTmrMode(xcoord_t x, uint8_t y, int8_t mode, LcdFlags att)
|
||||||
{
|
{
|
||||||
if (mode >= TMR_VAROFS+MAX_PSWITCH+NUM_CSW) {
|
|
||||||
mode++;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (mode < 0) {
|
if (mode < 0) {
|
||||||
mode = TMR_VAROFS - mode - 1;
|
mode = TMR_VAROFS - mode - 1;
|
||||||
lcd_putcAtt(x-1*FW, y, '!', att);
|
lcd_putcAtt(x-1*FW, y, '!', att);
|
||||||
@@ -960,6 +956,10 @@ void putsTmrMode(xcoord_t x, uint8_t y, int8_t mode, LcdFlags att)
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (mode >= TMR_VAROFS+MAX_PSWITCH+NUM_CSW) {
|
||||||
|
mode++;
|
||||||
|
}
|
||||||
|
|
||||||
putsSwitches(x, y, mode-(TMR_VAROFS-1), att);
|
putsSwitches(x, y, mode-(TMR_VAROFS-1), att);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -74,9 +74,9 @@
|
|||||||
#define INVERS 0x02
|
#define INVERS 0x02
|
||||||
#define DBLSIZE 0x04
|
#define DBLSIZE 0x04
|
||||||
#ifdef BOLD_FONT
|
#ifdef BOLD_FONT
|
||||||
#define BOLD 0x40
|
#define BOLD 0x40
|
||||||
#else
|
#else
|
||||||
#define BOLD 0x00
|
#define BOLD 0x00
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* lcd putc flags */
|
/* lcd putc flags */
|
||||||
@@ -85,8 +85,8 @@
|
|||||||
/* lcd puts flags */
|
/* lcd puts flags */
|
||||||
/* no 0x80 here because of "GV"1 which is aligned LEFT */
|
/* no 0x80 here because of "GV"1 which is aligned LEFT */
|
||||||
/* no 0x10 here because of "MODEL"01 which uses LEADING0 */
|
/* no 0x10 here because of "MODEL"01 which uses LEADING0 */
|
||||||
|
#define STRCONDENSED 0x10 /* means that THRm will be displayed as THR */
|
||||||
#define BSS 0x20
|
#define BSS 0x20
|
||||||
#define STRCONDENSED 0x40 /* means that THRm will be displayed as THR */
|
|
||||||
#define ZCHAR 0x80
|
#define ZCHAR 0x80
|
||||||
|
|
||||||
/* lcd outdez flags */
|
/* lcd outdez flags */
|
||||||
|
|||||||
Reference in New Issue
Block a user