From 8aa596ead728d128d13a36ad1ff6163bfadeb4ce Mon Sep 17 00:00:00 2001
From: Bertrand Songis <bsongis@gmail.com>
Date: Tue, 30 Apr 2019 17:02:19 +0200
Subject: [PATCH] Compilation fix

---
 radio/src/gui/128x64/model_setup.cpp   | 2 +-
 radio/src/gui/gui_common.cpp           | 6 ------
 radio/src/opentx.h                     | 2 +-
 radio/src/targets/sky9x/CMakeLists.txt | 2 +-
 radio/src/targets/sky9x/board.cpp      | 7 +++++--
 radio/src/targets/sky9x/board.h        | 2 +-
 6 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/radio/src/gui/128x64/model_setup.cpp b/radio/src/gui/128x64/model_setup.cpp
index 5d11c9904..84f10327a 100644
--- a/radio/src/gui/128x64/model_setup.cpp
+++ b/radio/src/gui/128x64/model_setup.cpp
@@ -1541,7 +1541,7 @@ void menuModelSetup(event_t event)
                   if (isModuleR9M(moduleIdx) || (isModuleXJT(moduleIdx) && g_model.moduleData[moduleIdx].rfProtocol== RF_PROTO_X16)) {
 #if defined(PCBXLITE)
                     if (EVT_KEY_MASK(event) == KEY_ENTER) {
-#elif defined(PCBSKY9X) || defined(AR9X)
+#elif defined(PCBSKY9X) || defined(PCBAR9X)
                     if (event ==  EVT_KEY_FIRST(KEY_ENTER)) {
 #else
                     if (event == EVT_KEY_BREAK(KEY_ENTER)) {
diff --git a/radio/src/gui/gui_common.cpp b/radio/src/gui/gui_common.cpp
index 45adfb3a1..b29d9b2eb 100644
--- a/radio/src/gui/gui_common.cpp
+++ b/radio/src/gui/gui_common.cpp
@@ -179,12 +179,6 @@ bool isSourceAvailable(int source)
     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 ((source>=MIXSRC_S3 && source<=MIXSRC_S4) || (source>=MIXSRC_MOUSE1 && source<=MIXSRC_MOUSE2))
     return false;
diff --git a/radio/src/opentx.h b/radio/src/opentx.h
index 8a2b0888c..ab2ee46be 100644
--- a/radio/src/opentx.h
+++ b/radio/src/opentx.h
@@ -171,7 +171,7 @@
   #define CASE_PCBX9E(x)
 #endif
 
-#if defined(PCBSKY9X) && !defined(AR9X) && !defined(REVA)
+#if defined(PCBSKY9X) && !defined(PCBAR9X) && !defined(REVA)
   #define TX_CAPACITY_MEASUREMENT
   #define CASE_CAPACITY(x) x,
 #else
diff --git a/radio/src/targets/sky9x/CMakeLists.txt b/radio/src/targets/sky9x/CMakeLists.txt
index 176293564..39ac01741 100644
--- a/radio/src/targets/sky9x/CMakeLists.txt
+++ b/radio/src/targets/sky9x/CMakeLists.txt
@@ -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)
diff --git a/radio/src/targets/sky9x/board.cpp b/radio/src/targets/sky9x/board.cpp
index 522a9f6fb..a25870a00 100644
--- a/radio/src/targets/sky9x/board.cpp
+++ b/radio/src/targets/sky9x/board.cpp
@@ -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
diff --git a/radio/src/targets/sky9x/board.h b/radio/src/targets/sky9x/board.h
index a4a67dfcc..0ffaadb34 100644
--- a/radio/src/targets/sky9x/board.h
+++ b/radio/src/targets/sky9x/board.h
@@ -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