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

Receiver not fully removed when BIND cancelled

Browse source
This commit is contained in:
Bertrand Songis 2019-07-16 12:00:19 +02:00
parent ad594a9d65
commit a8585a509f
No known key found for this signature in database
GPG key ID: F189F79290FEC50F
3 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
radio/src/gui/480x272/model_setup.cpp
View file

@ -272,6 +272,7 @@ void onPXX2BindMenu(const char * result)
uint8_t receiverIdx = CURRENT_RECEIVER_EDITED(menuVerticalPosition - HEADER_LINE);
moduleState[moduleIdx].mode = MODULE_MODE_NORMAL;
removePXX2ReceiverIfEmpty(moduleIdx, receiverIdx);
s_editMode = 0;
}
}

1
radio/src/gui/common/stdlcd/model_setup_pxx2.cpp
View file

@ -111,6 +111,7 @@ void onPXX2BindMenu(const char * result)
uint8_t receiverIdx = CURRENT_RECEIVER_EDITED(menuVerticalPosition - HEADER_LINE);
moduleState[moduleIdx].mode = MODULE_MODE_NORMAL;
removePXX2ReceiverIfEmpty(moduleIdx, receiverIdx);
s_editMode = 0;
}
}

2
radio/src/opentx.h
View file

@ -260,7 +260,7 @@ inline void memclear(void * p, size_t size)
inline bool is_memclear(void * p, size_t size)
{
uint8_t * buf = (uint8_t *)p;
return buf[0] == 0 && !memcmp(buf, buf + 1, size - 1);
return buf[0] == 0 && memcmp(buf, buf + 1, size - 1) == 0;
}
void memswap(void * a, void * b, uint8_t size);