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

BIND placeholder added to reuseable buffer

Browse source
This commit is contained in:
Bertrand Songis 2019-02-06 10:43:14 +01:00
parent 685911efab
commit aaa4206a1c
3 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
radio/src/gui/common/stdlcd/popups.cpp
View file

@ -27,7 +27,6 @@ void (*popupFunc)(event_t event) = NULL;
const char * popupMenuItems[POPUP_MENU_MAX_LINES]; const char * popupMenuItems[POPUP_MENU_MAX_LINES];
uint8_t s_menu_item = 0; uint8_t s_menu_item = 0;
uint16_t popupMenuNoItems = 0; uint16_t popupMenuNoItems = 0;
uint8_t popupMenuFlags = 0;
uint16_t popupMenuOffset = 0; uint16_t popupMenuOffset = 0;
void (*popupMenuHandler)(const char * result); void (*popupMenuHandler)(const char * result);
@ -116,7 +115,6 @@ const char * runPopupMenu(event_t event)
case EVT_KEY_BREAK(KEY_EXIT): case EVT_KEY_BREAK(KEY_EXIT):
popupMenuNoItems = 0; popupMenuNoItems = 0;
s_menu_item = 0; s_menu_item = 0;
popupMenuFlags = 0;
popupMenuOffset = 0; popupMenuOffset = 0;
break; break;
} }

2
radio/src/opentx.h
View file

@ -1116,6 +1116,8 @@ union ReusableBuffer
struct { struct {
char msg[64]; char msg[64];
uint8_t r9mPower; uint8_t r9mPower;
char pxx2_candidate_receivers[5][8];
uint8_t pxx2_candidate_receivers_count;
} modelsetup; } modelsetup;
// 103 bytes // 103 bytes

6
radio/src/pulses/pxx2.cpp
View file

@ -75,6 +75,12 @@ void Pxx2Pulses::setupRegisterFrame(uint8_t module)
void Pxx2Pulses::setupBindFrame(uint8_t module) void Pxx2Pulses::setupBindFrame(uint8_t module)
{ {
addFrameType(PXX2_TYPE_C_MODULE, PXX2_TYPE_ID_BIND); addFrameType(PXX2_TYPE_C_MODULE, PXX2_TYPE_ID_BIND);
Pxx2Transport::addByte(0x00);
for (uint8_t i=0; i<LEN_REGISTRATION_ID; i++) {
Pxx2Transport::addByte(g_model.modelRegistrationID[i]);
}
} }
void Pxx2Pulses::setupFrame(uint8_t module) void Pxx2Pulses::setupFrame(uint8_t module)