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

Remaining CPUARM removed

Browse source
This commit is contained in:
Bertrand Songis 2018-07-11 13:33:51 +02:00
parent 3f1d09bc68
commit db1d3fcb32
29 changed files with 79 additions and 79 deletions
Download patch file Download diff file Expand all files Collapse all files

14
radio/src/buzzer.h
View file

@ -35,17 +35,17 @@ extern uint8_t hapticTick;
#if defined(BUZZER) #if defined(BUZZER)
#if defined(CPUARM) && !defined(SIMU) #if defined(SIMU)
inline void _beep(uint8_t b)
{
buzzerSound(b);
}
#else /* CPUARM && !SIMU */
inline void _beep(uint8_t b) inline void _beep(uint8_t b)
{ {
g_beepCnt = b; g_beepCnt = b;
} }
#endif /* CPUARM && !SIMU */ #else /* SIMU */
inline void _beep(uint8_t b)
{
buzzerSound(b);
}
#endif /* SIMU */
void beep(uint8_t val); void beep(uint8_t val);
#else /* BUZZER */ #else /* BUZZER */

2
radio/src/debug.h
View file

@ -45,7 +45,7 @@ uint8_t serial2TracesEnabled();
#define debugPrintf(...) printf(__VA_ARGS__) #define debugPrintf(...) printf(__VA_ARGS__)
#elif defined(DEBUG) && defined(CLI) #elif defined(DEBUG) && defined(CLI)
#define debugPrintf(...) do { if (cliTracesEnabled) serialPrintf(__VA_ARGS__); } while(0) #define debugPrintf(...) do { if (cliTracesEnabled) serialPrintf(__VA_ARGS__); } while(0)
#elif defined(DEBUG) && defined(CPUARM) && defined(SERIAL2) #elif defined(DEBUG) && defined(SERIAL2)
#define debugPrintf(...) do { serialPrintf(__VA_ARGS__); } while(0) #define debugPrintf(...) do { serialPrintf(__VA_ARGS__); } while(0)
#else #else
#define debugPrintf(...) #define debugPrintf(...)

4
radio/src/functions.cpp
View file

