Work on timers and the trace function.

The timer2 should be full featured now.
Markers around the splash.
This commit is contained in:
bsongis
2012-01-12 21:08:10 +00:00
parent e96b9d410e
commit 40d36bb0c5
9 changed files with 168 additions and 165 deletions
+1 -5
View File
@@ -387,7 +387,7 @@ void EditName(uint8_t x, uint8_t y, char *name, uint8_t size, uint8_t event, boo
void menuProcModel(uint8_t event)
{
lcd_outdezNAtt(7*FW,0,g_eeGeneral.currModel+1,INVERS+LEADING0,2);
MENU("SETUP", menuTabModel, e_Model, (g_model.protocol ? 10 : 11), {0,sizeof(g_model.name)-1,3,3,0,0,0,0,6,2,1});
MENU("SETUP", menuTabModel, e_Model, (g_model.protocol ? 10 : 11), {0,sizeof(g_model.name)-1,2,2,0,0,0,0,6,2,1});
uint8_t sub = m_posVert;
uint8_t y = 1*FH;
@@ -407,7 +407,6 @@ void menuProcModel(uint8_t event)
putsTime(14*FW-3, y, timer->val,
(sub==subN && m_posHorz==1 ? ((s_editMode>0) ? BLINK : INVERS):0),
(sub==subN && m_posHorz==2 ? ((s_editMode>0) ? BLINK : INVERS):0) );
lcd_putsnAtt(19*FW, y, PSTR("\x7e\x7f")+1-timer->dir,1,sub==subN && m_posHorz==3 ? ((s_editMode>0) ? BLINK : INVERS) : 0);
if (sub==subN && (s_editMode>0 || p1valdiff)) {
uint16_t timer_val = timer->val;
switch (m_posHorz) {
@@ -429,9 +428,6 @@ void menuProcModel(uint8_t event)
if ((int16_t)timer_val < 0) timer_val=0;
break;
}
case 3:
CHECK_INCDEC_MODELVAR(event, timer->dir, 0, 1);
break;
}
timer->val = timer_val;
}