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

UI: Fix zone elements indexes

This commit is contained in:
Federico Amedeo Izzo 2021-02-01 22:30:25 +01:00
parent faf943b02b
commit 6fdb6b8890
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -435,24 +435,25 @@ bool _ui_drawDarkOverlay() {
return true; return true;
} }
int _ui_fsm_loadChannel(uint16_t index, bool *sync_rtx) { int _ui_fsm_loadChannel(uint16_t zone_index, bool *sync_rtx) {
uint16_t channel_index = zone_index;
channel_t channel; channel_t channel;
// If a zone is active, get index from current zone // If a zone is active, get index from current zone
if(state.zone_enabled) if(state.zone_enabled)
{ {
// Calculate zone size // Calculate zone size
const uint8_t zone_size = sizeof(state.zone.member)/sizeof(state.zone.member[0]); const uint8_t zone_size = sizeof(state.zone.member)/sizeof(state.zone.member[0]);
if(index >= zone_size) if(zone_index >= zone_size)
return -1; return -1;
else else
index = state.zone.member[index]; channel_index = state.zone.member[zone_index];
} }
int result = nvm_readChannelData(&channel, index); int result = nvm_readChannelData(&channel, channel_index);
// Read successful and channel is valid // Read successful and channel is valid
if(result != -1 && _ui_channel_valid(&channel)) if(result != -1 && _ui_channel_valid(&channel))
{ {
// Set new channel index // Set new channel index
state.channel_index = index; state.channel_index = zone_index;
// Copy channel read to state // Copy channel read to state
state.channel = channel; state.channel = channel;
*sync_rtx = true; *sync_rtx = true;