Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-15 20:35:17 +03:00
Code Issues Wiki Activity

Fix AR9X build and add it to regular commit tests.

Browse source 
Note that simu still crashes on startup in the readRtc function
This commit is contained in:
Arne Schwabe 2016-07-25 16:45:52 +02:00
parent bea0411071
commit fdcc60b1b9
4 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
radio/src/simu.cpp
View file

@ -339,7 +339,7 @@ void Open9xSim::updateKeysAndSwitches(bool start)
long Open9xSim::onTimeout(FXObject*, FXSelector, void*) long Open9xSim::onTimeout(FXObject*, FXSelector, void*)
{ {
if (hasFocus()) { if (hasFocus()) {
#if defined(PCBSKY9X) && !defined(REVX) #if defined(COPROCESSOR)
Coproc_temp = 23; Coproc_temp = 23;
Coproc_maxtemp = 28; Coproc_maxtemp = 28;
#endif #endif

4
radio/src/targets/simu/opentxsimulator.cpp
View file

@ -95,7 +95,7 @@ void OpenTxSimulator::start(QByteArray & ee, bool tests)
void OpenTxSimulator::start(const char * filename, 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; g_rotenc[0] = 0;
#elif defined(PCBGRUVIN9X) #elif defined(PCBGRUVIN9X)
g_rotenc[0] = 0; g_rotenc[0] = 0;
@ -164,7 +164,7 @@ void OpenTxSimulator::wheelEvent(int steps)
rotencValue -= 2; rotencValue -= 2;
else else
rotencValue += 2; rotencValue += 2;
#elif defined(PCBSKY9X) && !defined(REVX) #elif defined(PCBSKY9X) && !defined(REVX) && !defined(AR9X)
g_rotenc[0] += steps*4; g_rotenc[0] += steps*4;
#elif defined(PCBGRUVIN9X) #elif defined(PCBGRUVIN9X)
g_rotenc[0] += steps; g_rotenc[0] += steps;

2
radio/src/targets/simu/simpgmspace.cpp
View file

@ -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_UP, KEYS_GPIO_REG_UP, KEYS_GPIO_PIN_UP)
KEY_CASE(KEY_DOWN, KEYS_GPIO_REG_DOWN, KEYS_GPIO_PIN_DOWN) KEY_CASE(KEY_DOWN, KEYS_GPIO_REG_DOWN, KEYS_GPIO_PIN_DOWN)
#endif #endif
#if defined(PCBSKY9X) && !defined(REVX) #if defined(PCBSKY9X) && !defined(REVX) && !defined(AR9X)
KEY_CASE(BTN_REa, PIOB->PIO_PDSR, 0x40) KEY_CASE(BTN_REa, PIOB->PIO_PDSR, 0x40)
#elif defined(PCBGRUVIN9X) || defined(PCBMEGA2560) #elif defined(PCBGRUVIN9X) || defined(PCBMEGA2560)
KEY_CASE(BTN_REa, pind, 0x20) KEY_CASE(BTN_REa, pind, 0x20)

7
radio/util/commit-tests.sh
View file

@ -58,6 +58,13 @@ make -j2 firmware
make -j2 simu make -j2 simu
make -j2 gtests ; ./gtests 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 # OpenTX on Taranis
rm -rf * rm -rf *
cmake ${COMMON_OPTIONS} -DPCB=TARANIS -DHELI=YES -DLUA=YES -DWARNINGS_AS_ERRORS=YES ${SRCDIR} cmake ${COMMON_OPTIONS} -DPCB=TARANIS -DHELI=YES -DLUA=YES -DWARNINGS_AS_ERRORS=YES ${SRCDIR}