piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'next' into schwabe/ar9x_test_and_fix

Browse Source
This commit is contained in:
Bertrand Songis
2016-08-01 07:03:17 +02:00
parent 893ae215af 351780bf17
commit 67eb04e44c
404 changed files with 3963 additions and 6172 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/simu.cpp
+5 -3
View File
@@ -26,6 +26,8 @@
#include "opentx.h"
#include <time.h>
#include <ctype.h>
#include "targets/simu/simulcd.h"
#if defined(SIMU_AUDIO)
#include <SDL.h>
#endif
@@ -297,7 +299,7 @@ void Open9xSim::updateKeysAndSwitches(bool start)
// SWITCH_KEY(D, 3, 3);
SWITCH_KEY(E, 4, 2);
SWITCH_KEY(F, 5, 3);
#elif defined(PCBTARANIS) && defined(REV9E)
#elif defined(PCBX9E)
SWITCH_KEY(A, 0, 3);
SWITCH_KEY(B, 1, 3);
SWITCH_KEY(C, 2, 3);
@@ -372,7 +374,7 @@ long Open9xSim::onTimeout(FXObject*, FXSelector, void*)
}
#endif
#if defined(PCBTARANIS) && defined(REV9E)
#if defined(PCBX9E)
SWITCH_KEY(A, 0, 3);
SWITCH_KEY(B, 1, 3);
SWITCH_KEY(C, 2, 3);
@@ -563,7 +565,7 @@ uint16_t anaIn(uint8_t chan)
#if defined(PCBHORUS)
else if (chan == TX_VOLTAGE)
return 1737; //~10.6V
#elif (defined(PCBTARANIS) && defined(REV9E))
#elif defined(PCBX9E)
else if (chan == TX_VOLTAGE)
return 1420; //~10.6V
#elif defined(PCBTARANIS) || defined(PCBFLAMENCO)