@ -284,7 +284,7 @@ void evalFunctions(const CustomFunctionData * functions, CustomFunctionsContext
} }
#endif #endif
#if defined(CPUARM) && defined(SDCARD) #if defined(SDCARD)
case FUNC_PLAY_SOUND: case FUNC_PLAY_SOUND:
case FUNC_PLAY_TRACK: case FUNC_PLAY_TRACK:
case FUNC_PLAY_VALUE: case FUNC_PLAY_VALUE:
@ -411,7 +411,7 @@ void evalFunctions(const CustomFunctionData * functions, CustomFunctionsContext
} }
else { else {
functionsContext.lastFunctionTime[i] = 0; functionsContext.lastFunctionTime[i] = 0;
#if defined(CPUARM) && defined(DANGEROUS_MODULE_FUNCTIONS) #if defined(DANGEROUS_MODULE_FUNCTIONS)
if (functionsContext.activeSwitches & switch_mask) { if (functionsContext.activeSwitches & switch_mask) {
switch (CFN_FUNC(cfn)) { switch (CFN_FUNC(cfn)) {
case FUNC_RANGECHECK: case FUNC_RANGECHECK:

4
radio/src/gui/128x64/fonts.cpp
View file

@ -74,7 +74,7 @@ const pm_uchar font_10x14[] PROGMEM = {
}; };
#endif #endif
#if defined(CPUARM) && !defined(BOOT) #if !defined(BOOT)
const pm_uchar font_3x5[] PROGMEM = { const pm_uchar font_3x5[] PROGMEM = {
#include "font_03x05.lbm" #include "font_03x05.lbm"
}; };
@ -140,4 +140,4 @@ const pm_uchar font_10x14_extra[] PROGMEM = {
#include "font_10x14_extra.lbm" #include "font_10x14_extra.lbm"
}; };
#endif // defined(CPUARM) && !defined(BOOT) #endif // !defined(BOOT)

4
radio/src/gui/128x64/gui.h
View file

@ -231,13 +231,13 @@ int8_t editSwitch(coord_t x, coord_t y, int8_t value, LcdFlags attr, event_t eve
#define ON_OFF_MENU_ITEM(value, x, y, label, attr, event) value = editCheckBox(value, x, y, label, attr, event) #define ON_OFF_MENU_ITEM(value, x, y, label, attr, event) value = editCheckBox(value, x, y, label, attr, event)
#if defined(CPUARM) && defined(GVARS) #if defined(GVARS)
#define GVAR_MENU_ITEM(x, y, v, min, max, attr, editflags, event) editGVarFieldValue(x, y, v, min, max, attr, editflags, event) #define GVAR_MENU_ITEM(x, y, v, min, max, attr, editflags, event) editGVarFieldValue(x, y, v, min, max, attr, editflags, event)
#else #else
#define GVAR_MENU_ITEM(x, y, v, min, max, attr, editflags, event) editGVarFieldValue(x, y, v, min, max, attr, event) #define GVAR_MENU_ITEM(x, y, v, min, max, attr, editflags, event) editGVarFieldValue(x, y, v, min, max, attr, event)
#endif #endif
#if defined(GVARS) && defined(CPUARM) #if defined(GVARS)
int16_t editGVarFieldValue(coord_t x, coord_t y, int16_t value, int16_t min, int16_t max, LcdFlags attr, uint8_t editflags, event_t event); int16_t editGVarFieldValue(coord_t x, coord_t y, int16_t value, int16_t min, int16_t max, LcdFlags attr, uint8_t editflags, event_t event);
void drawGVarName(coord_t x, coord_t y, int8_t index, LcdFlags flags=0); void drawGVarName(coord_t x, coord_t y, int8_t index, LcdFlags flags=0);
void drawGVarValue(coord_t x, coord_t y, uint8_t gvar, gvar_t value, LcdFlags flags=0); void drawGVarValue(coord_t x, coord_t y, uint8_t gvar, gvar_t value, LcdFlags flags=0);

14
radio/src/gui/128x64/lcd.cpp
View file

@ -115,7 +115,7 @@ void lcdPutPattern(coord_t x, coord_t y, const uint8_t * pattern, uint8_t width,
} }
} }
#if defined(CPUARM) && !defined(BOOT) #if !defined(BOOT)
struct PatternData struct PatternData
{ {
uint8_t width; uint8_t width;
@ -287,7 +287,7 @@ void lcdDrawChar(coord_t x, coord_t y, const unsigned char c)
lcdDrawChar(x, y, c, 0); lcdDrawChar(x, y, c, 0);
} }
#if defined(CPUARM) && !defined(BOOT) #if !defined(BOOT)
uint8_t getTextWidth(const char * s, uint8_t len, LcdFlags flags) uint8_t getTextWidth(const char * s, uint8_t len, LcdFlags flags)
{ {
uint8_t width = 0; uint8_t width = 0;
@ -310,7 +310,7 @@ void lcdDrawSizedText(coord_t x, coord_t y, const pm_char * s, uint8_t len, LcdF
const uint8_t orig_len = len; const uint8_t orig_len = len;
uint32_t fontsize = FONTSIZE(flags); uint32_t fontsize = FONTSIZE(flags);
#if defined(CPUARM) && !defined(BOOT) #if !defined(BOOT)
uint8_t width = 0; uint8_t width = 0;
if (flags & RIGHT) { if (flags & RIGHT) {
width = getTextWidth(s, len, flags); width = getTextWidth(s, len, flags);
@ -372,7 +372,7 @@ void lcdDrawSizedText(coord_t x, coord_t y, const pm_char * s, uint8_t len, LcdF
} }
lcdLastRightPos = x; lcdLastRightPos = x;
lcdNextPos = x; lcdNextPos = x;
#if defined(CPUARM) && !defined(BOOT) #if !defined(BOOT)
if (fontsize == MIDSIZE) { if (fontsize == MIDSIZE) {
lcdLastRightPos += 1; lcdLastRightPos += 1;
} }
@ -475,7 +475,7 @@ void lcdDrawSolidHorizontalLine(coord_t x, coord_t y, coord_t w, LcdFlags att)
lcdDrawHorizontalLine(x, y, w, 0xff, att); lcdDrawHorizontalLine(x, y, w, 0xff, att);
} }
#if defined(CPUARM) && !defined(BOOT) #if !defined(BOOT)
void lcdDrawLine(coord_t x1, coord_t y1, coord_t x2, coord_t y2, uint8_t pat, LcdFlags att) void lcdDrawLine(coord_t x1, coord_t y1, coord_t x2, coord_t y2, uint8_t pat, LcdFlags att)
{ {
int dx = x2-x1; /* the horizontal distance of the line */ int dx = x2-x1; /* the horizontal distance of the line */
@ -595,7 +595,7 @@ void drawTelemetryTopBar()
lcdInvertLine(0); lcdInvertLine(0);
} }
#if defined(CPUARM) && defined(RTCLOCK) #if defined(RTCLOCK)
void drawRtcTime(coord_t x, coord_t y, LcdFlags att) void drawRtcTime(coord_t x, coord_t y, LcdFlags att)
{ {
drawTimer(x, y, getValue(MIXSRC_TX_TIME), att, att); drawTimer(x, y, getValue(MIXSRC_TX_TIME), att, att);
@ -638,7 +638,7 @@ void drawTimer(coord_t x, coord_t y, putstime_t tme, LcdFlags att, LcdFlags att2
} }
if (separator == CHR_HOUR) if (separator == CHR_HOUR)
att &= ~DBLSIZE; att &= ~DBLSIZE;
#if defined(CPUARM) && defined(RTCLOCK) #if defined(RTCLOCK)
if (att & TIMEBLINK) if (att & TIMEBLINK)
lcdDrawChar(lcdLastRightPos, y, separator, BLINK); lcdDrawChar(lcdLastRightPos, y, separator, BLINK);
else else

2
radio/src/gui/128x64/model_select.cpp
View file

@ -300,7 +300,7 @@ void menuModelSelect(event_t event)
break; break;
} }
#if defined(EEPROM_RLC) && defined(CPUARM) #if defined(EEPROM_RLC)
lcdDrawText(9*FW-(LEN_FREE-4)*FW-4, 0, STR_FREE); lcdDrawText(9*FW-(LEN_FREE-4)*FW-4, 0, STR_FREE);
if (event) reusableBuffer.modelsel.eepromfree = EeFsGetFree(); if (event) reusableBuffer.modelsel.eepromfree = EeFsGetFree();
lcdDrawNumber(lcdLastRightPos+3, 0, reusableBuffer.modelsel.eepromfree, LEFT); lcdDrawNumber(lcdLastRightPos+3, 0, reusableBuffer.modelsel.eepromfree, LEFT);

4
radio/src/gui/128x64/model_setup.cpp
View file

@ -297,7 +297,7 @@ void menuModelSetup(event_t event)
MENU_CHECK(menuTabModel, MENU_MODEL_SETUP, HEADER_LINE+MODEL_SETUP_MAX_LINES); MENU_CHECK(menuTabModel, MENU_MODEL_SETUP, HEADER_LINE+MODEL_SETUP_MAX_LINES);
#if defined(CPUARM) && (defined(DSM2) || defined(PXX)) #if (defined(DSM2) || defined(PXX))
if (menuEvent) { if (menuEvent) {
moduleFlag[0] = 0; moduleFlag[0] = 0;
#if NUM_MODULES > 1 #if NUM_MODULES > 1
@ -1315,7 +1315,7 @@ void menuModelSetup(event_t event)
} }
} }
#if defined(CPUARM) && defined(PXX) #if defined(PXX)
if (IS_RANGECHECK_ENABLE()) { if (IS_RANGECHECK_ENABLE()) {
showMessageBox("RSSI: "); showMessageBox("RSSI: ");
lcdDrawNumber(16+4*FW, 5*FH, TELEMETRY_RSSI(), BOLD); lcdDrawNumber(16+4*FW, 5*FH, TELEMETRY_RSSI(), BOLD);

8
radio/src/gui/128x64/model_special_functions.cpp
View file

@ -30,7 +30,7 @@
#define MODEL_SPECIAL_FUNC_4TH_COLUMN_ONOFF (18*FW+2) #define MODEL_SPECIAL_FUNC_4TH_COLUMN_ONOFF (18*FW+2)
#endif #endif
#if defined(CPUARM) && defined(SDCARD) #if defined(SDCARD)
void onCustomFunctionsFileSelectionMenu(const char * result) void onCustomFunctionsFileSelectionMenu(const char * result)
{ {
int sub = menuVerticalPosition - HEADER_LINE; int sub = menuVerticalPosition - HEADER_LINE;
@ -68,7 +68,7 @@ void onCustomFunctionsFileSelectionMenu(const char * result)
storageDirty(eeFlags); storageDirty(eeFlags);
} }
} }
#endif // CPUARM && SDCARD #endif // SDCARD
#if defined(PCBTARANIS) #if defined(PCBTARANIS)
@ -296,7 +296,7 @@ void menuSpecialFunctions(event_t event, CustomFunctionData * functions, CustomF
lcdDrawNumber(MODEL_SPECIAL_FUNC_3RD_COLUMN, y, val_displayed, attr|LEFT); lcdDrawNumber(MODEL_SPECIAL_FUNC_3RD_COLUMN, y, val_displayed, attr|LEFT);
} }
#endif #endif
#if defined(CPUARM) && defined(SDCARD) #if defined(SDCARD)
else if (func == FUNC_PLAY_TRACK || func == FUNC_BACKGND_MUSIC || func == FUNC_PLAY_SCRIPT) { else if (func == FUNC_PLAY_TRACK || func == FUNC_BACKGND_MUSIC || func == FUNC_PLAY_SCRIPT) {
if (ZEXIST(cfn->play.name)) if (ZEXIST(cfn->play.name))
lcdDrawSizedText(MODEL_SPECIAL_FUNC_3RD_COLUMN, y, cfn->play.name, sizeof(cfn->play.name), attr); lcdDrawSizedText(MODEL_SPECIAL_FUNC_3RD_COLUMN, y, cfn->play.name, sizeof(cfn->play.name), attr);
@ -330,7 +330,7 @@ void menuSpecialFunctions(event_t event, CustomFunctionData * functions, CustomF
INCDEC_ENABLE_CHECK(functionsContext == &globalFunctionsContext ? isSourceAvailableInGlobalFunctions : isSourceAvailable); INCDEC_ENABLE_CHECK(functionsContext == &globalFunctionsContext ? isSourceAvailableInGlobalFunctions : isSourceAvailable);
} }
} }
#endif // CPUARM && SDCARD #endif // SDCARD
else if (func == FUNC_VOLUME) { else if (func == FUNC_VOLUME) {
val_max = MIXSRC_LAST_CH; val_max = MIXSRC_LAST_CH;
drawSource(MODEL_SPECIAL_FUNC_3RD_COLUMN, y, val_displayed, attr); drawSource(MODEL_SPECIAL_FUNC_3RD_COLUMN, y, val_displayed, attr);

14
radio/src/gui/128x64/radio_setup.cpp
View file

@ -61,11 +61,11 @@ enum MenuRadioSetupItems {
CASE_AUDIO(ITEM_SETUP_SPEAKER_PITCH) CASE_AUDIO(ITEM_SETUP_SPEAKER_PITCH)
ITEM_SETUP_WAV_VOLUME, ITEM_SETUP_WAV_VOLUME,
ITEM_SETUP_BACKGROUND_VOLUME, ITEM_SETUP_BACKGROUND_VOLUME,
CASE_VARIO_CPUARM(ITEM_SETUP_VARIO_LABEL) CASE_VARIO(ITEM_SETUP_VARIO_LABEL)
CASE_VARIO_CPUARM(ITEM_SETUP_VARIO_VOLUME) CASE_VARIO(ITEM_SETUP_VARIO_VOLUME)
CASE_VARIO_CPUARM(ITEM_SETUP_VARIO_PITCH) CASE_VARIO(ITEM_SETUP_VARIO_PITCH)
CASE_VARIO_CPUARM(ITEM_SETUP_VARIO_RANGE) CASE_VARIO(ITEM_SETUP_VARIO_RANGE)
CASE_VARIO_CPUARM(ITEM_SETUP_VARIO_REPEAT) CASE_VARIO(ITEM_SETUP_VARIO_REPEAT)
CASE_HAPTIC(ITEM_SETUP_HAPTIC_LABEL) CASE_HAPTIC(ITEM_SETUP_HAPTIC_LABEL)
CASE_HAPTIC(ITEM_SETUP_HAPTIC_MODE) CASE_HAPTIC(ITEM_SETUP_HAPTIC_MODE)
CASE_HAPTIC(ITEM_SETUP_HAPTIC_LENGTH) CASE_HAPTIC(ITEM_SETUP_HAPTIC_LENGTH)
@ -131,7 +131,7 @@ void menuRadioSetup(event_t event)
} }
#endif #endif
MENU(STR_MENURADIOSETUP, menuTabGeneral, MENU_RADIO_SETUP, HEADER_LINE+ITEM_SETUP_MAX, { HEADER_LINE_COLUMNS CASE_RTCLOCK(2) CASE_RTCLOCK(2) CASE_BATTGRAPH(1) LABEL(SOUND), CASE_AUDIO(0) CASE_BUZZER(0) CASE_VOICE(0) 0, 0, 0, 0, CASE_AUDIO(0) CASE_VARIO_CPUARM(LABEL(VARIO)) CASE_VARIO_CPUARM(0) CASE_VARIO_CPUARM(0) CASE_VARIO_CPUARM(0) CASE_VARIO_CPUARM(0) CASE_HAPTIC(LABEL(HAPTIC)) CASE_HAPTIC(0) CASE_HAPTIC(0) CASE_HAPTIC(0) 0, LABEL(ALARMS), 0, CASE_CAPACITY(0) CASE_PCBSKY9X(0) 0, 0, 0, 0, IF_ROTARY_ENCODERS(0) LABEL(BACKLIGHT), 0, 0, 0, CASE_PWM_BACKLIGHT(0) CASE_PWM_BACKLIGHT(0) 0, CASE_SPLASH_PARAM(0) CASE_GPS(0) 0, CASE_GPS(0) CASE_PXX(0) 0, 0, IF_FAI_CHOICE(0) 0, CASE_STM32(0) 0, COL_TX_MODE, 0, 1/*to force edit mode*/}); MENU(STR_MENURADIOSETUP, menuTabGeneral, MENU_RADIO_SETUP, HEADER_LINE+ITEM_SETUP_MAX, { HEADER_LINE_COLUMNS CASE_RTCLOCK(2) CASE_RTCLOCK(2) CASE_BATTGRAPH(1) LABEL(SOUND), CASE_AUDIO(0) CASE_BUZZER(0) CASE_VOICE(0) 0, 0, 0, 0, CASE_AUDIO(0) CASE_VARIO(LABEL(VARIO)) CASE_VARIO(0) CASE_VARIO(0) CASE_VARIO(0) CASE_VARIO(0) CASE_HAPTIC(LABEL(HAPTIC)) CASE_HAPTIC(0) CASE_HAPTIC(0) CASE_HAPTIC(0) 0, LABEL(ALARMS), 0, CASE_CAPACITY(0) CASE_PCBSKY9X(0) 0, 0, 0, 0, IF_ROTARY_ENCODERS(0) LABEL(BACKLIGHT), 0, 0, 0, CASE_PWM_BACKLIGHT(0) CASE_PWM_BACKLIGHT(0) 0, CASE_SPLASH_PARAM(0) CASE_GPS(0) 0, CASE_GPS(0) CASE_PXX(0) 0, 0, IF_FAI_CHOICE(0) 0, CASE_STM32(0) 0, COL_TX_MODE, 0, 1/*to force edit mode*/});
if (event == EVT_ENTRY) { if (event == EVT_ENTRY) {
reusableBuffer.generalSettings.stickMode = g_eeGeneral.stickMode; reusableBuffer.generalSettings.stickMode = g_eeGeneral.stickMode;
@ -291,7 +291,7 @@ void menuRadioSetup(event_t event)
break; break;
#endif #endif
#if defined(CPUARM) && defined(VARIO) #if defined(VARIO)
case ITEM_SETUP_VARIO_LABEL: case ITEM_SETUP_VARIO_LABEL:
lcdDrawTextAlignedLeft(y, STR_VARIO); lcdDrawTextAlignedLeft(y, STR_VARIO);
break; break;

4
radio/src/gui/128x64/radio_version.cpp
View file

@ -22,7 +22,7 @@
void menuRadioVersion(event_t event) void menuRadioVersion(event_t event)
{ {
#if defined(CPUARM) && defined(EEPROM_RLC) #if defined(EEPROM_RLC)
if (warningResult) { if (warningResult) {
warningResult = 0; warningResult = 0;
showMessageBox(STR_STORAGE_FORMAT); showMessageBox(STR_STORAGE_FORMAT);
@ -43,7 +43,7 @@ void menuRadioVersion(event_t event)
else { else {
lcdDrawTextAlignedLeft(6*FH, PSTR("CoPr: ---")); lcdDrawTextAlignedLeft(6*FH, PSTR("CoPr: ---"));
} }
#elif defined(CPUARM) && defined(EEPROM_RLC) #elif defined(EEPROM_RLC)
lcdDrawTextAlignedLeft(MENU_HEADER_HEIGHT+5*FH+1, STR_EEBACKUP); lcdDrawTextAlignedLeft(MENU_HEADER_HEIGHT+5*FH+1, STR_EEBACKUP);
lcdDrawTextAlignedLeft(MENU_HEADER_HEIGHT+6*FH+1, STR_FACTORYRESET); lcdDrawTextAlignedLeft(MENU_HEADER_HEIGHT+6*FH+1, STR_FACTORYRESET);
lcdDrawFilledRect(0, MENU_HEADER_HEIGHT+5*FH, LCD_W, 2*FH+1, SOLID); lcdDrawFilledRect(0, MENU_HEADER_HEIGHT+5*FH, LCD_W, 2*FH+1, SOLID);

6
radio/src/gui/128x64/view_main.cpp
View file

@ -47,7 +47,7 @@
#define TRIM_LH_POS (TRIM_LH_X-4*FW) #define TRIM_LH_POS (TRIM_LH_X-4*FW)
#define TRIM_RH_NEG (TRIM_RH_X+1*FW) #define TRIM_RH_NEG (TRIM_RH_X+1*FW)
#define TRIM_RH_POS (TRIM_RH_X-4*FW) #define TRIM_RH_POS (TRIM_RH_X-4*FW)
#if defined(TELEMETRY_FRSKY) && defined(CPUARM) #if defined(TELEMETRY_FRSKY)
#define RSSSI_X (30) #define RSSSI_X (30)
#define RSSSI_Y (31) #define RSSSI_Y (31)
#define RSSI_MAX 105 #define RSSI_MAX 105
@ -55,7 +55,7 @@
#define TRIM_LEN 23 #define TRIM_LEN 23
#if defined(TELEMETRY_FRSKY) && defined(CPUARM) #if defined(TELEMETRY_FRSKY)
void drawRSSIGauge() void drawRSSIGauge()
{ {
uint8_t bar = (RSSI_MAX - g_model.rssiAlarms.getWarningRssi()) / 4; uint8_t bar = (RSSI_MAX - g_model.rssiAlarms.getWarningRssi()) / 4;
@ -441,7 +441,7 @@ void menuMainView(event_t event)
// Trims sliders // Trims sliders
displayTrims(mode); displayTrims(mode);
#if defined(TELEMETRY_FRSKY) && defined(CPUARM) #if defined(TELEMETRY_FRSKY)
// RSSI gauge // RSSI gauge
if (TELEMETRY_RSSI() > 0) { if (TELEMETRY_RSSI() > 0) {
drawRSSIGauge(); drawRSSIGauge();

2
radio/src/gui/128x64/widgets.cpp
View file

@ -104,7 +104,7 @@ void drawSlider(coord_t x, coord_t y, uint8_t value, uint8_t max, uint8_t attr)
} }
#if defined(GVARS) && defined(CPUARM) #if defined(GVARS)
void drawGVarValue(coord_t x, coord_t y, uint8_t gvar, gvar_t value, LcdFlags flags) void drawGVarValue(coord_t x, coord_t y, uint8_t gvar, gvar_t value, LcdFlags flags)
{ {
uint8_t prec = g_model.gvars[gvar].prec; uint8_t prec = g_model.gvars[gvar].prec;

2
radio/src/gui/common/stdlcd/model_curves.cpp
View file

@ -94,7 +94,7 @@ void menuModelCurvesAll(event_t event)
if (CURVE_SELECTED()) { if (CURVE_SELECTED()) {
s_curveChan = sub; s_curveChan = sub;
#if !defined(CPUARM) || LCD_W >= 212 #if LCD_W >= 212
drawCurve(23); drawCurve(23);
#else #else
drawCurve(10); drawCurve(10);

2
radio/src/myeeprom.h
View file

@ -319,7 +319,7 @@ enum SwashType {
#define IS_MANUAL_RESET_TIMER(idx) (g_model.timers[idx].persistent == 2) #define IS_MANUAL_RESET_TIMER(idx) (g_model.timers[idx].persistent == 2)
#if defined(CPUARM) && !defined(PCBSKY9X) #if !defined(PCBSKY9X)
#define TIMER_COUNTDOWN_START(x) (g_model.timers[x].countdownStart > 0 ? 5 : 10 - g_model.timers[x].countdownStart * 10) #define TIMER_COUNTDOWN_START(x) (g_model.timers[x].countdownStart > 0 ? 5 : 10 - g_model.timers[x].countdownStart * 10)
#else #else
#define TIMER_COUNTDOWN_START(x) 10 #define TIMER_COUNTDOWN_START(x) 10

16
radio/src/opentx.cpp
View file

@ -367,7 +367,7 @@ void applyDefaultTemplate()
} }
} }
#if defined(CPUARM) && defined(EEPROM) #if defined(EEPROM)
void checkModelIdUnique(uint8_t index, uint8_t module) void checkModelIdUnique(uint8_t index, uint8_t module)
{ {
uint8_t modelId = g_model.header.modelId[module]; uint8_t modelId = g_model.header.modelId[module];
@ -475,14 +475,14 @@ void modelDefault(uint8_t id)
g_model.trainerMode = TRAINER_MODE_MASTER_BLUETOOTH; g_model.trainerMode = TRAINER_MODE_MASTER_BLUETOOTH;
#endif #endif
#if defined(CPUARM) && defined(EEPROM) #if defined(EEPROM)
for (int i=0; i<NUM_MODULES; i++) { for (int i=0; i<NUM_MODULES; i++) {
modelHeaders[id].modelId[i] = g_model.header.modelId[i] = id+1; modelHeaders[id].modelId[i] = g_model.header.modelId[i] = id+1;
} }
checkModelIdUnique(id, 0); checkModelIdUnique(id, 0);
#endif #endif
#if defined(CPUARM) && defined(FLIGHT_MODES) && defined(GVARS) #if defined(FLIGHT_MODES) && defined(GVARS)
for (int p=1; p<MAX_FLIGHT_MODES; p++) { for (int p=1; p<MAX_FLIGHT_MODES; p++) {
for (int i=0; i<MAX_GVARS; i++) { for (int i=0; i<MAX_GVARS; i++) {
g_model.flightModeData[p].gvars[i] = GVAR_MAX+1; g_model.flightModeData[p].gvars[i] = GVAR_MAX+1;
@ -864,7 +864,7 @@ void doSplash()
#define doSplash() #define doSplash()
#endif #endif
#if defined(SDCARD) && defined(CPUARM) #if defined(SDCARD)
void checkSDVersion() void checkSDVersion()
{ {
if (sdMounted()) { if (sdMounted()) {
@ -932,7 +932,7 @@ void checkAll()
#endif #endif
checkRSSIAlarmsDisabled(); checkRSSIAlarmsDisabled();
#if defined(SDCARD) && defined(CPUARM) #if defined(SDCARD)
checkSDVersion(); checkSDVersion();
#endif #endif
@ -1754,7 +1754,7 @@ void opentxClose(uint8_t shutdown)
storageFlushCurrentModel(); storageFlushCurrentModel();
#if defined(CPUARM) && !defined(REVA) #if !defined(REVA)
if (sessionTimer > 0) { if (sessionTimer > 0) {
g_eeGeneral.globalTimer += sessionTimer; g_eeGeneral.globalTimer += sessionTimer;
sessionTimer = 0; sessionTimer = 0;
@ -2006,7 +2006,7 @@ void moveTrimsToOffsets() // copy state of 3 primary to subtrim
volatile rotenc_t rotencValue[1] = {0}; volatile rotenc_t rotencValue[1] = {0};
#endif #endif
#if defined(CPUARM) && defined(ROTARY_ENCODER_NAVIGATION) #if defined(ROTARY_ENCODER_NAVIGATION)
uint8_t rotencSpeed; uint8_t rotencSpeed;
#endif #endif
@ -2108,7 +2108,7 @@ void opentxInit(OPENTX_INIT_ARGS)
} }
#endif #endif
#if defined(VOICE) && defined(CPUARM) #if defined(VOICE)
currentSpeakerVolume = requiredSpeakerVolume = g_eeGeneral.speakerVolume + VOLUME_LEVEL_DEF; currentSpeakerVolume = requiredSpeakerVolume = g_eeGeneral.speakerVolume + VOLUME_LEVEL_DEF;
#if !defined(SOFTWARE_VOLUME) #if !defined(SOFTWARE_VOLUME)
setScaledVolume(currentSpeakerVolume); setScaledVolume(currentSpeakerVolume);

18
radio/src/opentx.h
View file

@ -51,10 +51,10 @@
#define CASE_STM32(x) #define CASE_STM32(x)
#endif #endif
#if defined(VARIO) && defined(CPUARM) #if defined(VARIO)
#define CASE_VARIO_CPUARM(x) x, #define CASE_VARIO(x) x,
#else #else
#define CASE_VARIO_CPUARM(x) #define CASE_VARIO(x)
#endif #endif
#if defined(LUA) #if defined(LUA)
@ -440,7 +440,7 @@ typedef struct {
#if !defined(SIMU) #if !defined(SIMU)
#define assert(x) #define assert(x)
#if !defined(CPUARM) || !defined(DEBUG) #if !defined(DEBUG)
#define printf printf_not_allowed #define printf printf_not_allowed
#endif #endif
#endif #endif
@ -494,7 +494,7 @@ extern uint8_t channel_order(uint8_t x);
#define ROTARY_ENCODER_NAVIGATION_VALUE rotencValue[0] #define ROTARY_ENCODER_NAVIGATION_VALUE rotencValue[0]
#endif #endif
#if defined(CPUARM) && defined(ROTARY_ENCODER_NAVIGATION) #if defined(ROTARY_ENCODER_NAVIGATION)
extern uint8_t rotencSpeed; extern uint8_t rotencSpeed;
#define ROTENC_LOWSPEED 1 #define ROTENC_LOWSPEED 1
#define ROTENC_MIDSPEED 5 #define ROTENC_MIDSPEED 5
@ -512,7 +512,7 @@ extern uint8_t channel_order(uint8_t x);
#endif #endif
extern uint8_t heartbeat; extern uint8_t heartbeat;
#if defined(CPUARM) && !defined(BOOT) #if !defined(BOOT)
void watchdogSuspend(uint32_t timeout); void watchdogSuspend(uint32_t timeout);
#define WATCHDOG_SUSPEND(x) watchdogSuspend(x) #define WATCHDOG_SUSPEND(x) watchdogSuspend(x)
#else #else
@ -605,7 +605,7 @@ extern uint8_t flightModeTransitionLast;
#if defined(SIMU) #if defined(SIMU)
inline int availableMemory() { return 1000; } inline int availableMemory() { return 1000; }
#elif defined(CPUARM) && !defined(SIMU) #elif !defined(SIMU)
extern unsigned char *heap; extern unsigned char *heap;
extern int _end; extern int _end;
extern int _estack; extern int _estack;
@ -782,7 +782,7 @@ template<class t> void SWAP(t & a, t & b) { t tmp = b; b = a; a = tmp; }
uint16_t isqrt32(uint32_t n); uint16_t isqrt32(uint32_t n);
#if defined(CPUARM) && !defined(BOOT) #if !defined(BOOT)
#include "tasks_arm.h" #include "tasks_arm.h"
extern OS_MutexID mixerMutex; extern OS_MutexID mixerMutex;
inline void pauseMixerCalculations() inline void pauseMixerCalculations()
@ -802,7 +802,7 @@ inline void resumeMixerCalculations()
void generalDefault(); void generalDefault();
void modelDefault(uint8_t id); void modelDefault(uint8_t id);
#if defined(CPUARM) && defined(EEPROM) #if defined(EEPROM)
void checkModelIdUnique(uint8_t index, uint8_t module); void checkModelIdUnique(uint8_t index, uint8_t module);
uint8_t findNextUnusedModelId(uint8_t index, uint8_t module); uint8_t findNextUnusedModelId(uint8_t index, uint8_t module);
#endif #endif

4
radio/src/sdcard.cpp
View file

@ -433,7 +433,7 @@ FRESULT sdReadDir(DIR * dir, FILINFO * fno, bool & firstTime)
return res; return res;
} }
#if defined(CPUARM) && defined(SDCARD) #if defined(SDCARD)
const char * sdCopyFile(const char * srcPath, const char * destPath) const char * sdCopyFile(const char * srcPath, const char * destPath)
{ {
FIL srcFile; FIL srcFile;
@ -484,7 +484,7 @@ const char * sdCopyFile(const char * srcFilename, const char * srcDir, const cha
return sdCopyFile(srcPath, destPath); return sdCopyFile(srcPath, destPath);
} }
#endif // defined(CPUARM) && defined(SDCARD) #endif // defined(SDCARD)
#if !defined(SIMU) || defined(SIMU_DISKIO) #if !defined(SIMU) || defined(SIMU_DISKIO)

2
radio/src/storage/storage_common.cpp
View file

@ -99,7 +99,7 @@ void postModelLoad(bool alarms)
frskySendAlarms(); frskySendAlarms();
#endif #endif
#if defined(CPUARM) && defined(SDCARD) #if defined(SDCARD)
referenceModelAudioFiles(); referenceModelAudioFiles();
#endif #endif

2
radio/src/strhelpers.cpp
View file

@ -141,7 +141,7 @@ char * strcat_zchar(char * dest, const char * name, uint8_t size, const char * d
} }
#endif #endif
#if defined(CPUARM) && !defined(BOOT) #if !defined(BOOT)
char * getStringAtIndex(char * dest, const char * s, int idx) char * getStringAtIndex(char * dest, const char * s, int idx)
{ {
uint8_t len = s[0]; uint8_t len = s[0];

2
radio/src/strhelpers.h
View file

@ -28,7 +28,7 @@ char * strSetCursor(char * dest, int position);
char * strAppendDate(char * str, bool time=false); char * strAppendDate(char * str, bool time=false);
char * strAppendFilename(char * dest, const char * filename, const int size); char * strAppendFilename(char * dest, const char * filename, const int size);
#if defined(CPUARM) && !defined(BOOT) #if !defined(BOOT)
char * getStringAtIndex(char * dest, const char * s, int idx); char * getStringAtIndex(char * dest, const char * s, int idx);
char * strAppendStringWithIndex(char * dest, const char * s, int idx); char * strAppendStringWithIndex(char * dest, const char * s, int idx);
#define LEN_TIMER_STRING 10 // "-00:00:00" #define LEN_TIMER_STRING 10 // "-00:00:00"

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

@ -30,7 +30,7 @@
#include <sys/time.h> #include <sys/time.h>
#endif #endif
#if defined(SIMU_AUDIO) && defined(CPUARM) #if defined(SIMU_AUDIO)
#include <SDL.h> #include <SDL.h>
#endif #endif
@ -401,7 +401,7 @@ int32_t getVolume()
} }
#endif #endif
#if defined(SIMU_AUDIO) && defined(CPUARM) #if defined(SIMU_AUDIO)
void copyBuffer(uint8_t * dest, const uint16_t * buff, unsigned int samples) void copyBuffer(uint8_t * dest, const uint16_t * buff, unsigned int samples)
{ {
for(unsigned int i=0; i<samples; i++) { for(unsigned int i=0; i<samples; i++) {
@ -522,7 +522,7 @@ void StopAudioThread()
simuAudio.threadRunning = false; simuAudio.threadRunning = false;
pthread_join(simuAudio.threadPid, NULL); pthread_join(simuAudio.threadPid, NULL);
} }
#endif // #if defined(SIMU_AUDIO) && defined(CPUARM) #endif // #if defined(SIMU_AUDIO)
uint16_t stackAvailable() uint16_t stackAvailable()
{ {

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

@ -362,7 +362,7 @@ void simuSetSwitch(uint8_t swtch, int8_t state);
void StartEepromThread(const char *filename="eeprom.bin"); void StartEepromThread(const char *filename="eeprom.bin");
void StopEepromThread(); void StopEepromThread();
#if defined(SIMU_AUDIO) && defined(CPUARM) #if defined(SIMU_AUDIO)
void StartAudioThread(int volumeGain = 10); void StartAudioThread(int volumeGain = 10);
void StopAudioThread(void); void StopAudioThread(void);
#else #else

4
radio/src/tests/frsky.cpp
View file

@ -31,7 +31,7 @@ void displayVoltagesScreen();
#endif #endif
#if defined(TELEMETRY_FRSKY) && defined(CPUARM) #if defined(TELEMETRY_FRSKY)
TEST(FrSky, TelemetryValueWithMinAveraging) TEST(FrSky, TelemetryValueWithMinAveraging)
{ {
/* /*
@ -150,7 +150,7 @@ TEST(FrSky, Gps)
EXPECT_EQ(telemetryItems[0].gps.longitude, 45341666); EXPECT_EQ(telemetryItems[0].gps.longitude, 45341666);
} }
#endif // defined(TELEMETRY_FRSKY) && defined(CPUARM) #endif // defined(TELEMETRY_FRSKY)
#if defined(TELEMETRY_FRSKY_SPORT) #if defined(TELEMETRY_FRSKY_SPORT)
TEST(FrSkySPORT, checkCrc) TEST(FrSkySPORT, checkCrc)

2
radio/src/tests/gtests.h
View file

@ -44,7 +44,7 @@ void doMixerCalculations();
inline void SYSTEM_RESET() inline void SYSTEM_RESET()
{ {
#if defined(CPUARM) && defined(EEPROM) #if defined(EEPROM)
memset(modelHeaders, 0, sizeof(modelHeaders)); memset(modelHeaders, 0, sizeof(modelHeaders));
#endif #endif
generalDefault(); generalDefault();

2
radio/src/tests/lcd.cpp
View file

@ -106,7 +106,7 @@ TEST(outdezNAtt, test_unsigned)
lcdDrawNumber(0, 0, 65530, LEFT); lcdDrawNumber(0, 0, 65530, LEFT);
EXPECT_TRUE(checkScreenshot("unsigned")) << "Unsigned numbers will be bad displayed"; EXPECT_TRUE(checkScreenshot("unsigned")) << "Unsigned numbers will be bad displayed";
} }
#elif defined(CPUARM) && LCD_W <= 128 #elif LCD_W <= 128
TEST(outdezNAtt, test_unsigned) TEST(outdezNAtt, test_unsigned)
{ {
lcdClear(); lcdClear();

4
radio/src/thirdparty/FatFs/ffconf.h vendored
View file

@ -4,7 +4,7 @@
#define _FFCONF 68020 /* Revision ID */ #define _FFCONF 68020 /* Revision ID */
#if defined(CPUARM) && !defined(SIMU) #if !defined(SIMU)
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
@ -261,7 +261,7 @@ extern "C" {
/ can be opened simultaneously under file lock control. Note that the file / can be opened simultaneously under file lock control. Note that the file
/ lock control is independent of re-entrancy. */ / lock control is independent of re-entrancy. */
#if defined(CPUARM) && !defined(BOOT) #if !defined(BOOT)
#define _FS_REENTRANT 1 /* 0:Disable or 1:Enable */ #define _FS_REENTRANT 1 /* 0:Disable or 1:Enable */
#define _SYNC_t unsigned char /*OS_MutexID*/ /* O/S dependent type of sync object. e.g. HANDLE, OS_EVENT*, ID and etc.. */ #define _SYNC_t unsigned char /*OS_MutexID*/ /* O/S dependent type of sync object. e.g. HANDLE, OS_EVENT*, ID and etc.. */
#else #else

2
radio/src/translations.cpp
View file

@ -76,7 +76,7 @@ const pm_char STR_OPEN9X[] PROGMEM =
ISTR(VKEYS) ISTR(VKEYS)
ISTR(VSWITCHES) ISTR(VSWITCHES)
ISTR(VSRCRAW) ISTR(VSRCRAW)
#if defined(TRANSLATIONS_CZ) && defined(CPUARM) #if defined(TRANSLATIONS_CZ)
ISTR(INPUTNAMES) ISTR(INPUTNAMES)
#endif #endif
ISTR(VTMRMODES) ISTR(VTMRMODES)

6
radio/src/translations.h
View file

@ -171,7 +171,7 @@ extern const pm_char STR_OPEN9X[];
#endif #endif
#define OFS_VSWITCHES (OFS_VKEYS + sizeof(TR_VKEYS)) #define OFS_VSWITCHES (OFS_VKEYS + sizeof(TR_VKEYS))
#define OFS_VSRCRAW (OFS_VSWITCHES + sizeof(TR_VSWITCHES)) #define OFS_VSRCRAW (OFS_VSWITCHES + sizeof(TR_VSWITCHES))
#if defined(TRANSLATIONS_CZ) && defined(CPUARM) #if defined(TRANSLATIONS_CZ)
#define OFS_INPUTNAMES (OFS_VSRCRAW + sizeof(TR_VSRCRAW)) #define OFS_INPUTNAMES (OFS_VSRCRAW + sizeof(TR_VSRCRAW))
#define OFS_VTMRMODES (OFS_INPUTNAMES + sizeof(TR_INPUTNAMES)) #define OFS_VTMRMODES (OFS_INPUTNAMES + sizeof(TR_INPUTNAMES))
#else #else
@ -267,7 +267,7 @@ extern const pm_char STR_OPEN9X[];
#define STR_VKEYS (STR_OPEN9X + OFS_VKEYS) #define STR_VKEYS (STR_OPEN9X + OFS_VKEYS)
#define STR_VSWITCHES (STR_OPEN9X + OFS_VSWITCHES) #define STR_VSWITCHES (STR_OPEN9X + OFS_VSWITCHES)
#define STR_VSRCRAW (STR_OPEN9X + OFS_VSRCRAW) #define STR_VSRCRAW (STR_OPEN9X + OFS_VSRCRAW)
#if defined(TRANSLATIONS_CZ) && defined(CPUARM) #if defined(TRANSLATIONS_CZ)
#define STR_INPUTNAMES (STR_OPEN9X + OFS_INPUTNAMES) #define STR_INPUTNAMES (STR_OPEN9X + OFS_INPUTNAMES)
#endif #endif
#define STR_VTMRMODES (STR_OPEN9X + OFS_VTMRMODES) #define STR_VTMRMODES (STR_OPEN9X + OFS_VTMRMODES)
@ -757,7 +757,7 @@ extern const pm_char STR_CONFIRMRESET[];
extern const pm_char STR_TOO_MANY_LUA_SCRIPTS[]; extern const pm_char STR_TOO_MANY_LUA_SCRIPTS[];
extern const pm_char STR_BLCOLOR[]; extern const pm_char STR_BLCOLOR[];
#if defined(CPUARM) && defined(VOICE) #if defined(VOICE)
struct LanguagePack { struct LanguagePack {
const char * id; const char * id;
const char * name; const char * name;