mirror of
https://github.com/opentx/opentx.git
synced 2025-07-24 00:35:18 +03:00
Some cleanups
This commit is contained in:
parent
23fe09aceb
commit
bc5c3587d8
4 changed files with 8 additions and 9 deletions
|
@ -1235,7 +1235,7 @@ void menuModelSetup(event_t event)
|
||||||
s_editMode = 0;
|
s_editMode = 0;
|
||||||
}
|
}
|
||||||
if (reusableBuffer.modelSetup.pxx2.bindStep == BIND_OK) {
|
if (reusableBuffer.modelSetup.pxx2.bindStep == BIND_OK) {
|
||||||
memcpy(g_model.moduleData[INTERNAL_MODULE].pxx2.receivers[receiverIdx].rxName, reusableBuffer.modelSetup.pxx2.bindCandidateReceiversIds[reusableBuffer.modelSetup.pxx2.bindSelectedReceiverIndex], PXX2_LEN_RX_NAME);
|
memcpy(g_model.moduleData[INTERNAL_MODULE].pxx2.receivers[receiverIdx].rxName, reusableBuffer.modelSetup.pxx2.bindCandidateReceiversNames[reusableBuffer.modelSetup.pxx2.bindSelectedReceiverIndex], PXX2_LEN_RX_NAME);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if (menuHorizontalPosition == 1 && s_editMode > 0) {
|
else if (menuHorizontalPosition == 1 && s_editMode > 0) {
|
||||||
|
|
|
@ -1128,8 +1128,7 @@ union ReusableBuffer
|
||||||
uint8_t registerPopupHorizontalPosition;
|
uint8_t registerPopupHorizontalPosition;
|
||||||
int8_t registerPopupEditMode;
|
int8_t registerPopupEditMode;
|
||||||
char registerRxName[PXX2_LEN_RX_NAME];
|
char registerRxName[PXX2_LEN_RX_NAME];
|
||||||
char bindCandidateReceiversIds[PXX2_MAX_RECEIVERS_PER_MODULE][PXX2_LEN_RX_NAME];
|
char bindCandidateReceiversNames[PXX2_MAX_RECEIVERS_PER_MODULE][PXX2_LEN_RX_NAME];
|
||||||
char bindCandidateReceiversNames[PXX2_MAX_RECEIVERS_PER_MODULE][3*PXX2_LEN_RX_NAME+1];
|
|
||||||
uint8_t bindCandidateReceiversCount;
|
uint8_t bindCandidateReceiversCount;
|
||||||
uint8_t bindSelectedReceiverIndex;
|
uint8_t bindSelectedReceiverIndex;
|
||||||
} pxx2;
|
} pxx2;
|
||||||
|
|
|
@ -90,7 +90,7 @@ bool Pxx2Pulses::setupBindFrame(uint8_t module)
|
||||||
else if (reusableBuffer.modelSetup.pxx2.bindStep == BIND_RX_NAME_SELECTED) {
|
else if (reusableBuffer.modelSetup.pxx2.bindStep == BIND_RX_NAME_SELECTED) {
|
||||||
Pxx2Transport::addByte(0x01);
|
Pxx2Transport::addByte(0x01);
|
||||||
for (uint8_t i=0; i<PXX2_LEN_RX_NAME; i++) {
|
for (uint8_t i=0; i<PXX2_LEN_RX_NAME; i++) {
|
||||||
Pxx2Transport::addByte(reusableBuffer.modelSetup.pxx2.bindCandidateReceiversIds[reusableBuffer.modelSetup.pxx2.bindSelectedReceiverIndex][i]);
|
Pxx2Transport::addByte(reusableBuffer.modelSetup.pxx2.bindCandidateReceiversNames[reusableBuffer.modelSetup.pxx2.bindSelectedReceiverIndex][i]);
|
||||||
}
|
}
|
||||||
Pxx2Transport::addByte(g_model.header.modelId[INTERNAL_MODULE]);
|
Pxx2Transport::addByte(g_model.header.modelId[INTERNAL_MODULE]);
|
||||||
}
|
}
|
||||||
|
|
|
@ -102,14 +102,14 @@ void processBindFrame(uint8_t module, uint8_t * frame)
|
||||||
if (frame[3] == 0x00) {
|
if (frame[3] == 0x00) {
|
||||||
bool found = false;
|
bool found = false;
|
||||||
for (uint8_t i=0; i<reusableBuffer.modelSetup.pxx2.bindCandidateReceiversCount; i++) {
|
for (uint8_t i=0; i<reusableBuffer.modelSetup.pxx2.bindCandidateReceiversCount; i++) {
|
||||||
if (memcmp(reusableBuffer.modelSetup.pxx2.bindCandidateReceiversIds[i], &frame[4], PXX2_LEN_RX_NAME) == 0) {
|
if (memcmp(reusableBuffer.modelSetup.pxx2.bindCandidateReceiversNames[i], &frame[4], PXX2_LEN_RX_NAME) == 0) {
|
||||||
found = true;
|
found = true;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (!found && reusableBuffer.modelSetup.pxx2.bindCandidateReceiversCount < PXX2_MAX_RECEIVERS_PER_MODULE) {
|
if (!found && reusableBuffer.modelSetup.pxx2.bindCandidateReceiversCount < PXX2_MAX_RECEIVERS_PER_MODULE) {
|
||||||
memcpy(reusableBuffer.modelSetup.pxx2.bindCandidateReceiversIds[reusableBuffer.modelSetup.pxx2.bindCandidateReceiversCount], &frame[4], PXX2_LEN_RX_NAME);
|
memcpy(reusableBuffer.modelSetup.pxx2.bindCandidateReceiversNames[reusableBuffer.modelSetup.pxx2.bindCandidateReceiversCount], &frame[4], PXX2_LEN_RX_NAME);
|
||||||
char * c = reusableBuffer.modelSetup.pxx2.bindCandidateReceiversNames[reusableBuffer.modelSetup.pxx2.bindCandidateReceiversCount];
|
/*char * c = reusableBuffer.modelSetup.pxx2.bindCandidateReceiversNames[reusableBuffer.modelSetup.pxx2.bindCandidateReceiversCount];
|
||||||
for (uint8_t i=0; i<PXX2_LEN_RX_NAME; i++) {
|
for (uint8_t i=0; i<PXX2_LEN_RX_NAME; i++) {
|
||||||
uint8_t byte = frame[4 + i];
|
uint8_t byte = frame[4 + i];
|
||||||
uint8_t quartet = (byte >> 4);
|
uint8_t quartet = (byte >> 4);
|
||||||
|
@ -118,13 +118,13 @@ void processBindFrame(uint8_t module, uint8_t * frame)
|
||||||
*c++ = (quartet >= 10 ? quartet + 'A' - 10 : quartet + '0');
|
*c++ = (quartet >= 10 ? quartet + 'A' - 10 : quartet + '0');
|
||||||
*c++ = ' ';
|
*c++ = ' ';
|
||||||
}
|
}
|
||||||
*c = '\0';
|
*c = '\0';*/
|
||||||
++reusableBuffer.modelSetup.pxx2.bindCandidateReceiversCount;
|
++reusableBuffer.modelSetup.pxx2.bindCandidateReceiversCount;
|
||||||
reusableBuffer.modelSetup.pxx2.bindStep = BIND_RX_NAME_RECEIVED;
|
reusableBuffer.modelSetup.pxx2.bindStep = BIND_RX_NAME_RECEIVED;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if (frame[3] == 0x01) {
|
else if (frame[3] == 0x01) {
|
||||||
if (memcmp(reusableBuffer.modelSetup.pxx2.bindCandidateReceiversIds[reusableBuffer.modelSetup.pxx2.bindSelectedReceiverIndex], &frame[4], PXX2_LEN_RX_NAME) == 0) {
|
if (memcmp(reusableBuffer.modelSetup.pxx2.bindCandidateReceiversNames[reusableBuffer.modelSetup.pxx2.bindSelectedReceiverIndex], &frame[4], PXX2_LEN_RX_NAME) == 0) {
|
||||||
reusableBuffer.modelSetup.pxx2.bindStep = BIND_WAIT;
|
reusableBuffer.modelSetup.pxx2.bindStep = BIND_WAIT;
|
||||||
reusableBuffer.modelSetup.pxx2.bindWaitTimeout = get_tmr10ms() + 30;
|
reusableBuffer.modelSetup.pxx2.bindWaitTimeout = get_tmr10ms() + 30;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue