mirror
/
OpenRTX
kopia lustrzana https://github.com/OpenRTX/OpenRTX
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

UI: Pass curtime_t per pointer, not per copy

replace/23d198cdb8b45d5cbfdba134b2c25f94b51eed12
Federico Amedeo Izzo 2021-01-13 20:04:12 +01:00
rodzic 5a0a4886ee
commit 6039bbb42e
1 zmienionych plików z 12 dodań i 14 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

26
openrtx/src/ui/ui.c
Wyświetl plik

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