From b9b31a659f77eaaf6a066ff060c0b990c1d2f31f Mon Sep 17 00:00:00 2001 From: Raphael Coeffic Date: Sun, 3 Jul 2022 09:00:11 +0200 Subject: [PATCH] Fix NV14 simulation --- radio/src/gui/colorlcd/module_setup.cpp | 6 ++++-- radio/src/targets/nv14/board.h | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/radio/src/gui/colorlcd/module_setup.cpp b/radio/src/gui/colorlcd/module_setup.cpp index 372d1b50e..04022693a 100644 --- a/radio/src/gui/colorlcd/module_setup.cpp +++ b/radio/src/gui/colorlcd/module_setup.cpp @@ -514,7 +514,7 @@ void ModuleSubTypeChoice::update() setGetValueHandler(GET_DEFAULT(md->subType)); setSetValueHandler(SET_DEFAULT(md->subType)); -#if defined(PCBNV14) +#if defined(PCBNV14) && !defined(SIMU) if (moduleIdx == INTERNAL_MODULE) { if (hardwareOptions.pcbrev == PCBREV_NV14) { md->subType = FLYSKY_SUBTYPE_AFHDS2A; @@ -524,9 +524,11 @@ void ModuleSubTypeChoice::update() setAvailableHandler([](int v) { return v == FLYSKY_SUBTYPE_AFHDS3; }); } } -#else +#elif !defined(SIMU) md->subType = FLYSKY_SUBTYPE_AFHDS3; setAvailableHandler([](int v) { return v == FLYSKY_SUBTYPE_AFHDS3; }); +#else + setAvailableHandler(nullptr); #endif } #endif diff --git a/radio/src/targets/nv14/board.h b/radio/src/targets/nv14/board.h index f90fc2c3e..c1f75cfa5 100644 --- a/radio/src/targets/nv14/board.h +++ b/radio/src/targets/nv14/board.h @@ -95,8 +95,6 @@ uint32_t isBootloaderStart(const uint8_t * buffer); // SDRAM driver void SDRAM_Init(); -#if !defined(SIMU) - enum { PCBREV_NV14 = 0, PCBREV_EL18 = 1, @@ -108,6 +106,8 @@ typedef struct { extern HardwareOptions hardwareOptions; +#if !defined(SIMU) + #define INTERNAL_MODULE_OFF() \ do { \ if (hardwareOptions.pcbrev == PCBREV_NV14) \