fleg
/
OpenRTX
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

UI: Pass curtime_t per pointer, not per copy

This commit is contained in:
Federico Amedeo Izzo 2021-01-13 20:04:12 +01:00
parent 5a0a4886ee
commit 6039bbb42e
1 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
openrtx/src/ui/ui.c
View File

@ -308,47 +308,46 @@ freq_t _ui_freq_add_digit(freq_t freq, uint8_t pos, uint8_t number)
} }
#ifdef HAS_RTC #ifdef HAS_RTC
curTime_t _ui_timedate_add_digit(curTime_t timedate, uint8_t pos, uint8_t number) void _ui_timedate_add_digit(curTime_t *timedate, uint8_t pos, uint8_t number)
{ {
switch(pos) switch(pos)
{ {
// Set date // Set date
case 1: case 1:
timedate.date += number * 10; timedate->date += number * 10;
break; break;
case 2: case 2:
timedate.date += number; timedate->date += number;
break; break;
// Set month // Set month
case 3: case 3:
timedate.month += number * 10; timedate->month += number * 10;
break; break;
case 4: case 4:
timedate.month += number; timedate->month += number;
break; break;
// Set year // Set year
case 5: case 5:
timedate.year += number * 10; timedate->year += number * 10;
break; break;
case 6: case 6:
timedate.year += number; timedate->year += number;
break; break;
// Set hour // Set hour
case 7: case 7:
timedate.hour += number * 10; timedate->hour += number * 10;
break; break;
case 8: case 8:
timedate.hour += number; timedate->hour += number;
break; break;
// Set minute // Set minute
case 9: case 9:
timedate.minute += number * 10; timedate->minute += number * 10;
break; break;
case 10: case 10:
timedate.minute += number; timedate->minute += number;
break; break;
} }
return timedate;
} }
#endif #endif
@ -827,8 +826,7 @@ void ui_updateFSM(event_t event, bool *sync_rtx)
break; break;
ui_state.input_position += 1; ui_state.input_position += 1;
ui_state.input_number = input_getPressedNumber(msg); ui_state.input_number = input_getPressedNumber(msg);
ui_state.new_timedate = _ui_timedate_add_digit(ui_state.new_timedate, _ui_timedate_add_digit(&ui_state.new_timedate, ui_state.input_position, ui_state.input_number);
ui_state.input_position, ui_state.input_number);
} }
break; break;
#endif #endif