From cc389204328396005b5001df46e938d0ce842615 Mon Sep 17 00:00:00 2001
From: bsongis <bsongis@gmail.com>
Date: Mon, 12 May 2014 19:38:45 +0200
Subject: [PATCH] No rotary encoders on 9XR-PRO

---
 radio/src/Makefile                      |  8 ++++++--
 radio/src/opentx.cpp                    | 10 ++--------
 radio/src/targets/sky9x/board_sky9x.cpp |  4 ++++
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/radio/src/Makefile b/radio/src/Makefile
index f3a3e5928..13f99339b 100644
--- a/radio/src/Makefile
+++ b/radio/src/Makefile
@@ -573,7 +573,11 @@ ifeq ($(PCB), $(filter $(PCB), SKY9X 9XRPRO))
   SDCARD = YES
   BUZZER = NO
   THR_TRACE = YES
-  CPPDEFS += -DPCBSKY9X -DCPUARM -DEEPROM_VARIANT=0 -DAUDIO -DHAPTIC -DPXX -DDSM2 -DDSM2_PPM -DROTARY_ENCODERS=1
+  CPPDEFS += -DPCBSKY9X -DCPUARM -DEEPROM_VARIANT=0 -DAUDIO -DHAPTIC -DPXX -DDSM2 -DDSM2_PPM
+  ifeq ($(PCB), SKY9X)
+    CPPDEFS += -DROTARY_ENCODERS=1
+    CPPSRC += targets/sky9x/rotenc_driver.cpp 
+  endif
   INCDIRS += targets/sky9x CoOS/kernel CoOS/portable
   BOARDSRC = targets/sky9x/board_sky9x.cpp
   EXTRABOARDSRC = targets/sky9x/lcd_driver.cpp
@@ -586,7 +590,7 @@ ifeq ($(PCB), $(filter $(PCB), SKY9X 9XRPRO))
   EEPROMSRC = eeprom_common.cpp eeprom_raw.cpp eeprom_conversions.cpp
   PULSESSRC = protocols/pulses_arm.cpp protocols/ppm_arm.cpp protocols/pxx_arm.cpp protocols/dsm2_arm.cpp
   CPPSRC += audio_arm.cpp haptic.cpp gui/view_about.cpp
-  CPPSRC += targets/sky9x/pwr_driver.cpp targets/sky9x/adc_driver.cpp targets/sky9x/rotenc_driver.cpp targets/sky9x/eeprom_driver.cpp targets/sky9x/pulses_driver.cpp targets/sky9x/keys_driver.cpp targets/sky9x/audio_driver.cpp targets/sky9x/buzzer_driver.cpp targets/sky9x/haptic_driver.cpp targets/sky9x/sdcard_driver.cpp targets/sky9x/massstorage.cpp
+  CPPSRC += targets/sky9x/pwr_driver.cpp targets/sky9x/adc_driver.cpp targets/sky9x/eeprom_driver.cpp targets/sky9x/pulses_driver.cpp targets/sky9x/keys_driver.cpp targets/sky9x/audio_driver.cpp targets/sky9x/buzzer_driver.cpp targets/sky9x/haptic_driver.cpp targets/sky9x/sdcard_driver.cpp targets/sky9x/massstorage.cpp
   CPPSRC += loadboot.cpp
     
   ifeq ($(SDCARD), YES)
diff --git a/radio/src/opentx.cpp b/radio/src/opentx.cpp
index e5d15f270..172b9b867 100644
--- a/radio/src/opentx.cpp
+++ b/radio/src/opentx.cpp
@@ -1269,7 +1269,7 @@ getvalue_t getValue(uint8_t i)
 
   else if (i<=MIXSRC_LAST_POT) return calibratedStick[i-MIXSRC_Rud];
 
-#if defined(PCBGRUVIN9X) || defined(PCBMEGA2560) || defined(PCBSKY9X)
+#if defined(PCBGRUVIN9X) || defined(PCBMEGA2560) || defined(ROTARY_ENCODERS)
   else if (i<=MIXSRC_LAST_ROTARY_ENCODER) return getRotaryEncoder(i-MIXSRC_REa);
 #endif
 
@@ -5585,14 +5585,8 @@ void menusTask(void * pdata)
 
   while (pwrCheck() != e_power_off) {
     perMain();
-#if defined(PCBSKY9X)
-    for (uint8_t i=0; i<5; i++) {
-      usbMassStorage();
-      CoTickDelay(1);  // 5*2ms for now
-    }
-#else
+    // TODO remove completely massstorage from sky9x firmware
     CoTickDelay(5);  // 5*2ms for now
-#endif
   }
 
   lcd_clear();
diff --git a/radio/src/targets/sky9x/board_sky9x.cpp b/radio/src/targets/sky9x/board_sky9x.cpp
index c79c04190..10ed3565e 100644
--- a/radio/src/targets/sky9x/board_sky9x.cpp
+++ b/radio/src/targets/sky9x/board_sky9x.cpp
@@ -654,7 +654,9 @@ void boardInit()
 
   eepromInit();
 
+#if defined(ROTARY_ENCODERS)
   rotencInit();
+#endif
 
   init_SDcard();
 }
@@ -781,7 +783,9 @@ void usbBootloader()
   // This might be replaced by a software reset
   // Any interrupts that have been enabled must be disabled here
   // BEFORE calling sam_boot()
+#if defined(ROTARY_ENCODERS)
   rotencEnd();
+#endif
   endPdcUsartReceive() ;          // Terminate any serial reception
   end_bt_tx_interrupt() ;
   stop_trainer_capture() ;