piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases 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
radio/src/gui/128x64/fonts.cpp
+2 -2
View File
@@ -74,7 +74,7 @@ const pm_uchar font_10x14[] PROGMEM = {
};
#endif
#if defined(CPUARM) && !defined(BOOT)
#if !defined(BOOT)
const pm_uchar font_3x5[] PROGMEM = {
#include "font_03x05.lbm"
};
@@ -140,4 +140,4 @@ const pm_uchar font_10x14_extra[] PROGMEM = {
#include "font_10x14_extra.lbm"
};
#endif // defined(CPUARM) && !defined(BOOT)
#endif // !defined(BOOT)
radio/src/gui/128x64/gui.h
+2 -2
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)
#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)
#else
#define GVAR_MENU_ITEM(x, y, v, min, max, attr, editflags, event) editGVarFieldValue(x, y, v, min, max, attr, event)
#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);
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);
radio/src/gui/128x64/lcd.cpp
+7 -7
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
{
uint8_t width;
@@ -287,7 +287,7 @@ void lcdDrawChar(coord_t x, coord_t y, const unsigned char c)
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 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;
uint32_t fontsize = FONTSIZE(flags);
#if defined(CPUARM) && !defined(BOOT)
#if !defined(BOOT)
uint8_t width = 0;
if (flags & RIGHT) {
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;
lcdNextPos = x;
#if defined(CPUARM) && !defined(BOOT)
#if !defined(BOOT)
if (fontsize == MIDSIZE) {
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);
}
#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)
{
int dx = x2-x1; /* the horizontal distance of the line */
@@ -595,7 +595,7 @@ void drawTelemetryTopBar()
lcdInvertLine(0);
}
#if defined(CPUARM) && defined(RTCLOCK)
#if defined(RTCLOCK)
void drawRtcTime(coord_t x, coord_t y, LcdFlags 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)
att &= ~DBLSIZE;
#if defined(CPUARM) && defined(RTCLOCK)
#if defined(RTCLOCK)
if (att & TIMEBLINK)
lcdDrawChar(lcdLastRightPos, y, separator, BLINK);
else
radio/src/gui/128x64/model_select.cpp
+1 -1
View File
@@ -300,7 +300,7 @@ void menuModelSelect(event_t event)
break;
}
#if defined(EEPROM_RLC) && defined(CPUARM)
#if defined(EEPROM_RLC)
lcdDrawText(9*FW-(LEN_FREE-4)*FW-4, 0, STR_FREE);
if (event) reusableBuffer.modelsel.eepromfree = EeFsGetFree();
lcdDrawNumber(lcdLastRightPos+3, 0, reusableBuffer.modelsel.eepromfree, LEFT);
radio/src/gui/128x64/model_setup.cpp
+2 -2
View File
@@ -297,7 +297,7 @@ void menuModelSetup(event_t event)
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) {
moduleFlag[0] = 0;
#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()) {
showMessageBox("RSSI: ");
lcdDrawNumber(16+4*FW, 5*FH, TELEMETRY_RSSI(), BOLD);
radio/src/gui/128x64/model_special_functions.cpp
+4 -4
View File
@@ -30,7 +30,7 @@
#define MODEL_SPECIAL_FUNC_4TH_COLUMN_ONOFF (18*FW+2)
#endif
#if defined(CPUARM) && defined(SDCARD)
#if defined(SDCARD)
void onCustomFunctionsFileSelectionMenu(const char * result)
{
int sub = menuVerticalPosition - HEADER_LINE;
@@ -68,7 +68,7 @@ void onCustomFunctionsFileSelectionMenu(const char * result)
storageDirty(eeFlags);
}
}
#endif // CPUARM && SDCARD
#endif // SDCARD
#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);
}
#endif
#if defined(CPUARM) && defined(SDCARD)
#if defined(SDCARD)
else if (func == FUNC_PLAY_TRACK || func == FUNC_BACKGND_MUSIC || func == FUNC_PLAY_SCRIPT) {
if (ZEXIST(cfn->play.name))
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);
}
}
#endif // CPUARM && SDCARD
#endif // SDCARD
else if (func == FUNC_VOLUME) {
val_max = MIXSRC_LAST_CH;
drawSource(MODEL_SPECIAL_FUNC_3RD_COLUMN, y, val_displayed, attr);
radio/src/gui/128x64/radio_setup.cpp
+7 -7
View File
@@ -61,11 +61,11 @@ enum MenuRadioSetupItems {
CASE_AUDIO(ITEM_SETUP_SPEAKER_PITCH)
ITEM_SETUP_WAV_VOLUME,
ITEM_SETUP_BACKGROUND_VOLUME,
CASE_VARIO_CPUARM(ITEM_SETUP_VARIO_LABEL)
CASE_VARIO_CPUARM(ITEM_SETUP_VARIO_VOLUME)
CASE_VARIO_CPUARM(ITEM_SETUP_VARIO_PITCH)
CASE_VARIO_CPUARM(ITEM_SETUP_VARIO_RANGE)
CASE_VARIO_CPUARM(ITEM_SETUP_VARIO_REPEAT)
CASE_VARIO(ITEM_SETUP_VARIO_LABEL)
CASE_VARIO(ITEM_SETUP_VARIO_VOLUME)
CASE_VARIO(ITEM_SETUP_VARIO_PITCH)
CASE_VARIO(ITEM_SETUP_VARIO_RANGE)
CASE_VARIO(ITEM_SETUP_VARIO_REPEAT)
CASE_HAPTIC(ITEM_SETUP_HAPTIC_LABEL)
CASE_HAPTIC(ITEM_SETUP_HAPTIC_MODE)
CASE_HAPTIC(ITEM_SETUP_HAPTIC_LENGTH)
@@ -131,7 +131,7 @@ void menuRadioSetup(event_t event)
}
#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) {
reusableBuffer.generalSettings.stickMode = g_eeGeneral.stickMode;
@@ -291,7 +291,7 @@ void menuRadioSetup(event_t event)
break;
#endif
#if defined(CPUARM) && defined(VARIO)
#if defined(VARIO)
case ITEM_SETUP_VARIO_LABEL:
lcdDrawTextAlignedLeft(y, STR_VARIO);
break;
radio/src/gui/128x64/radio_version.cpp
+2 -2
View File
@@ -22,7 +22,7 @@
void menuRadioVersion(event_t event)
{
#if defined(CPUARM) && defined(EEPROM_RLC)
#if defined(EEPROM_RLC)
if (warningResult) {
warningResult = 0;
showMessageBox(STR_STORAGE_FORMAT);
@@ -43,7 +43,7 @@ void menuRadioVersion(event_t event)
else {
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+6*FH+1, STR_FACTORYRESET);
lcdDrawFilledRect(0, MENU_HEADER_HEIGHT+5*FH, LCD_W, 2*FH+1, SOLID);
radio/src/gui/128x64/view_main.cpp
+3 -3
View File
@@ -47,7 +47,7 @@
#define TRIM_LH_POS (TRIM_LH_X-4*FW)
#define TRIM_RH_NEG (TRIM_RH_X+1*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_Y (31)
#define RSSI_MAX 105
@@ -55,7 +55,7 @@
#define TRIM_LEN 23
#if defined(TELEMETRY_FRSKY) && defined(CPUARM)
#if defined(TELEMETRY_FRSKY)
void drawRSSIGauge()
{
uint8_t bar = (RSSI_MAX - g_model.rssiAlarms.getWarningRssi()) / 4;
@@ -441,7 +441,7 @@ void menuMainView(event_t event)
// Trims sliders
displayTrims(mode);
#if defined(TELEMETRY_FRSKY) && defined(CPUARM)
#if defined(TELEMETRY_FRSKY)
// RSSI gauge
if (TELEMETRY_RSSI() > 0) {
drawRSSIGauge();
radio/src/gui/128x64/widgets.cpp
+1 -1
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)
{
uint8_t prec = g_model.gvars[gvar].prec;
radio/src/gui/common/stdlcd/model_curves.cpp
+1 -1
View File
@@ -94,7 +94,7 @@ void menuModelCurvesAll(event_t event)
if (CURVE_SELECTED()) {
s_curveChan = sub;
#if !defined(CPUARM) || LCD_W >= 212
#if LCD_W >= 212
drawCurve(23);
#else
drawCurve(10);