From fdcc60b1b9f57f4b389a1604797decc8f03a775f Mon Sep 17 00:00:00 2001
From: Arne Schwabe <arne@rfc2549.org>
Date: Mon, 25 Jul 2016 16:45:52 +0200
Subject: [PATCH] Fix AR9X build and add it to regular commit tests.

Note that simu still crashes on startup in the readRtc function
---
 radio/src/simu.cpp                         | 2 +-
 radio/src/targets/simu/opentxsimulator.cpp | 4 ++--
 radio/src/targets/simu/simpgmspace.cpp     | 2 +-
 radio/util/commit-tests.sh                 | 7 +++++++
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/radio/src/simu.cpp b/radio/src/simu.cpp
index 314385df6..05fbb4f2a 100644
--- a/radio/src/simu.cpp
+++ b/radio/src/simu.cpp
@@ -339,7 +339,7 @@ void Open9xSim::updateKeysAndSwitches(bool start)
 long Open9xSim::onTimeout(FXObject*, FXSelector, void*)
 {
   if (hasFocus()) {
-#if defined(PCBSKY9X) && !defined(REVX)
+#if defined(COPROCESSOR)
     Coproc_temp = 23;
     Coproc_maxtemp = 28;
 #endif
diff --git a/radio/src/targets/simu/opentxsimulator.cpp b/radio/src/targets/simu/opentxsimulator.cpp
index 97344383f..952c4b5e3 100644
--- a/radio/src/targets/simu/opentxsimulator.cpp
+++ b/radio/src/targets/simu/opentxsimulator.cpp
@@ -95,7 +95,7 @@ void OpenTxSimulator::start(QByteArray & ee, bool tests)
 
 void OpenTxSimulator::start(const char * filename, bool tests)
 {
-#if defined(PCBSKY9X) && !defined(REVX)
+#if defined(PCBSKY9X) && !defined(REVX) && !defined(AR9X)
   g_rotenc[0] = 0;
 #elif defined(PCBGRUVIN9X)
   g_rotenc[0] = 0;
@@ -164,7 +164,7 @@ void OpenTxSimulator::wheelEvent(int steps)
     rotencValue -= 2;
   else
     rotencValue += 2;
-#elif defined(PCBSKY9X) && !defined(REVX)
+#elif defined(PCBSKY9X) && !defined(REVX) && !defined(AR9X)
   g_rotenc[0] += steps*4;
 #elif defined(PCBGRUVIN9X)
   g_rotenc[0] += steps;
diff --git a/radio/src/targets/simu/simpgmspace.cpp b/radio/src/targets/simu/simpgmspace.cpp
index 5941808d3..7643080a0 100644
--- a/radio/src/targets/simu/simpgmspace.cpp
+++ b/radio/src/targets/simu/simpgmspace.cpp
@@ -194,7 +194,7 @@ void simuSetKey(uint8_t key, bool state)
     KEY_CASE(KEY_UP, KEYS_GPIO_REG_UP, KEYS_GPIO_PIN_UP)
     KEY_CASE(KEY_DOWN, KEYS_GPIO_REG_DOWN, KEYS_GPIO_PIN_DOWN)
 #endif
-#if defined(PCBSKY9X) && !defined(REVX)
+#if defined(PCBSKY9X) && !defined(REVX) && !defined(AR9X)
     KEY_CASE(BTN_REa, PIOB->PIO_PDSR, 0x40)
 #elif defined(PCBGRUVIN9X) || defined(PCBMEGA2560)
     KEY_CASE(BTN_REa, pind, 0x20)
diff --git a/radio/util/commit-tests.sh b/radio/util/commit-tests.sh
index 2ddd8738d..8db70d9b3 100755
--- a/radio/util/commit-tests.sh
+++ b/radio/util/commit-tests.sh
@@ -58,6 +58,13 @@ make -j2 firmware
 make -j2 simu
 make -j2 gtests ; ./gtests
 
+# OpenTX on AR9X
+rm -rf *
+cmake ${COMMON_OPTIONS} -DPCB=AR9X -DHELI=YES ${SRCDIR}
+make -j2 firmware
+make -j2 simu
+make -j2 gtests ; ./gtests
+
 # OpenTX on Taranis
 rm -rf *
 cmake ${COMMON_OPTIONS} -DPCB=TARANIS -DHELI=YES -DLUA=YES -DWARNINGS_AS_ERRORS=YES ${SRCDIR}