Compilation fix
This commit is contained in:
@@ -22,7 +22,7 @@ if(PCB STREQUAL 9XRPRO)
|
||||
set(OPENRC_BOOTLOADER bootflash8.lbm)
|
||||
set(CPU_TYPE_FULL ATSAM3S8C) # for size report
|
||||
elseif(PCB STREQUAL AR9X)
|
||||
add_definitions(-Dat91sam3s8 -DAR9X -DSOFTWARE_VOLUME)
|
||||
add_definitions(-Dat91sam3s8 -DPCBAR9X -DSOFTWARE_VOLUME)
|
||||
set(FLAVOUR ar9x)
|
||||
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)
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
|
||||
#include "opentx.h"
|
||||
|
||||
#if defined(AR9X)
|
||||
#if defined(PCBAR9X)
|
||||
#include "i2c_driver.h"
|
||||
#endif
|
||||
|
||||
@@ -371,7 +371,7 @@ void opentxBootloader();
|
||||
|
||||
// Set up for volume control (TWI0)
|
||||
// Need PA3 and PA4 set to peripheral A
|
||||
#if !defined(AR9X)
|
||||
#if !defined(PCBAR9X)
|
||||
void i2cInit()
|
||||
{
|
||||
Pio *pioptr;
|
||||
@@ -475,7 +475,10 @@ void boardInit()
|
||||
|
||||
eepromInit();
|
||||
|
||||
#if defined(ROTARY_ENCODER_NAVIGATION)
|
||||
rotaryEncoderInit();
|
||||
#endif
|
||||
|
||||
init_SDcard();
|
||||
}
|
||||
#else
|
||||
|
||||
@@ -41,7 +41,7 @@ void boardInit(void);
|
||||
void rotaryEncoderInit();
|
||||
void rotaryEncoderEnd();
|
||||
|
||||
#if !defined(REVX) && !defined(AR9X)
|
||||
#if !defined(REVX) && !defined(PCBAR9X)
|
||||
#define ROTARY_ENCODER_NAVIGATION
|
||||
#define REA_DOWN() (!(PIOB->PIO_PDSR & 0x40))
|
||||
#else
|
||||
|
||||
Reference in New Issue
Block a user