Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-26 09:45:21 +03:00
Code Issues Wiki Activity

[9XR-PRO] Compilation fixes and cosmetics

Browse source
This commit is contained in:
Bertrand Songis 2016-04-28 20:36:42 +02:00
parent fe57faef74
commit 56f59196ea
4 changed files with 3 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

6
radio/src/gui/9x/menu_general_trainer.cpp
View file

@ -18,7 +18,7 @@
* GNU General Public License for more details. * GNU General Public License for more details.
*/ */
#include "../../opentx.h" #include "opentx.h"
#define TRAINER_CALIB_POS 8 #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); lcdDrawText(0*FW, MENU_HEADER_HEIGHT+1+6*FH, STR_CAL, attr);
for (uint8_t i=0; i<4; i++) { for (uint8_t i=0; i<4; i++) {
uint8_t x = (i*TRAINER_CALIB_POS+16)*FW/2; 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); lcdDrawNumber(x, MENU_HEADER_HEIGHT+1+6*FH, (ppmInput[i]-g_eeGeneral.trainer.calib[i])/5, 0);
#endif
} }
if (attr) { if (attr) {

2
radio/src/gui/9x/menu_model_setup.cpp
View file

@ -627,7 +627,7 @@ void menuModelSetup(uint8_t event)
{ {
uint8_t moduleIdx = CURRENT_MODULE_EDITED(k); uint8_t moduleIdx = CURRENT_MODULE_EDITED(k);
ModuleData & moduleData = g_model.moduleData[moduleIdx]; 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; break;
} }
#endif #endif

2
radio/src/targets/sky9x/pulses_driver.cpp
View file

@ -27,7 +27,7 @@ void module_output_active()
pioptr->PIO_ABCDSR[1] |= PIO_PA17 ; // Peripheral C pioptr->PIO_ABCDSR[1] |= PIO_PA17 ; // Peripheral C
pioptr->PIO_PDR = PIO_PA17 ; // Disable bit A17 Assign to peripheral pioptr->PIO_PDR = PIO_PA17 ; // Disable bit A17 Assign to peripheral
#if defined(REVX) #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 pioptr->PIO_MDDR = PIO_PA17 ; // Push Pull O/p in A17
} }
else { else {

3
radio/src/telemetry/telemetry.cpp
View file

@ -38,9 +38,6 @@ TelemetryData telemetryData;
#if defined(CPUARM) #if defined(CPUARM)
uint8_t telemetryProtocol = 255; uint8_t telemetryProtocol = 255;
#if defined(REVX)
uint8_t serialInversion = 0;
#endif
#endif #endif
#if defined(PCBSKY9X) && defined(REVX) #if defined(PCBSKY9X) && defined(REVX)