From 5979b319b722db1b215c663601b1579982f43309 Mon Sep 17 00:00:00 2001 From: 3djc Date: Thu, 21 Feb 2019 16:08:45 +0100 Subject: [PATCH] Display receiver name after successful bind --- radio/src/gui/128x64/model_setup.cpp | 8 ++++---- radio/src/pulses/pxx2.cpp | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/radio/src/gui/128x64/model_setup.cpp b/radio/src/gui/128x64/model_setup.cpp index 521e70eba..8c48fd740 100644 --- a/radio/src/gui/128x64/model_setup.cpp +++ b/radio/src/gui/128x64/model_setup.cpp @@ -1217,7 +1217,7 @@ void menuModelSetup(event_t event) uint8_t moduleIdx = CURRENT_MODULE_EDITED(k); lcdDrawTextAlignedLeft(y, STR_RECEIVER); - lcdDrawSizedText(MODEL_SETUP_2ND_COLUMN, y, g_model.moduleData[moduleIdx].pxx2.receivers[receiverIdx].rxName, PXX2_LEN_RX_NAME, 0); + lcdDrawSizedText(MODEL_SETUP_2ND_COLUMN, y, g_model.moduleData[moduleIdx].pxx2.receivers[receiverIdx].rxName, PXX2_LEN_RX_NAME, ZCHAR); } break; @@ -1281,15 +1281,15 @@ void menuModelSetup(event_t event) s_editMode = 0; } if (reusableBuffer.modelSetup.pxx2.bindStep == BIND_OK) { - memcpy(g_model.moduleData[INTERNAL_MODULE].pxx2.receivers[receiverIdx].rxName, reusableBuffer.modelSetup.pxx2.bindCandidateReceiversNames[reusableBuffer.modelSetup.pxx2.bindSelectedReceiverIndex], PXX2_LEN_RX_NAME); + str2zchar(g_model.moduleData[moduleIdx].pxx2.receivers[receiverIdx].rxName, reusableBuffer.modelSetup.pxx2.bindCandidateReceiversNames[reusableBuffer.modelSetup.pxx2.bindSelectedReceiverIndex], PXX2_LEN_RX_NAME); } } else if (menuHorizontalPosition == 1 && s_editMode > 0) { if (receiverIdx == 0) { - memcpy(&g_model.moduleData[INTERNAL_MODULE].pxx2.receivers[0], &g_model.moduleData[INTERNAL_MODULE].pxx2.receivers[1], sizeof(ReceiverData)); + memcpy(&g_model.moduleData[moduleIdx].pxx2.receivers[0], &g_model.moduleData[moduleIdx].pxx2.receivers[1], sizeof(ReceiverData)); menuVerticalPosition = ITEM_MODEL_INTERNAL_MODULE_PXX2_ADD_RECEIVER + 1; } - memclear(&g_model.moduleData[INTERNAL_MODULE].pxx2.receivers[receiverIdx], sizeof(ReceiverData)); + memclear(&g_model.moduleData[moduleIdx].pxx2.receivers[receiverIdx], sizeof(ReceiverData)); s_editMode = 0; killEvents(event); } diff --git a/radio/src/pulses/pxx2.cpp b/radio/src/pulses/pxx2.cpp index 19203d594..5484f59b4 100644 --- a/radio/src/pulses/pxx2.cpp +++ b/radio/src/pulses/pxx2.cpp @@ -81,6 +81,7 @@ bool Pxx2Pulses::setupBindFrame(uint8_t module) if (reusableBuffer.modelSetup.pxx2.bindStep == BIND_WAIT) { if (get_tmr10ms() > reusableBuffer.modelSetup.pxx2.bindWaitTimeout) { moduleSettings[module].mode = MODULE_MODE_NORMAL; + reusableBuffer.modelSetup.pxx2.bindStep = BIND_OK; POPUP_INFORMATION(STR_BIND_OK); } else {