diff --git a/radio/src/simu.cpp b/radio/src/simu.cpp
index 5cbe197c4..8a4fc7cc7 100644
--- a/radio/src/simu.cpp
+++ b/radio/src/simu.cpp
@@ -341,7 +341,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 3e465cb32..e4eb8ea47 100644
--- a/radio/src/targets/simu/opentxsimulator.cpp
+++ b/radio/src/targets/simu/opentxsimulator.cpp
@@ -96,7 +96,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;
@@ -165,7 +165,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 1129a5c27..9c63638d1 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/src/targets/sky9x/i2c_driver.cpp b/radio/src/targets/sky9x/i2c_driver.cpp
index 7479a71f7..ec89958be 100644
--- a/radio/src/targets/sky9x/i2c_driver.cpp
+++ b/radio/src/targets/sky9x/i2c_driver.cpp
@@ -18,6 +18,7 @@
  * GNU General Public License for more details.
  */
 
+#include "opentx.h"
 #include "i2c_driver.h"
 #include "twi.h"
 #include "board_lowlevel.h"
diff --git a/radio/src/targets/sky9x/rtc_ds3231_driver.cpp b/radio/src/targets/sky9x/rtc_ds3231_driver.cpp
index b2ed96289..360c6acc3 100644
--- a/radio/src/targets/sky9x/rtc_ds3231_driver.cpp
+++ b/radio/src/targets/sky9x/rtc_ds3231_driver.cpp
@@ -18,6 +18,7 @@
  * GNU General Public License for more details.
  */
 
+#include "opentx.h"
 #include "rtc.h"
 #include "i2c_driver.h"
 
@@ -26,8 +27,9 @@
 void readRtc()
 {
   uint8_t buffer[7];
+  uint8_t readBuffer[7];
   gtm utm;
-  int res = i2cReadBuffer(DS3231_I2C_ADDR, 0, 2, buffer, 7);
+  int res = i2cReadBuffer(DS3231_I2C_ADDR, readBuffer, 2, buffer, 7);
   if (res != 0)
     return;
 
@@ -46,6 +48,7 @@ void writeRtc(gtm* ptr)
   g_rtcTime = gmktime(ptr);
   g_ms100 = 0; // start of next second begins now
   uint8_t buffer[7];
+  uint8_t read_buffer[7];
 
   buffer[0] = toBCD(ptr->tm_sec);
   buffer[1] = toBCD(ptr->tm_min);
@@ -55,7 +58,7 @@ void writeRtc(gtm* ptr)
   buffer[5] = toBCD(ptr->tm_mon + 1);
   uint8_t offset = ptr->tm_year >= 100 ? 100 : 0;
   buffer[6] = toBCD(ptr->tm_year - offset);
-  i2cWriteBuffer(DS3231_I2C_ADDR, 0, 1, buffer, 7);
+  i2cWriteBuffer(DS3231_I2C_ADDR, read_buffer, 1, buffer, 7);
 }
 
 void rtcSetTime(struct gtm * t)
diff --git a/tools/commit-tests.sh b/tools/commit-tests.sh
index 4703c6c88..91681eb5d 100755
--- a/tools/commit-tests.sh
+++ b/tools/commit-tests.sh
@@ -51,6 +51,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=X9D -DHELI=YES -DLUA=YES -DWARNINGS_AS_ERRORS=YES ${SRCDIR}