Mirror/edgetx
1
0
Fork 0
mirror of https://github.com/EdgeTX/edgetx.git synced 2025-07-24 00:35:14 +03:00
Code Activity

Compilation fix

Browse source
This commit is contained in:
Bertrand Songis 2019-04-30 17:02:19 +02:00
parent 02e56d245d
commit 8aa596ead7
6 changed files with 9 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
radio/src/gui/128x64/model_setup.cpp
View file

@ -1541,7 +1541,7 @@ void menuModelSetup(event_t event)
if (isModuleR9M(moduleIdx) || (isModuleXJT(moduleIdx) && g_model.moduleData[moduleIdx].rfProtocol== RF_PROTO_X16)) { if (isModuleR9M(moduleIdx) || (isModuleXJT(moduleIdx) && g_model.moduleData[moduleIdx].rfProtocol== RF_PROTO_X16)) {
#if defined(PCBXLITE) #if defined(PCBXLITE)
if (EVT_KEY_MASK(event) == KEY_ENTER) { if (EVT_KEY_MASK(event) == KEY_ENTER) {
#elif defined(PCBSKY9X) || defined(AR9X) #elif defined(PCBSKY9X) || defined(PCBAR9X)
if (event == EVT_KEY_FIRST(KEY_ENTER)) { if (event == EVT_KEY_FIRST(KEY_ENTER)) {
#else #else
if (event == EVT_KEY_BREAK(KEY_ENTER)) { if (event == EVT_KEY_BREAK(KEY_ENTER)) {

6
radio/src/gui/gui_common.cpp
View file

@ -179,12 +179,6 @@ bool isSourceAvailable(int source)
return IS_POT_SLIDER_AVAILABLE(POT1+source-MIXSRC_FIRST_POT); return IS_POT_SLIDER_AVAILABLE(POT1+source-MIXSRC_FIRST_POT);
} }
#if defined(PCBSKY9X) && defined(REVX)
if (source == MIXSRC_REa) {
return false;
}
#endif
#if defined(PCBX10) #if defined(PCBX10)
if ((source>=MIXSRC_S3 && source<=MIXSRC_S4) || (source>=MIXSRC_MOUSE1 && source<=MIXSRC_MOUSE2)) if ((source>=MIXSRC_S3 && source<=MIXSRC_S4) || (source>=MIXSRC_MOUSE1 && source<=MIXSRC_MOUSE2))
return false; return false;

2
radio/src/opentx.h
View file

@ -171,7 +171,7 @@
#define CASE_PCBX9E(x) #define CASE_PCBX9E(x)
#endif #endif
#if defined(PCBSKY9X) && !defined(AR9X) && !defined(REVA) #if defined(PCBSKY9X) && !defined(PCBAR9X) && !defined(REVA)
#define TX_CAPACITY_MEASUREMENT #define TX_CAPACITY_MEASUREMENT
#define CASE_CAPACITY(x) x, #define CASE_CAPACITY(x) x,
#else #else

2
radio/src/targets/sky9x/CMakeLists.txt
View file

@ -22,7 +22,7 @@ if(PCB STREQUAL 9XRPRO)
set(OPENRC_BOOTLOADER bootflash8.lbm) set(OPENRC_BOOTLOADER bootflash8.lbm)
set(CPU_TYPE_FULL ATSAM3S8C) # for size report set(CPU_TYPE_FULL ATSAM3S8C) # for size report
elseif(PCB STREQUAL AR9X) elseif(PCB STREQUAL AR9X)
add_definitions(-Dat91sam3s8 -DAR9X -DSOFTWARE_VOLUME) add_definitions(-Dat91sam3s8 -DPCBAR9X -DSOFTWARE_VOLUME)
set(FLAVOUR ar9x) set(FLAVOUR ar9x)
include_directories(${THIRDPARTY_DIR}/xdk-asf-3.31.0/sam/drivers/twi) include_directories(${THIRDPARTY_DIR}/xdk-asf-3.31.0/sam/drivers/twi)
set(SRC ${SRC} ${THIRDPARTY_DIR}/xdk-asf-3.31.0/sam/drivers/twi/twi.c) set(SRC ${SRC} ${THIRDPARTY_DIR}/xdk-asf-3.31.0/sam/drivers/twi/twi.c)

7
radio/src/targets/sky9x/board.cpp
View file

@ -20,7 +20,7 @@
#include "opentx.h" #include "opentx.h"
#if defined(AR9X) #if defined(PCBAR9X)
#include "i2c_driver.h" #include "i2c_driver.h"
#endif #endif
@ -371,7 +371,7 @@ void opentxBootloader();
// Set up for volume control (TWI0) // Set up for volume control (TWI0)
// Need PA3 and PA4 set to peripheral A // Need PA3 and PA4 set to peripheral A
#if !defined(AR9X) #if !defined(PCBAR9X)
void i2cInit() void i2cInit()
{ {
Pio *pioptr; Pio *pioptr;
@ -475,7 +475,10 @@ void boardInit()
eepromInit(); eepromInit();
#if defined(ROTARY_ENCODER_NAVIGATION)
rotaryEncoderInit(); rotaryEncoderInit();
#endif
init_SDcard(); init_SDcard();
} }
#else #else

2
radio/src/targets/sky9x/board.h
View file

@ -41,7 +41,7 @@ void boardInit(void);
void rotaryEncoderInit(); void rotaryEncoderInit();
void rotaryEncoderEnd(); void rotaryEncoderEnd();
#if !defined(REVX) && !defined(AR9X) #if !defined(REVX) && !defined(PCBAR9X)
#define ROTARY_ENCODER_NAVIGATION #define ROTARY_ENCODER_NAVIGATION
#define REA_DOWN() (!(PIOB->PIO_PDSR & 0x40)) #define REA_DOWN() (!(PIOB->PIO_PDSR & 0x40))
#else #else