Massive clean thanks to Schwabe : unifdef -m -DCPUARM -UCPUM64 -UCPUM2560 -UPCBSTD -UPCBMEGA2560 -UPCBGRUVIN9X -UPCB9X $(find . -name "*.cpp" -or -name "*.h")

This commit is contained in:
3djc
2018-07-05 08:04:55 +02:00
parent c032b30247
commit dd632969f3
106 changed files with 27 additions and 6626 deletions
@@ -25,11 +25,7 @@
#define MAX_LOGICAL_SWITCHES NUM_CSW
#endif
#if defined(CPUARM)
#define GET_SWITCH_BOOL(sw__) getSwitch((sw__), 0);
#else
#define GET_SWITCH_BOOL(sw__) getSwitch(sw__);
#endif
#define OTXS_DBG qDebug() << "(" << simuTimerMicros() << "us)"
@@ -211,7 +207,6 @@ void OpenTxSimulator::setTrim(unsigned int idx, int value)
i = modn12x3[4 * getStickMode() + idx];
uint8_t phase = getTrimFlightMode(getFlightMode(), i);
#ifdef CPUARM
if (!setTrimValue(phase, i, value)) {
QTimer *timer = new QTimer(this);
timer->setSingleShot(true);
@@ -222,9 +217,6 @@ void OpenTxSimulator::setTrim(unsigned int idx, int value)
});
timer->start(350);
}
#else
setTrimValue(phase, i, value);
#endif
}
void OpenTxSimulator::setTrainerInput(unsigned int inputNumber, int16_t value)
@@ -535,10 +527,8 @@ void OpenTxSimulator::checkOutputsChanged()
#if defined(GVAR_VALUE) && defined(GVARS)
gVarMode_t gvar;
for (uint8_t gv=0; gv < MAX_GVARS; gv++) {
#if !defined(PCBSTD)
gvar.prec = g_model.gvars[gv].prec;
gvar.unit = g_model.gvars[gv].unit;
#endif
for (uint8_t fm=0; fm < MAX_FLIGHT_MODES; fm++) {
gvar.mode = fm;
gvar.value = (int16_t)GVAR_VALUE(gv, getGVarFlightMode(fm, gv));
@@ -588,8 +578,6 @@ const int OpenTxSimulator::voltageToAdc(const int volts)
ret = (float)volts * 16.2f;
#elif defined(PCBTARANIS) || defined(PCBSKY9X)
ret = (float)volts * 13.3f;
#elif defined(PCBGRUVIN9X)
ret = (float)volts * 1.63f;
#else
ret = (float)volts * 14.15f;
#endif
+1 -46
View File
@@ -18,12 +18,7 @@
* GNU General Public License for more details.
*/
#if defined(QT_CORE_LIB) && 0 // experimental
#define SIMPGMSPC_USE_QT 1
#include <QElapsedTimer>
#else
#define SIMPGMSPC_USE_QT 0
#endif
#include "opentx.h"
#include <errno.h>
@@ -58,7 +53,7 @@ DMA_Stream_TypeDef dma1_stream2, dma1_stream5, dma1_stream7, dma2_stream1, dma2_
DMA_TypeDef dma2;
USART_TypeDef Usart0, Usart1, Usart2, Usart3, Usart4;
SysTick_Type systick;
#elif defined(CPUARM)
#else
Pio Pioa, Piob, Pioc;
Pmc pmc;
Ssc ssc;
@@ -159,7 +154,6 @@ void simuInit()
if ((int)state > 0) pin |= (mask); else pin &= ~(mask); \
break;
#if defined(CPUARM)
#if defined(PCBHORUS) || (defined(PCBTARANIS) && !defined(PCBX9E))
#define SWITCH_CASE NEG_CASE
#define SWITCH_INV POS_CASE
@@ -173,19 +167,6 @@ void simuInit()
if ((int)state > 0) pin2 &= ~(mask2); else pin2 |= (mask2); \
break;
#define SWITCH_3_INV(swtch, pin1, pin2, mask1, mask2) SWITCH_3_CASE(swtch, pin2, pin1, mask2, mask1)
#else // AVR
#if defined(PCBMEGA2560)
#define SWITCH_CASE POS_CASE
#else
#define SWITCH_CASE NEG_CASE
#endif
#define KEY_CASE POS_CASE
#define SWITCH_3_CASE(swtch, pin1, pin2, mask1, mask2) \
case swtch: \
if ((int)state >= 0) pin1 &= ~(mask1); else pin1 |= (mask1); \
if ((int)state <= 0) pin2 &= ~(mask2); else pin2 |= (mask2); \
break;
#endif
#define TRIM_CASE KEY_CASE
@@ -236,10 +217,6 @@ void simuSetKey(uint8_t key, bool state)
#endif
#if defined(PCBSKY9X) && !defined(REVX) && !defined(AR9X) && defined(ROTARY_ENCODERS)
KEY_CASE(BTN_REa, PIOB->PIO_PDSR, 0x40)
#elif (defined(PCBGRUVIN9X) || defined(PCBMEGA2560)) && (defined(ROTARY_ENCODERS) || defined(ROTARY_ENCODER_NAVIGATION))
KEY_CASE(BTN_REa, pind, 0x20)
#elif defined(PCB9X) && defined(ROTARY_ENCODER_NAVIGATION)
KEY_CASE(BTN_REa, RotEncoder, 0x20)
#endif
}
}
@@ -329,22 +306,6 @@ void simuSetSwitch(uint8_t swtch, int8_t state)
SWITCH_CASE(4, PIOA->PIO_PDSR, 1<<2)
SWITCH_CASE(5, PIOC->PIO_PDSR, 1<<16)
SWITCH_CASE(6, PIOC->PIO_PDSR, 1<<8)
#elif defined(PCBGRUVIN9X)
SWITCH_3_CASE(0, ping, pinb, (1<<INP_G_ID1), (1<<INP_B_ID2))
SWITCH_CASE(1, ping, 1<<INP_G_ThrCt)
SWITCH_CASE(2, ping, 1<<INP_G_RuddDR)
SWITCH_CASE(3, pinc, 1<<INP_C_ElevDR)
SWITCH_CASE(4, pinc, 1<<INP_C_AileDR)
SWITCH_CASE(5, ping, 1<<INP_G_Gear)
SWITCH_CASE(6, pinb, 1<<INP_B_Trainer)
#elif defined(PCBMEGA2560)
SWITCH_3_CASE(0, pinc, pinc, (1<<INP_C_ID1), (1<<INP_C_ID2))
SWITCH_CASE(1, ping, 1<<INP_G_ThrCt)
SWITCH_CASE(2, ping, 1<<INP_G_RuddDR)
SWITCH_CASE(3, pinc, 1<<INP_L_ElevDR)
SWITCH_CASE(4, pinc, 1<<INP_C_AileDR)
SWITCH_CASE(5, ping, 1<<INP_G_Gear)
SWITCH_CASE(6, pinb, 1<<INP_L_Trainer)
#else // PCB9X
SWITCH_3_CASE(0, ping, pine, (1<<INP_G_ID1), (1<<INP_E_ID2))
#if defined(TELEMETRY_JETI) || defined(TELEMETRY_FRSKY) || defined(TELEMETRY_NMEA) || defined(TELEMETRY_ARDUPILOT) || defined(TELEMETRY_MAVLINK)
@@ -418,14 +379,11 @@ void StopSimu()
main_thread_running = 0;
#if defined(CPUARM)
pthread_join(mixerTaskId, NULL);
pthread_join(menusTaskId, NULL);
#endif
pthread_join(main_thread_pid, NULL);
}
#if defined(CPUARM)
struct SimulatorAudio {
int volumeGain;
int currentVolume;
@@ -434,7 +392,6 @@ struct SimulatorAudio {
bool threadRunning;
pthread_t threadPid;
} simuAudio;
#endif
void audioConsumeCurrentBuffer()
{
@@ -636,7 +593,6 @@ int lcdRestoreBackupBuffer()
}
#if defined(CPUARM)
void pwrOff()
{
}
@@ -648,7 +604,6 @@ uint32_t pwrPressed()
return true;
#endif
}
#endif
#if defined(STM32)
void pwrInit() { }
-13
View File
@@ -208,16 +208,10 @@ extern uint8_t eeprom[EEPROM_SIZE];
extern uint8_t * eeprom;
#endif
#if defined(CPUARM)
extern void startPdcUsartReceive() ;
extern uint32_t txPdcUsart( uint8_t *buffer, uint32_t size );
extern uint32_t txPdcPending();
extern void rxPdcUsart( void (*pChProcess)(uint8_t x) );
#else
#define PIOA 0
#define PIOB 0
#define PIOC 0
#endif
#define loop_until_bit_is_set( port, bitnum) \
while ( 0/*! ( (port) & (1 << (bitnum)) )*/ ) ;
@@ -336,7 +330,6 @@ extern void rxPdcUsart( void (*pChProcess)(uint8_t x) );
#define asm(...)
#endif
#if defined(CPUARM)
extern uint32_t Master_frequency;
#define NVIC_EnableIRQ(x)
#define NVIC_DisableIRQ(x)
@@ -344,7 +337,6 @@ extern uint32_t Master_frequency;
#define NVIC_SystemReset() exit(0)
#define __disable_irq()
#define __enable_irq()
#endif
extern uint8_t portb, portc, porth, dummyport;
extern uint16_t dummyport16;
@@ -378,11 +370,6 @@ void StopEepromThread();
#define StopAudioThread()
#endif
#if !defined(CPUARM)
#define wdt_disable(...) sleep(1/*ms*/)
#define wdt_enable(...) sleep(1/*ms*/)
#define wdt_reset() sleep(1/*ms*/)
#endif
#define OS_MutexID pthread_mutex_t
extern OS_MutexID audioMutex;
+1 -1
View File
@@ -25,4 +25,4 @@ extern int g_snapshot_idx;
extern bool simuLcdRefresh;
extern display_t simuLcdBuf[DISPLAY_BUFFER_SIZE];
#endif // _SIMULCD_H_
#endif // _SIMULCD_H_