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

Delay introduced at the end of BIND ...

Browse source
This commit is contained in:
Bertrand Songis 2019-02-13 08:42:47 +01:00
parent aa028198fd
commit dd0ac2c008
5 changed files with 26 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

11
radio/src/telemetry/telemetry.cpp
View file

@ -80,13 +80,13 @@ void processRegisterFrame(uint8_t module, uint8_t * frame)
if (frame[3] == 0x00) {
// RX_ID follows, we store it for the next step
memcpy(reusableBuffer.modelsetup.pxx2_register_rx_id, &frame[4], PXX2_LEN_RX_ID);
reusableBuffer.modelsetup.pxx2_register_or_bind_step = REGISTER_COUNTER_ID_RECEIVED;
reusableBuffer.modelsetup.pxx2_register_step = REGISTER_COUNTER_ID_RECEIVED;
}
else if (frame[3] == 0x01) {
// RX_ID + PASSWORD follow, we check they are good
if (memcmp(&frame[4], reusableBuffer.modelsetup.pxx2_register_rx_id, PXX2_LEN_RX_ID) == 0 &&
memcmp(&frame[12], g_model.modelRegistrationID, PXX2_LEN_REGISTRATION_ID) == 0) {
reusableBuffer.modelsetup.pxx2_register_or_bind_step = REGISTER_OK;
reusableBuffer.modelsetup.pxx2_register_step = REGISTER_OK;
moduleSettings[module].mode = MODULE_MODE_NORMAL;
POPUP_INFORMATION(STR_REG_OK);
}
@ -120,14 +120,13 @@ void processBindFrame(uint8_t module, uint8_t * frame)
}
*c = '\0';
++reusableBuffer.modelsetup.pxx2_bind_candidate_receivers_count;
reusableBuffer.modelsetup.pxx2_register_or_bind_step = BIND_RX_ID_RECEIVED;
reusableBuffer.modelsetup.pxx2_bind_step = BIND_RX_ID_RECEIVED;
}
}
else if (frame[3] == 0x01) {
if (memcmp(reusableBuffer.modelsetup.pxx2_bind_candidate_receivers_ids[reusableBuffer.modelsetup.pxx2_bind_selected_receiver_index], &frame[4], PXX2_LEN_RX_ID) == 0) {
reusableBuffer.modelsetup.pxx2_register_or_bind_step = BIND_OK;
moduleSettings[module].mode = MODULE_MODE_NORMAL;
POPUP_INFORMATION(STR_BIND_OK);
reusableBuffer.modelsetup.pxx2_bind_step = BIND_WAIT;
reusableBuffer.modelsetup.pxx2_bind_wait_timeout = get_tmr10ms() + 30;
}
}
}