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

UI: Move load channel from CPS to separate function

This commit is contained in:
Federico Amedeo Izzo 2021-01-13 20:27:39 +01:00
parent 6039bbb42e
commit b60100a1f9
1 changed files with 20 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -379,6 +379,22 @@ bool _ui_drawDarkOverlay() {
return true; return true;
} }
int _ui_fsm_loadChannel(uint16_t index, bool *sync_rtx) {
// Try to load selected channel
channel_t channel;
int result = nvm_readChannelData(&channel, index);
// Read successful and channel is valid
if(result != -1 && _ui_channel_valid(&channel))
{
// Set new channel index
state.channel_index = index;
// Copy channel read to state
state.channel = channel;
*sync_rtx = true;
}
return result;
}
void ui_updateFSM(event_t event, bool *sync_rtx) void ui_updateFSM(event_t event, bool *sync_rtx)
{ {
// Check if battery has enough charge to operate // Check if battery has enough charge to operate
@ -433,17 +449,12 @@ void ui_updateFSM(event_t event, bool *sync_rtx)
} }
else if(msg.keys & KEY_ESC) else if(msg.keys & KEY_ESC)
{ {
// Try to load selected channel int result = _ui_fsm_loadChannel(state.channel_index, sync_rtx);
channel_t channel;
int result = nvm_readChannelData(&channel, state.channel_index);
// Read successful and channel is valid // Read successful and channel is valid
if(result != -1 && _ui_channel_valid(&channel)) if(result != -1)
{ {
// Save VFO channel // Save VFO channel
state.vfo_channel = state.channel; state.vfo_channel = state.channel;
// Copy channel read to state
state.channel = channel;
*sync_rtx = true;
// Switch to MEM screen // Switch to MEM screen
state.ui_screen = MAIN_MEM; state.ui_screen = MAIN_MEM;
} }
@ -593,33 +604,11 @@ void ui_updateFSM(event_t event, bool *sync_rtx)
} }
else if(msg.keys & KEY_UP) else if(msg.keys & KEY_UP)
{ {
// Try to load selected channel _ui_fsm_loadChannel(state.channel_index + 1, sync_rtx);
channel_t channel;
int result = nvm_readChannelData(&channel, state.channel_index + 1);
// Read successful and channel is valid
if(result != -1 && _ui_channel_valid(&channel))
{
// Set new channel index
state.channel_index += 1;
// Copy channel read to state
state.channel = channel;
*sync_rtx = true;
}
} }
else if(msg.keys & KEY_DOWN) else if(msg.keys & KEY_DOWN)
{ {
// Try to load selected channel _ui_fsm_loadChannel(state.channel_index - 1, sync_rtx);
channel_t channel;
int result = nvm_readChannelData(&channel, state.channel_index - 1);
// Read successful and channel is valid
if(result != -1 && _ui_channel_valid(&channel))
{
// Set new channel index
state.channel_index -= 1;
// Copy channel read to state
state.channel = channel;
*sync_rtx = true;
}
} }
else if(msg.keys & KEY_MONI) else if(msg.keys & KEY_MONI)
{ {