This commit is contained in:
3djc
2019-02-18 11:47:01 +01:00
parent a74d4c6051
commit 77b754fb26
4 changed files with 13 additions and 10 deletions
+3 -3
View File
@@ -77,12 +77,12 @@ void processRegisterFrame(uint8_t module, uint8_t * frame)
return;
}
if (frame[3] == 0x00) {
if (frame[3] == 0x00 && reusableBuffer.modelSetup.pxx2.registerStep == REGISTER_START) {
// RX_NAME follows, we store it for the next step
memcpy(reusableBuffer.modelSetup.pxx2.registerRxName, &frame[4], PXX2_LEN_RX_NAME);
reusableBuffer.modelSetup.pxx2.registerStep = REGISTER_COUNTER_ID_RECEIVED;
reusableBuffer.modelSetup.pxx2.registerStep = REGISTER_RX_NAME_RECEIVED;
}
else if (frame[3] == 0x01) {
else if (frame[3] == 0x01 && reusableBuffer.modelSetup.pxx2.registerStep == REGISTER_RX_NAME_SELECTED) {
// RX_NAME + PASSWORD follow, we check they are good
if (memcmp(&frame[4], reusableBuffer.modelSetup.pxx2.registerRxName, PXX2_LEN_RX_NAME) == 0 &&
memcmp(&frame[12], g_model.modelRegistrationID, PXX2_LEN_REGISTRATION_ID) == 0) {