From c7258fd4f8c43a5c7b8648139d9268c70ace8665 Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Thu, 7 Mar 2019 11:12:57 +0100 Subject: [PATCH] BIND fix (buffer not cleared) --- radio/src/gui/128x64/model_setup.cpp | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/radio/src/gui/128x64/model_setup.cpp b/radio/src/gui/128x64/model_setup.cpp index ed8131db1..528d29de3 100644 --- a/radio/src/gui/128x64/model_setup.cpp +++ b/radio/src/gui/128x64/model_setup.cpp @@ -362,11 +362,8 @@ void runPopupRegister(event_t event) void startRegisterDialog(uint8_t module) { - reusableBuffer.moduleSetup.pxx2.registerStep = REGISTER_START; + memclear(&reusableBuffer.moduleSetup.pxx2, sizeof(reusableBuffer.moduleSetup.pxx2)); memcpy(reusableBuffer.moduleSetup.pxx2.registrationID, g_model.modelRegistrationID, PXX2_LEN_REGISTRATION_ID); - reusableBuffer.moduleSetup.pxx2.registerPopupVerticalPosition = 0; - reusableBuffer.moduleSetup.pxx2.registerPopupHorizontalPosition = 0; - reusableBuffer.moduleSetup.pxx2.registerPopupEditMode = 0; moduleSettings[module].mode = MODULE_MODE_REGISTER; s_editMode = 0; POPUP_INPUT("", runPopupRegister); @@ -1342,8 +1339,8 @@ void menuModelSetup(event_t event) if (attr) { if (menuHorizontalPosition == 0) { if (event == EVT_KEY_BREAK(KEY_ENTER)) { - reusableBuffer.moduleSetup.pxx2.bindStep = BIND_START; - reusableBuffer.moduleSetup.pxx2.bindCandidateReceiversCount = 0; + // TODO this will go to module.cpp + memclear(&reusableBuffer.moduleSetup.pxx2, sizeof(reusableBuffer.moduleSetup.pxx2)); reusableBuffer.moduleSetup.pxx2.bindReceiverSlot = receiverSlot; moduleSettings[moduleIdx].mode ^= MODULE_MODE_BIND; }