diff --git a/radio/src/gui/9x/menu_general_trainer.cpp b/radio/src/gui/9x/menu_general_trainer.cpp index a6116e077..667435a3c 100644 --- a/radio/src/gui/9x/menu_general_trainer.cpp +++ b/radio/src/gui/9x/menu_general_trainer.cpp @@ -18,7 +18,7 @@ * GNU General Public License for more details. */ -#include "../../opentx.h" +#include "opentx.h" #define TRAINER_CALIB_POS 8 @@ -80,11 +80,7 @@ void menuGeneralTrainer(uint8_t event) lcdDrawText(0*FW, MENU_HEADER_HEIGHT+1+6*FH, STR_CAL, attr); for (uint8_t i=0; i<4; i++) { uint8_t x = (i*TRAINER_CALIB_POS+16)*FW/2; -#if defined (PPM_UNIT_PERCENT_PREC1) - lcdDrawNumber(x, MENU_HEADER_HEIGHT+1+6*FH, (ppmInput[i]-g_eeGeneral.trainer.calib[i])*2, PREC1); -#else lcdDrawNumber(x, MENU_HEADER_HEIGHT+1+6*FH, (ppmInput[i]-g_eeGeneral.trainer.calib[i])/5, 0); -#endif } if (attr) { diff --git a/radio/src/gui/9x/menu_model_setup.cpp b/radio/src/gui/9x/menu_model_setup.cpp index fa5fcb216..3a7b3e59a 100644 --- a/radio/src/gui/9x/menu_model_setup.cpp +++ b/radio/src/gui/9x/menu_model_setup.cpp @@ -627,7 +627,7 @@ void menuModelSetup(uint8_t event) { uint8_t moduleIdx = CURRENT_MODULE_EDITED(k); ModuleData & moduleData = g_model.moduleData[moduleIdx]; - moduleData.ppmOutputType = selectMenuItem(MODEL_SETUP_2ND_COLUMN, y, STR_OUTPUT_TYPE, STR_VOUTPUT_TYPE, moduleData.ppmOutputType, 0, 1, attr, event); + moduleData.ppm.outputType = selectMenuItem(MODEL_SETUP_2ND_COLUMN, y, STR_OUTPUT_TYPE, STR_VOUTPUT_TYPE, moduleData.ppm.outputType, 0, 1, attr, event); break; } #endif diff --git a/radio/src/targets/sky9x/pulses_driver.cpp b/radio/src/targets/sky9x/pulses_driver.cpp index ee455da75..b6d5a79df 100644 --- a/radio/src/targets/sky9x/pulses_driver.cpp +++ b/radio/src/targets/sky9x/pulses_driver.cpp @@ -27,7 +27,7 @@ void module_output_active() pioptr->PIO_ABCDSR[1] |= PIO_PA17 ; // Peripheral C pioptr->PIO_PDR = PIO_PA17 ; // Disable bit A17 Assign to peripheral #if defined(REVX) - if (g_model.moduleData[EXTERNAL_MODULE].ppm.OutputType) { + if (g_model.moduleData[EXTERNAL_MODULE].ppm.outputType) { pioptr->PIO_MDDR = PIO_PA17 ; // Push Pull O/p in A17 } else { diff --git a/radio/src/telemetry/telemetry.cpp b/radio/src/telemetry/telemetry.cpp index 1013304ed..ade33dd47 100644 --- a/radio/src/telemetry/telemetry.cpp +++ b/radio/src/telemetry/telemetry.cpp @@ -38,9 +38,6 @@ TelemetryData telemetryData; #if defined(CPUARM) uint8_t telemetryProtocol = 255; -#if defined(REVX) -uint8_t serialInversion = 0; -#endif #endif #if defined(PCBSKY9X) && defined(REVX)