No more REV9E and REVPLUS

This commit is contained in:
Bertrand Songis
2016-07-29 14:44:59 +02:00
parent 0f740358f2
commit 51223a5864
60 changed files with 248 additions and 249 deletions
+1 -1
View File
@@ -21,7 +21,7 @@
#include "opentx.h"
#include "timers.h"
#if defined(REVPLUS) && defined(LCD_DUAL_BUFFER)
#if (defined(PCBX9E) || defined(PCBX9DP)) && defined(LCD_DUAL_BUFFER)
display_t displayBuf1[DISPLAY_BUFFER_SIZE] __DMA;
display_t displayBuf2[DISPLAY_BUFFER_SIZE] __DMA;
display_t * displayBuf = displayBuf1;
+3 -3
View File
@@ -89,7 +89,7 @@
#define display_t uint8_t
#define DISPLAY_BUFFER_SIZE (LCD_W*LCD_H*4/8)
#if defined(REVPLUS) && defined(LCD_DUAL_BUFFER)
#if (defined(PCBX9E) || defined(PCBX9DP)) && defined(LCD_DUAL_BUFFER)
extern display_t displayBuf1[DISPLAY_BUFFER_SIZE];
extern display_t displayBuf2[DISPLAY_BUFFER_SIZE];
extern display_t * displayBuf;
@@ -97,7 +97,7 @@
extern display_t displayBuf[DISPLAY_BUFFER_SIZE];
#endif
#if defined(REVPLUS) && !defined(LCD_DUAL_BUFFER) && !defined(SIMU)
#if (defined(PCBX9E) || defined(PCBX9DP)) && !defined(LCD_DUAL_BUFFER) && !defined(SIMU)
void lcdRefreshWait();
#else
#define lcdRefreshWait()
@@ -203,7 +203,7 @@ void lcdSetRefVolt(unsigned char val);
void lcdClear();
void lcdSetContrast();
#if defined(REVPLUS) && !defined(SIMU)
#if (defined(PCBX9E) || defined(PCBX9DP)) && !defined(SIMU)
void lcdRefresh(bool wait=true);
#else
void lcdRefresh();
+1 -1
View File
@@ -413,7 +413,7 @@ void menuChannelsView(uint8_t event);
#define LABEL(...) (uint8_t)-1
#if defined(REV9E) && !defined(SIMU)
#if defined(PCBX9E) && !defined(SIMU)
#define KEY_UP KEY_MINUS
#define KEY_DOWN KEY_PLUS
#define KEY_RIGHT KEY_PLUS
+11 -11
View File
@@ -45,7 +45,7 @@ enum menuModelSetupItems {
ITEM_MODEL_TIMER3_MINUTE_BEEP,
ITEM_MODEL_TIMER3_COUNTDOWN_BEEP,
#endif
#if defined(REV9E)
#if defined(PCBX9E)
ITEM_MODEL_TOP_LCD_TIMER,
#endif
ITEM_MODEL_EXTENDED_LIMITS,
@@ -60,12 +60,12 @@ enum menuModelSetupItems {
ITEM_MODEL_CHECKLIST_DISPLAY,
ITEM_MODEL_THROTTLE_WARNING,
ITEM_MODEL_SWITCHES_WARNING,
#if defined(REV9E)
#if defined(PCBX9E)
ITEM_MODEL_SWITCHES_WARNING2,
ITEM_MODEL_SWITCHES_WARNING3,
#endif
ITEM_MODEL_POTS_WARNING,
#if defined(REV9E)
#if defined(PCBX9E)
ITEM_MODEL_POTS_WARNING2,
#endif
ITEM_MODEL_BEEP_CENTER,
@@ -248,7 +248,7 @@ int getSwitchWarningsCount()
#elif TIMERS == 3
#define TIMERS_ROWS TIMER_ROWS(0), TIMER_ROWS(1), TIMER_ROWS(2)
#endif
#if defined(REV9E)
#if defined(PCBX9E)
#define SW_WARN_ITEMS() uint8_t(NAVIGATION_LINE_BY_LINE|(getSwitchWarningsCount()-1)), uint8_t(getSwitchWarningsCount() > 8 ? TITLE_ROW : HIDDEN_ROW), uint8_t(getSwitchWarningsCount() > 16 ? TITLE_ROW : HIDDEN_ROW)
#define POT_WARN_ITEMS() uint8_t(g_model.potsWarnMode ? NAVIGATION_LINE_BY_LINE|NUM_POTS : 0), uint8_t(g_model.potsWarnMode ? TITLE_ROW : HIDDEN_ROW)
#define TOPLCD_ROWS 0,
@@ -402,7 +402,7 @@ void menuModelSetup(uint8_t event)
break;
#endif
#if defined(REV9E)
#if defined(PCBX9E)
case ITEM_MODEL_TOP_LCD_TIMER:
lcd_putsLeft(y, STR_TOPLCDTIMER);
drawStringWithIndex(MODEL_SETUP_2ND_COLUMN, y, STR_TIMER, g_model.toplcdTimer+1, attr);
@@ -477,7 +477,7 @@ void menuModelSetup(uint8_t event)
g_model.disableThrottleWarning = !editCheckBox(!g_model.disableThrottleWarning, MODEL_SETUP_2ND_COLUMN, y, STR_THROTTLEWARNING, attr, event);
break;
#if defined(REV9E)
#if defined(PCBX9E)
case ITEM_MODEL_SWITCHES_WARNING2:
case ITEM_MODEL_SWITCHES_WARNING3:
case ITEM_MODEL_POTS_WARNING2:
@@ -492,7 +492,7 @@ void menuModelSetup(uint8_t event)
case ITEM_MODEL_SWITCHES_WARNING:
{
#if defined(REV9E)
#if defined(PCBX9E)
if (i>=NUM_BODY_LINES-2 && getSwitchWarningsCount() > 8*(NUM_BODY_LINES-i)) {
if (CURSOR_MOVED_LEFT(event))
menuVerticalOffset--;
@@ -544,7 +544,7 @@ void menuModelSetup(uint8_t event)
states >>= 2;
}
if (attr && menuHorizontalPosition < 0) {
#if defined(REV9E)
#if defined(PCBX9E)
lcdDrawFilledRect(MODEL_SETUP_2ND_COLUMN-1, y-1, 8*(2*FW+1), 1+FH*((current+7)/8));
#else
lcdDrawFilledRect(MODEL_SETUP_2ND_COLUMN-1, y-1, current*(2*FW+1), FH+1);
@@ -554,7 +554,7 @@ void menuModelSetup(uint8_t event)
}
case ITEM_MODEL_POTS_WARNING:
#if defined(REV9E)
#if defined(PCBX9E)
if (i==NUM_BODY_LINES-1 && g_model.potsWarnMode) {
if (CURSOR_MOVED_LEFT(event))
menuVerticalOffset--;
@@ -597,7 +597,7 @@ void menuModelSetup(uint8_t event)
if (attr && (menuHorizontalPosition==i+1)) REPEAT_LAST_CURSOR_MOVE();
}
else {
#if defined(REV9E)
#if defined(PCBX9E)
if (i == NUM_XPOTS) {
y += FH;
x = MODEL_SETUP_2ND_COLUMN;
@@ -615,7 +615,7 @@ void menuModelSetup(uint8_t event)
}
}
if (attr && menuHorizontalPosition < 0) {
#if defined(REV9E)
#if defined(PCBX9E)
lcdDrawFilledRect(MODEL_SETUP_2ND_COLUMN-1, y-FH-1, LCD_W-MODEL_SETUP_2ND_COLUMN-MENUS_SCROLLBAR_WIDTH+1, 2*FH+1);
#else
lcdDrawFilledRect(MODEL_SETUP_2ND_COLUMN-1, y-1, LCD_W-MODEL_SETUP_2ND_COLUMN-MENUS_SCROLLBAR_WIDTH+1, FH+1);
@@ -332,7 +332,7 @@ void menuCustomFunctions(uint8_t event, CustomFunctionData * functions, CustomFu
lcdDrawTextAtIndex(MODEL_SPECIAL_FUNC_3RD_COLUMN, y, STR_MMMINV, 0, attr);
}
}
#if defined(REVPLUS)
#if defined(PCBX9E) || defined(PCBX9DP)
else if (func == FUNC_BACKLIGHT) {
drawSlider(MODEL_SPECIAL_FUNC_3RD_COLUMN, y, CFN_PARAM(cfn), 100, attr);
if (active) INCDEC_SET_FLAG(eeFlags | NO_INCDEC_MARKS);
+23 -23
View File
@@ -29,12 +29,12 @@ enum menuGeneralHwItems {
ITEM_SETUP_HW_LABEL_POTS,
ITEM_SETUP_HW_POT1,
ITEM_SETUP_HW_POT2,
CASE_REVPLUS(ITEM_SETUP_HW_POT3)
CASE_REV9E(ITEM_SETUP_HW_POT4)
CASE_PCBX9E_PCBX9DP(ITEM_SETUP_HW_POT3)
CASE_PCBX9E(ITEM_SETUP_HW_POT4)
ITEM_SETUP_HW_LS,
ITEM_SETUP_HW_RS,
CASE_REV9E(ITEM_SETUP_HW_LS2)
CASE_REV9E(ITEM_SETUP_HW_RS2)
CASE_PCBX9E(ITEM_SETUP_HW_LS2)
CASE_PCBX9E(ITEM_SETUP_HW_RS2)
ITEM_SETUP_HW_LABEL_SWITCHES,
ITEM_SETUP_HW_SA,
ITEM_SETUP_HW_SB,
@@ -44,17 +44,17 @@ enum menuGeneralHwItems {
ITEM_SETUP_HW_SF,
ITEM_SETUP_HW_SG,
ITEM_SETUP_HW_SH,
CASE_REV9E(ITEM_SETUP_HW_SI)
CASE_REV9E(ITEM_SETUP_HW_SJ)
CASE_REV9E(ITEM_SETUP_HW_SK)
CASE_REV9E(ITEM_SETUP_HW_SL)
CASE_REV9E(ITEM_SETUP_HW_SM)
CASE_REV9E(ITEM_SETUP_HW_SN)
CASE_REV9E(ITEM_SETUP_HW_SO)
CASE_REV9E(ITEM_SETUP_HW_SP)
CASE_REV9E(ITEM_SETUP_HW_SQ)
CASE_REV9E(ITEM_SETUP_HW_SR)
CASE_REV9E(ITEM_SETUP_HW_BLUETOOTH)
CASE_PCBX9E(ITEM_SETUP_HW_SI)
CASE_PCBX9E(ITEM_SETUP_HW_SJ)
CASE_PCBX9E(ITEM_SETUP_HW_SK)
CASE_PCBX9E(ITEM_SETUP_HW_SL)
CASE_PCBX9E(ITEM_SETUP_HW_SM)
CASE_PCBX9E(ITEM_SETUP_HW_SN)
CASE_PCBX9E(ITEM_SETUP_HW_SO)
CASE_PCBX9E(ITEM_SETUP_HW_SP)
CASE_PCBX9E(ITEM_SETUP_HW_SQ)
CASE_PCBX9E(ITEM_SETUP_HW_SR)
CASE_PCBX9E(ITEM_SETUP_HW_BLUETOOTH)
ITEM_SETUP_HW_UART3_MODE,
ITEM_SETUP_HW_JITTER_FILTER,
ITEM_SETUP_HW_MAX
@@ -62,15 +62,15 @@ enum menuGeneralHwItems {
#define HW_SETTINGS_COLUMN 15*FW
#if defined(REV9E)
#if defined(PCBX9E)
#define POTS_ROWS NAVIGATION_LINE_BY_LINE|1, NAVIGATION_LINE_BY_LINE|1, NAVIGATION_LINE_BY_LINE|1, NAVIGATION_LINE_BY_LINE|1, 0, 0, NAVIGATION_LINE_BY_LINE|1, NAVIGATION_LINE_BY_LINE|1
#elif defined(REVPLUS)
#elif defined(PCBX9DP)
#define POTS_ROWS NAVIGATION_LINE_BY_LINE|1, NAVIGATION_LINE_BY_LINE|1, NAVIGATION_LINE_BY_LINE|1, 0, 0
#else
#define POTS_ROWS NAVIGATION_LINE_BY_LINE|1, NAVIGATION_LINE_BY_LINE|1, 0, 0
#endif
#if defined(REV9E)
#if defined(PCBX9E)
#define SWITCHES_ROWS NAVIGATION_LINE_BY_LINE|1, NAVIGATION_LINE_BY_LINE|1, NAVIGATION_LINE_BY_LINE|1, NAVIGATION_LINE_BY_LINE|1, NAVIGATION_LINE_BY_LINE|1, NAVIGATION_LINE_BY_LINE|1, NAVIGATION_LINE_BY_LINE|1, NAVIGATION_LINE_BY_LINE|1, NAVIGATION_LINE_BY_LINE|1, NAVIGATION_LINE_BY_LINE|1, NAVIGATION_LINE_BY_LINE|1, NAVIGATION_LINE_BY_LINE|1, NAVIGATION_LINE_BY_LINE|1, NAVIGATION_LINE_BY_LINE|1, NAVIGATION_LINE_BY_LINE|1, NAVIGATION_LINE_BY_LINE|1, NAVIGATION_LINE_BY_LINE|1, NAVIGATION_LINE_BY_LINE|1
#define BLUETOOTH_ROWS 1,
#else
@@ -114,7 +114,7 @@ void menuGeneralHardware(uint8_t event)
lcdDrawTextAtIndex(HW_SETTINGS_COLUMN, y, STR_MMMINV, 0, 0);
break;
}
#if defined(REV9E)
#if defined(PCBX9E)
case ITEM_SETUP_HW_LS2:
case ITEM_SETUP_HW_RS2:
{
@@ -137,10 +137,10 @@ void menuGeneralHardware(uint8_t event)
break;
case ITEM_SETUP_HW_POT1:
case ITEM_SETUP_HW_POT2:
#if defined(REVPLUS)
#if defined(PCBX9DP) || defined(PCBX9E)
case ITEM_SETUP_HW_POT3:
#endif
#if defined(REV9E)
#if defined(PCBX9E)
case ITEM_SETUP_HW_POT4:
#endif
{
@@ -169,7 +169,7 @@ void menuGeneralHardware(uint8_t event)
case ITEM_SETUP_HW_SF:
case ITEM_SETUP_HW_SG:
case ITEM_SETUP_HW_SH:
#if defined(REV9E)
#if defined(PCBX9E)
case ITEM_SETUP_HW_SI:
case ITEM_SETUP_HW_SJ:
case ITEM_SETUP_HW_SK:
@@ -196,7 +196,7 @@ void menuGeneralHardware(uint8_t event)
}
break;
}
#if defined(REV9E)
#if defined(PCBX9E)
case ITEM_SETUP_HW_BLUETOOTH:
lcd_putsLeft(y, "Bluetooth");
drawCheckBox(HW_SETTINGS_COLUMN, y, g_eeGeneral.bluetoothEnable, menuHorizontalPosition == 0 ? attr : 0);
+3 -3
View File
@@ -74,7 +74,7 @@ enum menuGeneralSetupItems {
ITEM_SETUP_BACKLIGHT_MODE,
ITEM_SETUP_BACKLIGHT_DELAY,
ITEM_SETUP_BRIGHTNESS,
CASE_REVPLUS(ITEM_SETUP_BACKLIGHT_COLOR)
CASE_PCBX9E_PCBX9DP(ITEM_SETUP_BACKLIGHT_COLOR)
ITEM_SETUP_FLASH_BEEP,
CASE_SPLASH_PARAM(ITEM_SETUP_DISABLE_SPLASH)
CASE_GPS(ITEM_SETUP_LABEL_GPS)
@@ -115,7 +115,7 @@ void menuGeneralSetup(uint8_t event)
}
#endif
MENU(STR_MENURADIOSETUP, menuTabGeneral, e_Setup, ITEM_SETUP_MAX, { 2, 2, 0, 1, LABEL(SOUND), 0, 0, 0, 0, 0, 0, 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, 0, 0, 0, IF_ROTARY_ENCODERS(0) LABEL(BACKLIGHT), 0, 0, 0, CASE_REVPLUS(0) CASE_PWM_BACKLIGHT(0) CASE_PWM_BACKLIGHT(0) 0, CASE_SPLASH_PARAM(0) CASE_GPS(LABEL(GPS)) CASE_GPS(0) CASE_GPS(0) CASE_GPS(0) CASE_PXX(0) 0, 0, IF_FAI_CHOICE(0) CASE_MAVLINK(0) 0, 0, LABEL(TX_MODE), 0, 1/*to force edit mode*/ });
MENU(STR_MENURADIOSETUP, menuTabGeneral, e_Setup, ITEM_SETUP_MAX, { 2, 2, 0, 1, LABEL(SOUND), 0, 0, 0, 0, 0, 0, 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, 0, 0, 0, IF_ROTARY_ENCODERS(0) LABEL(BACKLIGHT), 0, 0, 0, CASE_PCBX9E_PCBX9DP(0) CASE_PWM_BACKLIGHT(0) CASE_PWM_BACKLIGHT(0) 0, CASE_SPLASH_PARAM(0) CASE_GPS(LABEL(GPS)) CASE_GPS(0) CASE_GPS(0) CASE_GPS(0) CASE_PXX(0) 0, 0, IF_FAI_CHOICE(0) CASE_MAVLINK(0) 0, 0, LABEL(TX_MODE), 0, 1/*to force edit mode*/ });
if (event == EVT_ENTRY) {
reusableBuffer.generalSettings.stickMode = g_eeGeneral.stickMode;
@@ -378,7 +378,7 @@ void menuGeneralSetup(uint8_t event)
}
break;
#if defined(REVPLUS)
#if defined(PCBX9DP) || defined(PCBX9E)
case ITEM_SETUP_BACKLIGHT_COLOR:
lcd_putsLeft(y, STR_BLCOLOR);
drawSlider(RADIO_SETUP_2ND_COLUMN, y, g_eeGeneral.backlightColor, 20, attr);
+3 -3
View File
@@ -50,11 +50,11 @@
#define MARKER_WIDTH 5
const pm_uchar logo_taranis[] PROGMEM = {
#include "../../bitmaps/212x64/logo.lbm"
#include "logo.lbm"
};
const pm_uchar icons[] PROGMEM = {
#include "../../bitmaps/212x64/icons.lbm"
#include "icons.lbm"
};
#define ICON_RSSI 0, 9
@@ -162,7 +162,7 @@ void displayTrims(uint8_t phase)
void drawSliders()
{
for (uint8_t i=NUM_STICKS; i<NUM_STICKS+NUM_POTS; i++) {
#if defined(REV9E)
#if defined(PCBX9E)
if (i < SLIDER1) continue; // TODO change and display more values
coord_t x = ((i==SLIDER1 || i==SLIDER3) ? 3 : LCD_W-5);
int8_t y = (i<SLIDER3 ? LCD_H/2+1 : 1);
@@ -324,7 +324,7 @@ bool menuCustomFunctions(evt_t event, CustomFunctionData * functions, CustomFunc
lcdDrawTextAtIndex(MODEL_SPECIAL_FUNC_3RD_COLUMN, y, STR_MMMINV, 0, attr);
}
}
#if defined(REVPLUS)
#if defined(PCBX9DP) || defined(PCBX9E)
else if (func == FUNC_BACKLIGHT) {
drawSlider(MODEL_SPECIAL_FUNC_3RD_COLUMN, y, CFN_PARAM(cfn), 100, attr);
INCDEC_SET_FLAG(eeFlags | NO_INCDEC_MARKS);