From 7e64b1953aa6243f5cc6b17951b120c5e2d424eb Mon Sep 17 00:00:00 2001 From: 3djc Date: Sun, 17 Mar 2019 11:58:11 +0100 Subject: [PATCH] Fix 6194 --- radio/src/gui/480x272/model_setup.cpp | 3 +++ radio/src/opentx.cpp | 3 +++ 2 files changed, 6 insertions(+) diff --git a/radio/src/gui/480x272/model_setup.cpp b/radio/src/gui/480x272/model_setup.cpp index 5edb39c02..603ff9bf6 100644 --- a/radio/src/gui/480x272/model_setup.cpp +++ b/radio/src/gui/480x272/model_setup.cpp @@ -102,6 +102,9 @@ enum MenuModelSetupItems { void checkModelIdUnique(uint8_t moduleIdx) { + if(isModulePXX(moduleIdx) && IS_D8_RX(moduleIdx)) + return; + char* warn_buf = reusableBuffer.moduleSetup.msg; // cannot rely exactly on WARNING_LINE_LEN so using WARNING_LINE_LEN-2 diff --git a/radio/src/opentx.cpp b/radio/src/opentx.cpp index 07f2dad2b..cebe9c335 100644 --- a/radio/src/opentx.cpp +++ b/radio/src/opentx.cpp @@ -370,6 +370,9 @@ void applyDefaultTemplate() #if defined(EEPROM) void checkModelIdUnique(uint8_t index, uint8_t module) { + if(isModulePXX(module) && IS_D8_RX(module)) + return; + uint8_t modelId = g_model.header.modelId[module]; uint8_t additionalOnes = 0; char * name = reusableBuffer.moduleSetup.msg;