From 7abb6a77b7125d42f968a39711bf0bd6a530eb93 Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Sat, 9 Mar 2019 10:21:04 +0100 Subject: [PATCH] Remove REGISTER from RADIO / HARDWARE as it only brings issues --- radio/src/gui/128x64/model_setup.cpp | 1 - radio/src/gui/128x64/radio_hardware.cpp | 26 --- radio/src/opentx.h | 1 - radio/src/pulses/pxx2.cpp | 2 +- radio/src/targets/common/arm/CMakeLists.txt | 3 +- .../{frsky_d_arm.cpp => frsky_d.cpp} | 0 radio/src/telemetry/frsky_pxx2.cpp | 219 ++++++++++++++++++ radio/src/telemetry/telemetry.cpp | 172 +------------- radio/src/telemetry/telemetry.h | 2 + 9 files changed, 226 insertions(+), 200 deletions(-) rename radio/src/telemetry/{frsky_d_arm.cpp => frsky_d.cpp} (100%) create mode 100644 radio/src/telemetry/frsky_pxx2.cpp diff --git a/radio/src/gui/128x64/model_setup.cpp b/radio/src/gui/128x64/model_setup.cpp index 4d64479b2..e4689cd0d 100644 --- a/radio/src/gui/128x64/model_setup.cpp +++ b/radio/src/gui/128x64/model_setup.cpp @@ -372,7 +372,6 @@ void runPopupRegister(event_t event) void startRegisterDialog(uint8_t module) { memclear(&reusableBuffer.moduleSetup.pxx2, sizeof(reusableBuffer.moduleSetup.pxx2)); - memcpy(reusableBuffer.moduleSetup.pxx2.registrationID, g_model.modelRegistrationID, PXX2_LEN_REGISTRATION_ID); moduleSettings[module].mode = MODULE_MODE_REGISTER; s_editMode = 0; POPUP_INPUT("", runPopupRegister); diff --git a/radio/src/gui/128x64/radio_hardware.cpp b/radio/src/gui/128x64/radio_hardware.cpp index bd6e6a2e1..66d5be3f3 100644 --- a/radio/src/gui/128x64/radio_hardware.cpp +++ b/radio/src/gui/128x64/radio_hardware.cpp @@ -125,7 +125,6 @@ enum MenuRadioHardwareItems { #endif ITEM_RADIO_HARDWARE_JITTER_FILTER, ITEM_RADIO_OWNER_ID, - ITEM_RADIO_REGISTER_RECEIVER, ITEM_RADIO_HARDWARE_MAX }; @@ -158,8 +157,6 @@ enum MenuRadioHardwareItems { #define HW_SETTINGS_COLUMN1 30 #define HW_SETTINGS_COLUMN2 (30 + 5*FW) -void startRegisterDialog(uint8_t module); - void menuRadioHardware(event_t event) { MENU(STR_HARDWARE, menuTabGeneral, MENU_RADIO_HARDWARE, HEADER_LINE+ITEM_RADIO_HARDWARE_MAX, { @@ -314,29 +311,6 @@ void menuRadioHardware(event_t event) case ITEM_RADIO_OWNER_ID: editSingleName(HW_SETTINGS_COLUMN2, y, STR_OWNER_ID, g_eeGeneral.ownerRegistrationID, PXX2_LEN_REGISTRATION_ID, event, attr); break; - - case ITEM_RADIO_REGISTER_RECEIVER: - lcdDrawTextAlignedLeft(y, NO_INDENT(STR_RECEIVER)); - lcdDrawText(HW_SETTINGS_COLUMN2, y, "[Register]", attr ); - if (attr) { - if (moduleSettings[INTERNAL_MODULE].mode == MODULE_MODE_NORMAL && s_editMode > 0) { - if (event == EVT_KEY_FIRST(KEY_ENTER)) { - startRegisterDialog(INTERNAL_MODULE); - } - else if (menuHorizontalPosition == 0) { - moduleSettings[INTERNAL_MODULE].mode = MODULE_MODE_RANGECHECK; - } - } - if (s_editMode == 0 && !warningText) { - moduleSettings[INTERNAL_MODULE].mode = MODULE_MODE_NORMAL; - } - if (moduleSettings[INTERNAL_MODULE].mode == MODULE_MODE_NORMAL) { - // REGISTER finished - s_editMode = 0; - } - } - break; - } } } diff --git a/radio/src/opentx.h b/radio/src/opentx.h index fc4b630cd..4cd29678d 100644 --- a/radio/src/opentx.h +++ b/radio/src/opentx.h @@ -1129,7 +1129,6 @@ union ReusableBuffer uint8_t registerPopupHorizontalPosition; int8_t registerPopupEditMode; char registerRxName[PXX2_LEN_RX_NAME]; - char registrationID[PXX2_LEN_REGISTRATION_ID]; char bindCandidateReceiversNames[PXX2_MAX_RECEIVERS_PER_MODULE][PXX2_LEN_RX_NAME + 1]; uint8_t bindCandidateReceiversCount; uint8_t bindReceiverId; diff --git a/radio/src/pulses/pxx2.cpp b/radio/src/pulses/pxx2.cpp index 0529b449f..ea8cbea7d 100644 --- a/radio/src/pulses/pxx2.cpp +++ b/radio/src/pulses/pxx2.cpp @@ -134,7 +134,7 @@ void Pxx2Pulses::setupRegisterFrame(uint8_t module) Pxx2Transport::addByte(zchar2char(reusableBuffer.moduleSetup.pxx2.registerRxName[i])); } for (uint8_t i=0; i * luaInputTelemetryFifo; #define IS_TELEMETRY_INTERNAL_MODULE() (false) #endif +void processPXX2TelemetryFrame(uint8_t module, uint8_t * frame); + #endif // _TELEMETRY_H_