Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-23 16:25:16 +03:00
Code Issues Wiki Activity

gcc on MAC warnings

Browse source
This commit is contained in:
bsongis 2011-12-29 20:57:39 +00:00
parent f88064273d
commit 64f8123987
2 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/model_menus.cpp
View file

@ -409,29 +409,31 @@ void menuProcModel(uint8_t event)
(sub==subN && m_posHorz==2 ? ((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); 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)) { if (sub==subN && (s_editMode>0 || p1valdiff)) {
uint16_t timer_val = timer->val;
switch (m_posHorz) { switch (m_posHorz) {
case 0: case 0:
CHECK_INCDEC_MODELVAR(event, timer->mode, -(13+2*MAX_SWITCH),(13+2*MAX_SWITCH)); CHECK_INCDEC_MODELVAR(event, timer->mode, -(13+2*MAX_SWITCH),(13+2*MAX_SWITCH));
break; break;
case 1: case 1:
{ {
int8_t min = timer->val/60; int8_t min = timer_val/60;
CHECK_INCDEC_MODELVAR(event, min, 0, 59); CHECK_INCDEC_MODELVAR(event, min, 0, 59);
timer->val = timer->val%60 + min*60; timer_val = timer_val%60 + min*60;
break; break;
} }
case 2: case 2:
{ {
int8_t sec = timer->val%60; int8_t sec = timer_val%60;
sec -= checkIncDecModel(event, sec+2, 1, 62)-2; sec -= checkIncDecModel(event, sec+2, 1, 62)-2;
timer->val -= sec ; timer_val -= sec ;
if (((int16_t)timer->val) < 0) timer->val=0; if ((int16_t)timer_val < 0) timer_val=0;
break; break;
} }
case 3: case 3:
CHECK_INCDEC_MODELVAR(event, timer->dir, 0, 1); CHECK_INCDEC_MODELVAR(event, timer->dir, 0, 1);
break; break;
} }
timer->val = timer_val;
} }
if ((y+=FH)>7*FH) return; if ((y+=FH)>7*FH) return;
} subN++; } subN++;

2
src/pers.cpp
View file

@ -283,7 +283,7 @@ void eeLoadModel(uint8_t id)
#ifdef SIMU #ifdef SIMU
if (sz > 0 && sz != sizeof(g_model)) { if (sz > 0 && sz != sizeof(g_model)) {
printf("Model data read=%d bytes vs %u bytes\n", sz, sizeof(ModelData)); printf("Model data read=%d bytes vs %lu bytes\n", sz, sizeof(ModelData));
} }
#endif #endif