Merge branch 'next' into schwabe/ar9x_test_and_fix

2016-08-01 07:03:17 +02:00
parent 893ae215af 351780bf17
commit 67eb04e44c
404 changed files with 3963 additions and 6172 deletions
@@ -16,6 +16,7 @@

 #include "opentxsimulator.h"
 #include "opentx.h"
+#include "simulcd.h"

 int16_t g_anas[NUM_STICKS+NUM_POTS];

@@ -159,7 +160,7 @@ void OpenTxSimulator::wheelEvent(int steps)
    rotencValue -= 2;
  else
    rotencValue += 2;
-#elif defined(REV9E)
+#elif defined(PCBX9E)
  if (steps == 255)
    rotencValue -= 2;
  else