From 841951331888b62075b117f24585772c5128dd5a Mon Sep 17 00:00:00 2001 From: bsongis Date: Sun, 30 Nov 2014 19:31:54 +0100 Subject: [PATCH] Main View code splitted (Taranis / others) --- .../opentx/opentxTaranisSimulator.cpp | 2 +- radio/src/Makefile | 8 +- radio/src/gui/Taranis/view_main.cpp | 565 ++++++++++++++++++ radio/src/gui/view_main.cpp | 360 +---------- 4 files changed, 578 insertions(+), 357 deletions(-) create mode 100755 radio/src/gui/Taranis/view_main.cpp diff --git a/companion/src/firmwares/opentx/opentxTaranisSimulator.cpp b/companion/src/firmwares/opentx/opentxTaranisSimulator.cpp index 73cc6e51a..0e6a76db4 100644 --- a/companion/src/firmwares/opentx/opentxTaranisSimulator.cpp +++ b/companion/src/firmwares/opentx/opentxTaranisSimulator.cpp @@ -96,7 +96,7 @@ inline int geteepromsize() { #include "radio/src/gui/menus.cpp" #include "radio/src/gui/menu_model.cpp" #include "radio/src/gui/menu_general.cpp" -#include "radio/src/gui/view_main.cpp" +#include "radio/src/gui/Taranis/view_main.cpp" #include "radio/src/gui/view_statistics.cpp" #include "radio/src/gui/view_channels.cpp" #include "radio/src/gui/view_telemetry.cpp" diff --git a/radio/src/Makefile b/radio/src/Makefile index 9910f805b..008840870 100644 --- a/radio/src/Makefile +++ b/radio/src/Makefile @@ -855,7 +855,13 @@ else TTS_SRC = $(shell sh -c "if test -f $(STD_TTS_SRC); then echo $(STD_TTS_SRC); else echo translations/tts_en.cpp; fi") endif -CPPSRC += opentx.cpp functions.cpp strhelpers.cpp $(PULSESSRC) switches.cpp curves.cpp mixer.cpp stamp.cpp gui/menus.cpp gui/menu_model.cpp gui/menu_general.cpp gui/view_main.cpp gui/view_statistics.cpp $(EEPROMSRC) $(LCDSRC) keys.cpp maths.cpp translations.cpp fonts.cpp $(TTS_SRC) +ifeq ($(PCB), $(filter $(PCB), TARANIS)) + GUISRC = gui/menus.cpp gui/menu_model.cpp gui/menu_general.cpp gui/Taranis/view_main.cpp gui/view_statistics.cpp +else + GUISRC = gui/menus.cpp gui/menu_model.cpp gui/menu_general.cpp gui/view_main.cpp gui/view_statistics.cpp +endif + +CPPSRC += opentx.cpp functions.cpp strhelpers.cpp $(PULSESSRC) switches.cpp curves.cpp mixer.cpp stamp.cpp $(GUISRC) $(EEPROMSRC) $(LCDSRC) keys.cpp maths.cpp translations.cpp fonts.cpp $(TTS_SRC) # Debugging format. # Native formats for AVR-GCC's -g are dwarf-2 [default] or stabs. diff --git a/radio/src/gui/Taranis/view_main.cpp b/radio/src/gui/Taranis/view_main.cpp new file mode 100755 index 000000000..99ddf479f --- /dev/null +++ b/radio/src/gui/Taranis/view_main.cpp @@ -0,0 +1,565 @@ +/* + * Authors (alphabetical order) + * - Andre Bernet + * - Andreas Weitl + * - Bertrand Songis + * - Bryan J. Rentoul (Gruvin) + * - Cameron Weeks + * - Erez Raviv + * - Gabriel Birkus + * - Jean-Pierre Parisy + * - Karl Szmutny + * - Michael Blandford + * - Michal Hlavinka + * - Pat Mackenzie + * - Philip Moss + * - Rob Thomson + * - Romolo Manfredini + * - Thomas Husterer + * + * opentx is based on code named + * gruvin9x by Bryan J. Rentoul: http://code.google.com/p/gruvin9x/, + * er9x by Erez Raviv: http://code.google.com/p/er9x/, + * and the original (and ongoing) project by + * Thomas Husterer, th9x: http://code.google.com/p/th9x/ + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + */ + +#include "../../opentx.h" + +#define BIGSIZE MIDSIZE +#define BOX_WIDTH 31 +#define BOX_CENTERY (LCD_H-BOX_WIDTH/2-10) +#define LBOX_CENTERX (BOX_WIDTH/2 + 17) +#define RBOX_CENTERX (LCD_W-LBOX_CENTERX) +#define MODELNAME_X (15) +#define MODELNAME_Y (11) +#define VBATT_X (MODELNAME_X+26) +#define VBATT_Y (FH+3) +#define VBATTUNIT_X (VBATT_X-2) +#define VBATTUNIT_Y VBATT_Y +#define BITMAP_X ((LCD_W-64)/2) +#define BITMAP_Y (LCD_H/2) +#define PHASE_X BITMAP_X +#define PHASE_Y (3*FH) +#define PHASE_FLAGS (0) +#define TIMERS_X 145 +#define TIMERS_Y 20 +#define TIMERS_H 25 +#define TIMERS_R 193 +#define REBOOT_X (LCD_W-FW) +#define VSWITCH_X(i) (((i>=NUM_LOGICAL_SWITCH*3/4) ? BITMAP_X+28 : ((i>=NUM_LOGICAL_SWITCH/2) ? BITMAP_X+25 : ((i>=NUM_LOGICAL_SWITCH/4) ? 21 : 18))) + 3*i) +#define VSWITCH_Y (LCD_H-9) +#define BAR_HEIGHT (31-9) +#define TRIM_LH_X (32+9) +#define TRIM_LV_X 10 +#define TRIM_RV_X (LCD_W-11) +#define TRIM_RH_X (LCD_W-32-9) + +#define TRIM_LEN 27 +#define MARKER_WIDTH 5 +#define BOX_LIMIT (BOX_WIDTH-MARKER_WIDTH) + +const pm_uchar logo_taranis[] PROGMEM = { +#include "../../bitmaps/logo_taranis.lbm" +}; + +const pm_uchar icons[] PROGMEM = { +#include "../../bitmaps/icons.lbm" +}; + +#define ICON_RSSI 0, 9 +#define ICON_SPEAKER0 9, 8 +#define ICON_SPEAKER1 17, 8 +#define ICON_SPEAKER2 25, 8 +#define ICON_SPEAKER3 33, 8 +#define ICON_SD 41, 11 +#define ICON_LOGS 51, 11 +#define ICON_TRAINER 61, 11 +#define ICON_TRAINEE 71, 11 +#define ICON_USB 81, 11 +#define ICON_REBOOT 91, 11 +#define ICON_ALTITUDE 102, 9 + +void drawPotsBars() +{ + // Optimization by Mike Blandford + uint8_t x, i, len ; // declare temporary variables + for (x=LCD_W/2-5, i=NUM_STICKS; i TRIM_MAX) { + exttrim = true; + } + if (val < -(TRIM_LEN+1)*4) { + val = -(TRIM_LEN+1); + } + else if (val > (TRIM_LEN+1)*4) { + val = TRIM_LEN+1; + } + else { + val /= 4; + } + + if (vert[i]) { + ym = 31; + lcd_vline(xm, ym-TRIM_LEN, TRIM_LEN*2); + if (i!=2 || !g_model.thrTrim) { + lcd_vline(xm-1, ym-1, 3); + lcd_vline(xm+1, ym-1, 3); + } + ym -= val; + lcd_filled_rect(xm-3, ym-3, 7, 7, SOLID, att|ERASE); + if (dir >= 0) { + lcd_hline(xm-1, ym-1, 3); + } + if (dir <= 0) { + lcd_hline(xm-1, ym+1, 3); + } + if (exttrim) { + lcd_hline(xm-1, ym, 3); + } + } + else { + ym = 60; + lcd_hline(xm-TRIM_LEN, ym, TRIM_LEN*2); + lcd_hline(xm-1, ym-1, 3); + lcd_hline(xm-1, ym+1, 3); + xm += val; + lcd_filled_rect(xm-3, ym-3, 7, 7, SOLID, att|ERASE); + if (dir >= 0) { + lcd_vline(xm+1, ym-1, 3); + } + if (dir <= 0) { + lcd_vline(xm-1, ym-1, 3); + } + if (exttrim) { + lcd_vline(xm, ym-1, 3); + } + } + lcd_square(xm-3, ym-3, 7, att); + } +} + +void displaySliders() +{ + for (uint8_t i=NUM_STICKS; i=SLIDER1 ? LCD_H/2+1 : 1); + lcd_vline(x, y, LCD_H/2-2); + lcd_vline(x+1, y, LCD_H/2-2); + y += LCD_H/2-4; + y -= ((calibratedStick[i]+RESX)*(LCD_H/2-4)/(RESX*2)); // calculate once per loop + lcd_vline(x-1, y, 2); + lcd_vline(x+2, y, 2); + } +} + +#define BAR_X 14 +#define BAR_Y 1 +#define BAR_W 184 +#define BAR_H 9 +#define BAR_NOTIFS_X BAR_X+133 +#define BAR_VOLUME_X BAR_X+147 +#define BAR_TIME_X BAR_X+159 + +void displayTopBarGauge(coord_t x, int count, bool blinking=false) +{ + if (!blinking || BLINK_ON_PHASE) + lcd_filled_rect(x+1, BAR_Y+2, 11, 5, SOLID, ERASE); + count = min(10, count); + for (int i=0; i 0) { + displayTopBarGauge(batt_icon_x+5*FW, TELEMETRY_RSSI() / 10, TELEMETRY_RSSI() < getRssiAlarmValue(0)); + } +} + +void displayTimers() +{ + // Main and Second timer + for (unsigned int i=0; i<2; i++) { + if (g_model.timers[i].mode) { + TimerState & timerState = timersStates[i]; + TimerData & timerData = g_model.timers[i]; + uint8_t y = TIMERS_Y + i*TIMERS_H; + if (zlen(timerData.name, LEN_TIMER_NAME) > 0) { + lcd_putsnAtt(TIMERS_X, y-7, timerData.name, LEN_TIMER_NAME, ZCHAR|SMLSIZE); + } + else { + putsTimerMode(TIMERS_X, y-7, timerData.mode, SMLSIZE); + } + putsTimer(TIMERS_X, y, timerState.val, TIMEHOUR|MIDSIZE|LEFT, TIMEHOUR|MIDSIZE|LEFT); + if (timerData.persistent) { + lcd_putcAtt(TIMERS_R, y+1, 'P', SMLSIZE); + } + if (timerState.val < 0) { + if (BLINK_ON_PHASE) { + lcd_filled_rect(TIMERS_X-7, y-8, 60, 20); + } + } + } + } +} + +#define EVT_KEY_MODEL_MENU EVT_KEY_BREAK(KEY_MENU) +#define EVT_KEY_GENERAL_MENU EVT_KEY_LONG(KEY_MENU) +#define EVT_KEY_TELEMETRY EVT_KEY_LONG(KEY_PAGE) +#define EVT_KEY_CONTEXT_MENU EVT_KEY_LONG(KEY_ENTER) + +void menuMainViewChannelsMonitor(uint8_t event) +{ + switch(event) { + case EVT_KEY_BREAK(KEY_PAGE): + case EVT_KEY_BREAK(KEY_EXIT): + chainMenu(menuMainView); + event = 0; + break; + } + + return menuChannelsView(event); +} + +void onMainViewMenu(const char *result) +{ + if (result == STR_RESET_TIMER1) { + timerReset(0); + } + else if (result == STR_RESET_TIMER2) { + timerReset(1); + } + else if (result == STR_RESET_TIMER3) { + timerReset(2); + } + else if (result == STR_VIEW_NOTES) { + pushModelNotes(); + } + else if (result == STR_RESET_SUBMENU) { + MENU_ADD_ITEM(STR_RESET_FLIGHT); + MENU_ADD_ITEM(STR_RESET_TIMER1); + MENU_ADD_ITEM(STR_RESET_TIMER2); + MENU_ADD_ITEM(STR_RESET_TIMER3); + MENU_ADD_ITEM(STR_RESET_TELEMETRY); + } + else if (result == STR_RESET_TELEMETRY) { + telemetryReset(); + } + else if (result == STR_RESET_FLIGHT) { + flightReset(); + } + else if (result == STR_STATISTICS) { + chainMenu(menuStatisticsView); + } + else if (result == STR_ABOUT_US) { + chainMenu(menuAboutView); + } +} + +void menuMainView(uint8_t event) +{ + STICK_SCROLL_DISABLE(); + + switch(event) { + + case EVT_ENTRY: + killEvents(KEY_EXIT); + killEvents(KEY_UP); + killEvents(KEY_DOWN); + break; + + case EVT_KEY_CONTEXT_MENU: + killEvents(event); + + if (modelHasNotes()) { + MENU_ADD_ITEM(STR_VIEW_NOTES); + } + + MENU_ADD_ITEM(STR_RESET_SUBMENU); + MENU_ADD_ITEM(STR_STATISTICS); + MENU_ADD_ITEM(STR_ABOUT_US); + menuHandler = onMainViewMenu; + break; + +#if MENUS_LOCK != 2/*no menus*/ + CASE_EVT_ROTARY_BREAK + case EVT_KEY_MODEL_MENU: + pushMenu(menuModelSelect); + killEvents(event); + break; + + CASE_EVT_ROTARY_LONG + case EVT_KEY_GENERAL_MENU: + pushMenu(menuGeneralSetup); + killEvents(event); + break; +#endif + + case EVT_KEY_BREAK(KEY_PAGE): + eeDirty(EE_GENERAL); + g_eeGeneral.view += 1; + if (g_eeGeneral.view >= VIEW_COUNT) { + g_eeGeneral.view = 0; + chainMenu(menuMainViewChannelsMonitor); + } + break; + + case EVT_KEY_TELEMETRY: + if (!IS_FAI_ENABLED()) + chainMenu(menuTelemetryFrsky); + killEvents(event); + break; + + case EVT_KEY_FIRST(KEY_EXIT): +#if defined(GVARS) + if (s_gvar_timer > 0) { + s_gvar_timer = 0; + } +#endif + AUDIO_KEYPAD_UP(); + break; + } + + { + // Flight Phase Name + uint8_t phase = mixerCurrentFlightMode; + lcd_putsnAtt(PHASE_X, PHASE_Y, g_model.flightModeData[phase].name, sizeof(g_model.flightModeData[phase].name), ZCHAR|PHASE_FLAGS); + + // Model Name + putsModelName(MODELNAME_X, MODELNAME_Y, g_model.header.name, g_eeGeneral.currModel, BIGSIZE); + + // Trims sliders + displayTrims(phase); + } + + // Top bar + displayTopBar(); + + // Sliders (Pots / Sliders) + displaySliders(); + + lcd_bmp(BITMAP_X, BITMAP_Y, modelBitmap); + + // Switches +#if defined(REV9E) + for (uint8_t i=0; i<8; i++) { + getvalue_t sw; + getvalue_t val; + val = getValue(MIXSRC_SA+i); + sw = ((val < 0) ? 3*i+1 : ((val == 0) ? 3*i+2 : 3*i+3)); + putsSwitches((g_eeGeneral.view == VIEW_INPUTS) ? (i<4 ? 8*FW+3 : 24*FW+1) : (i<4 ? 3*FW+2 : 8*FW-1), (i%4)*FH+3*FH, sw, 0); + } +#else + for (uint8_t i=0; i<8; i++) { + getvalue_t sw; + getvalue_t val; + // TODO simplify this + reuse code in checkSwitches() + Menu MODELSETUP + switch(i) { + case 5: + sw = getValue(MIXSRC_SF) > 0 ? 3*i+2 : 3*i+1; + break; + case 6: + val = getValue(MIXSRC_SG); + sw = ((val < 0) ? 3*i : ((val == 0) ? 3*i+1 : 3*i+2)); + break; + case 7: + sw = getValue(MIXSRC_SH) > 0 ? 3*i+1 : 3*i; + break; + default: + { + val = getValue(MIXSRC_SA+i); + sw = ((val < 0) ? 3*i+1 : ((val == 0) ? 3*i+2 : 3*i+3)); + break; + } + } + putsSwitches((g_eeGeneral.view == VIEW_INPUTS) ? (i<4 ? 8*FW+3 : 24*FW+1) : (i<4 ? 3*FW+2 : 8*FW-1), (i%4)*FH+3*FH, sw, 0); + } +#endif + + if (g_eeGeneral.view == VIEW_TIMERS) { + displayTimers(); + } + else if (g_eeGeneral.view == VIEW_INPUTS) { + // Sticks + doMainScreenGraphics(); + } + else { + // Logical Switches + lcd_puts(TRIM_RH_X - TRIM_LEN/2 + 5, 6*FH-1, "LS 1-32"); + for (uint8_t sw=0; sw= 5 ? 3 : 0); + LogicalSwitchData * cs = lswAddress(sw); + if (cs->func == LS_FUNC_NONE) { + lcd_hline(x, y+6, 4); + lcd_hline(x, y+7, 4); + } + else if (getSwitch(SWSRC_SW1+sw)) { + lcd_filled_rect(x, y, 4, 8); + } + else { + lcd_rect(x, y, 4, 8); + } + } + } + + +#if defined(GVARS) + if (s_gvar_timer > 0) { + s_gvar_timer--; + lcd_filled_rect(BITMAP_X, BITMAP_Y, 64, 32, SOLID, ERASE); + lcd_rect(BITMAP_X, BITMAP_Y, 64, 32); + putsStrIdx(BITMAP_X+FW, BITMAP_Y+FH-1, STR_GV, s_gvar_last+1); + lcd_putsnAtt(BITMAP_X+4*FW+FW/2, BITMAP_Y+FH-1, g_model.gvars[s_gvar_last].name, LEN_GVAR_NAME, ZCHAR); + lcd_putsAtt(BITMAP_X+FW, BITMAP_Y+2*FH+3, PSTR("[\010]"), BOLD); + lcd_outdezAtt(BITMAP_X+5*FW+FW/2, BITMAP_Y+2*FH+3, GVAR_VALUE(s_gvar_last, getGVarFlightPhase(mixerCurrentFlightMode, s_gvar_last)), BOLD); + } +#endif + +#if defined(DSM2) + if (dsm2Flag == DSM2_BIND_FLAG) // Issue 98 + lcd_putsAtt(15*FW, 0, PSTR("BIND"), 0); +#endif +} diff --git a/radio/src/gui/view_main.cpp b/radio/src/gui/view_main.cpp index 5ac8e94da..c00569ae3 100644 --- a/radio/src/gui/view_main.cpp +++ b/radio/src/gui/view_main.cpp @@ -36,36 +36,6 @@ #include "../opentx.h" -#if LCD_W >= 212 -#define BIGSIZE MIDSIZE -#define BOX_WIDTH 31 -#define BOX_CENTERY (LCD_H-BOX_WIDTH/2-10) -#define LBOX_CENTERX (BOX_WIDTH/2 + 17) -#define RBOX_CENTERX (LCD_W-LBOX_CENTERX) -#define MODELNAME_X (15) -#define MODELNAME_Y (11) -#define VBATT_X (MODELNAME_X+26) -#define VBATT_Y (FH+3) -#define VBATTUNIT_X (VBATT_X-2) -#define VBATTUNIT_Y VBATT_Y -#define BITMAP_X ((LCD_W-64)/2) -#define BITMAP_Y (LCD_H/2) -#define PHASE_X BITMAP_X -#define PHASE_Y (3*FH) -#define PHASE_FLAGS (0) -#define TIMERS_X 145 -#define TIMERS_Y 20 -#define TIMERS_H 25 -#define TIMERS_R 193 -#define REBOOT_X (LCD_W-FW) -#define VSWITCH_X(i) (((i>=NUM_LOGICAL_SWITCH*3/4) ? BITMAP_X+28 : ((i>=NUM_LOGICAL_SWITCH/2) ? BITMAP_X+25 : ((i>=NUM_LOGICAL_SWITCH/4) ? 21 : 18))) + 3*i) -#define VSWITCH_Y (LCD_H-9) -#define BAR_HEIGHT (31-9) -#define TRIM_LH_X (32+9) -#define TRIM_LV_X 10 -#define TRIM_RV_X (LCD_W-11) -#define TRIM_RH_X (LCD_W-32-9) -#else #define BIGSIZE DBLSIZE #define BOX_WIDTH 23 #define BOX_CENTERY (LCD_H-9-BOX_WIDTH/2) @@ -88,35 +58,11 @@ #define TRIM_LV_X 3 #define TRIM_RV_X (LCD_W-4) #define TRIM_RH_X (LCD_W*3/4-2) -#endif #define TRIM_LEN 27 #define MARKER_WIDTH 5 #define BOX_LIMIT (BOX_WIDTH-MARKER_WIDTH) -#if defined(PCBTARANIS) - const pm_uchar logo_taranis[] PROGMEM = { - #include "../bitmaps/logo_taranis.lbm" - }; - - const pm_uchar icons[] PROGMEM = { - #include "../bitmaps/icons.lbm" - }; - - #define ICON_RSSI 0, 9 - #define ICON_SPEAKER0 9, 8 - #define ICON_SPEAKER1 17, 8 - #define ICON_SPEAKER2 25, 8 - #define ICON_SPEAKER3 33, 8 - #define ICON_SD 41, 11 - #define ICON_LOGS 51, 11 - #define ICON_TRAINER 61, 11 - #define ICON_TRAINEE 71, 11 - #define ICON_USB 81, 11 - #define ICON_REBOOT 91, 11 - #define ICON_ALTITUDE 102, 9 -#endif - void drawPotsBars() { // Optimization by Mike Blandford @@ -148,9 +94,7 @@ void doMainScreenGraphics() calibStickVert = -calibStickVert; drawStick(RBOX_CENTERX, calibratedStick[CONVERT_MODE(3)], calibStickVert); -#if !defined(PCBTARANIS) drawPotsBars(); -#endif } void displayTrims(uint8_t phase) @@ -225,165 +169,7 @@ void displayTrims(uint8_t phase) } } -#if defined(PCBTARANIS) -void displaySliders() -{ - for (uint8_t i=NUM_STICKS; i=SLIDER1 ? LCD_H/2+1 : 1); - lcd_vline(x, y, LCD_H/2-2); - lcd_vline(x+1, y, LCD_H/2-2); - y += LCD_H/2-4; - y -= ((calibratedStick[i]+RESX)*(LCD_H/2-4)/(RESX*2)); // calculate once per loop - lcd_vline(x-1, y, 2); - lcd_vline(x+2, y, 2); - } -} -#define BAR_X 14 -#define BAR_Y 1 -#define BAR_W 184 -#define BAR_H 9 -#define BAR_NOTIFS_X BAR_X+133 -#define BAR_VOLUME_X BAR_X+147 -#define BAR_TIME_X BAR_X+159 - -void displayTopBarGauge(coord_t x, int count, bool blinking=false) -{ - if (!blinking || BLINK_ON_PHASE) - lcd_filled_rect(x+1, BAR_Y+2, 11, 5, SOLID, ERASE); - count = min(10, count); - for (int i=0; i 0) { - displayTopBarGauge(batt_icon_x+5*FW, TELEMETRY_RSSI() / 10, TELEMETRY_RSSI() < getRssiAlarmValue(0)); - } -} -#endif - -#if LCD_W >= 212 -void displayTimers() -{ - // Main and Second timer - for (unsigned int i=0; i<2; i++) { - if (g_model.timers[i].mode) { - TimerState & timerState = timersStates[i]; - TimerData & timerData = g_model.timers[i]; - uint8_t y = TIMERS_Y + i*TIMERS_H; - if (zlen(timerData.name, LEN_TIMER_NAME) > 0) { - lcd_putsnAtt(TIMERS_X, y-7, timerData.name, LEN_TIMER_NAME, ZCHAR|SMLSIZE); - } - else { - putsTimerMode(TIMERS_X, y-7, timerData.mode, SMLSIZE); - } - putsTimer(TIMERS_X, y, timerState.val, TIMEHOUR|MIDSIZE|LEFT, TIMEHOUR|MIDSIZE|LEFT); - if (timerData.persistent) { - lcd_putcAtt(TIMERS_R, y+1, 'P', SMLSIZE); - } - if (timerState.val < 0) { - if (BLINK_ON_PHASE) { - lcd_filled_rect(TIMERS_X-7, y-8, 60, 20); - } - } - } - } -} -#else void displayTimers() { #if defined(TRANSLATIONS_CZ) @@ -411,7 +197,6 @@ void displayTimers() #endif } } -#endif void displayBattVoltage() { @@ -427,12 +212,8 @@ void displayBattVoltage() #else LcdFlags att = (g_vbat100mV <= g_eeGeneral.vBatWarn ? BLINK|INVERS : 0) | BIGSIZE; putsVBat(VBATT_X-1, VBATT_Y, att|NO_UNIT); -#if LCD_W >= 212 - lcd_putcAtt(VBATTUNIT_X, VBATTUNIT_Y, 'v', MIDSIZE); -#else lcd_putc(VBATT_X, VBATTUNIT_Y, 'V'); #endif -#endif } #if defined(PCBSKY9X) @@ -452,33 +233,11 @@ void displayVoltageOrAlarm() #define displayVoltageOrAlarm() displayBattVoltage() #endif -#if defined(PCBTARANIS) - #define EVT_KEY_MODEL_MENU EVT_KEY_BREAK(KEY_MENU) - #define EVT_KEY_GENERAL_MENU EVT_KEY_LONG(KEY_MENU) - #define EVT_KEY_TELEMETRY EVT_KEY_LONG(KEY_PAGE) - #define EVT_KEY_CONTEXT_MENU EVT_KEY_LONG(KEY_ENTER) -#else - #define EVT_KEY_MODEL_MENU EVT_KEY_LONG(KEY_RIGHT) - #define EVT_KEY_GENERAL_MENU EVT_KEY_LONG(KEY_LEFT) - #define EVT_KEY_TELEMETRY EVT_KEY_LONG(KEY_DOWN) - #define EVT_KEY_STATISTICS EVT_KEY_LONG(KEY_UP) - #define EVT_KEY_CONTEXT_MENU EVT_KEY_BREAK(KEY_MENU) -#endif - -#if defined(PCBTARANIS) -void menuMainViewChannelsMonitor(uint8_t event) -{ - switch(event) { - case EVT_KEY_BREAK(KEY_PAGE): - case EVT_KEY_BREAK(KEY_EXIT): - chainMenu(menuMainView); - event = 0; - break; - } - - return menuChannelsView(event); -} -#endif +#define EVT_KEY_MODEL_MENU EVT_KEY_LONG(KEY_RIGHT) +#define EVT_KEY_GENERAL_MENU EVT_KEY_LONG(KEY_LEFT) +#define EVT_KEY_TELEMETRY EVT_KEY_LONG(KEY_DOWN) +#define EVT_KEY_STATISTICS EVT_KEY_LONG(KEY_UP) +#define EVT_KEY_CONTEXT_MENU EVT_KEY_BREAK(KEY_MENU) #if defined(NAVIGATION_MENUS) void onMainViewMenu(const char *result) @@ -529,10 +288,8 @@ void menuMainView(uint8_t event) { STICK_SCROLL_DISABLE(); -#if !defined(PCBTARANIS) uint8_t view = g_eeGeneral.view; uint8_t view_base = view & 0x0f; -#endif switch(event) { @@ -542,7 +299,6 @@ void menuMainView(uint8_t event) killEvents(KEY_DOWN); break; -#if !defined(PCBTARANIS) /* TODO if timer2 is OFF, it's possible to use this timer2 as in er9x... case EVT_KEY_BREAK(KEY_MENU): if (view_base == VIEW_TIMER2) { @@ -567,7 +323,6 @@ void menuMainView(uint8_t event) AUDIO_KEYPAD_UP(); } break; -#endif #if defined(NAVIGATION_MENUS) case EVT_KEY_CONTEXT_MENU: @@ -599,12 +354,10 @@ void menuMainView(uint8_t event) #endif #if MENUS_LOCK != 2/*no menus*/ -#if !defined(PCBTARANIS) case EVT_KEY_LONG(KEY_MENU):// go to last menu pushMenu(lastPopMenu()); killEvents(event); break; -#endif CASE_EVT_ROTARY_BREAK case EVT_KEY_MODEL_MENU: @@ -619,30 +372,17 @@ void menuMainView(uint8_t event) break; #endif -#if defined(PCBTARANIS) - case EVT_KEY_BREAK(KEY_PAGE): - eeDirty(EE_GENERAL); - g_eeGeneral.view += 1; - if (g_eeGeneral.view >= VIEW_COUNT) { - g_eeGeneral.view = 0; - chainMenu(menuMainViewChannelsMonitor); - } - break; -#else case EVT_KEY_BREAK(KEY_UP): case EVT_KEY_BREAK(KEY_DOWN): g_eeGeneral.view = (event == EVT_KEY_BREAK(KEY_UP) ? (view_base == VIEW_COUNT-1 ? 0 : view_base+1) : (view_base == 0 ? VIEW_COUNT-1 : view_base-1)); eeDirty(EE_GENERAL); AUDIO_KEYPAD_UP(); break; -#endif -#if !defined(PCBTARANIS) case EVT_KEY_STATISTICS: chainMenu(menuStatisticsView); killEvents(event); break; -#endif case EVT_KEY_TELEMETRY: #if defined(FRSKY) @@ -671,11 +411,9 @@ void menuMainView(uint8_t event) s_gvar_timer = 0; } #endif -#if !defined(PCBTARANIS) if (view == VIEW_TIMER2) { timerReset(1); } -#endif AUDIO_KEYPAD_UP(); break; @@ -695,91 +433,16 @@ void menuMainView(uint8_t event) // Model Name putsModelName(MODELNAME_X, MODELNAME_Y, g_model.header.name, g_eeGeneral.currModel, BIGSIZE); -#if !defined(PCBTARANIS) // Main Voltage (or alarm if any) displayVoltageOrAlarm(); // Timers displayTimers(); -#endif // Trims sliders displayTrims(phase); } -#if defined(PCBTARANIS) - // Top bar - displayTopBar(); - - // Sliders (Pots / Sliders) - displaySliders(); - - lcd_bmp(BITMAP_X, BITMAP_Y, modelBitmap); - - // Switches -#if defined(REV9E) - for (uint8_t i=0; i<8; i++) { - getvalue_t sw; - getvalue_t val; - val = getValue(MIXSRC_SA+i); - sw = ((val < 0) ? 3*i+1 : ((val == 0) ? 3*i+2 : 3*i+3)); - putsSwitches((g_eeGeneral.view == VIEW_INPUTS) ? (i<4 ? 8*FW+3 : 24*FW+1) : (i<4 ? 3*FW+2 : 8*FW-1), (i%4)*FH+3*FH, sw, 0); - } -#else - for (uint8_t i=0; i<8; i++) { - getvalue_t sw; - getvalue_t val; - // TODO simplify this + reuse code in checkSwitches() + Menu MODELSETUP - switch(i) { - case 5: - sw = getValue(MIXSRC_SF) > 0 ? 3*i+2 : 3*i+1; - break; - case 6: - val = getValue(MIXSRC_SG); - sw = ((val < 0) ? 3*i : ((val == 0) ? 3*i+1 : 3*i+2)); - break; - case 7: - sw = getValue(MIXSRC_SH) > 0 ? 3*i+1 : 3*i; - break; - default: - { - val = getValue(MIXSRC_SA+i); - sw = ((val < 0) ? 3*i+1 : ((val == 0) ? 3*i+2 : 3*i+3)); - break; - } - } - putsSwitches((g_eeGeneral.view == VIEW_INPUTS) ? (i<4 ? 8*FW+3 : 24*FW+1) : (i<4 ? 3*FW+2 : 8*FW-1), (i%4)*FH+3*FH, sw, 0); - } -#endif - - if (g_eeGeneral.view == VIEW_TIMERS) { - displayTimers(); - } - else if (g_eeGeneral.view == VIEW_INPUTS) { - // Sticks - doMainScreenGraphics(); - } - else { - // Logical Switches - lcd_puts(TRIM_RH_X - TRIM_LEN/2 + 5, 6*FH-1, "LS 1-32"); - for (uint8_t sw=0; sw= 5 ? 3 : 0); - LogicalSwitchData * cs = lswAddress(sw); - if (cs->func == LS_FUNC_NONE) { - lcd_hline(x, y+6, 4); - lcd_hline(x, y+7, 4); - } - else if (getSwitch(SWSRC_SW1+sw)) { - lcd_filled_rect(x, y, 4, 8); - } - else { - lcd_rect(x, y, 4, 8); - } - } - } -#else // PCBTARANIS if (view_base < VIEW_INPUTS) { // scroll bar lcd_hlineStip(38, 34, 54, DOTTED); @@ -895,33 +558,21 @@ void menuMainView(uint8_t event) putsTimerMode(timersStates[1].val >= 0 ? TMR2_LBL_COL : TMR2_LBL_COL-7, FH*6, g_model.timers[1].mode); // lcd_outdezNAtt(33+11*FW, FH*6, s_timerVal_10ms[1], LEADING0, 2); // 1/100s } -#endif // PCBTARANIS -#if !defined(PCBTARANIS) // And ! in case of unexpected shutdown if (unexpectedShutdown) { lcd_putcAtt(REBOOT_X, 0*FH, '!', INVERS); } -#endif #if defined(GVARS) && !defined(PCBSTD) if (s_gvar_timer > 0) { s_gvar_timer--; -#if LCD_W >= 212 - lcd_filled_rect(BITMAP_X, BITMAP_Y, 64, 32, SOLID, ERASE); - lcd_rect(BITMAP_X, BITMAP_Y, 64, 32); - putsStrIdx(BITMAP_X+FW, BITMAP_Y+FH-1, STR_GV, s_gvar_last+1); - lcd_putsnAtt(BITMAP_X+4*FW+FW/2, BITMAP_Y+FH-1, g_model.gvars[s_gvar_last].name, LEN_GVAR_NAME, ZCHAR); - lcd_putsAtt(BITMAP_X+FW, BITMAP_Y+2*FH+3, PSTR("[\010]"), BOLD); - lcd_outdezAtt(BITMAP_X+5*FW+FW/2, BITMAP_Y+2*FH+3, GVAR_VALUE(s_gvar_last, getGVarFlightPhase(mixerCurrentFlightMode, s_gvar_last)), BOLD); -#else s_warning = STR_GLOBAL_VAR; displayBox(); lcd_putsnAtt(16, 5*FH, g_model.gvars[s_gvar_last].name, LEN_GVAR_NAME, ZCHAR); lcd_putsAtt(16+7*FW, 5*FH, PSTR("[\010]"), BOLD); lcd_outdezAtt(16+7*FW+4*FW+FW/2, 5*FH, GVAR_VALUE(s_gvar_last, getGVarFlightPhase(mixerCurrentFlightMode, s_gvar_last)), BOLD); s_warning = NULL; -#endif } #endif @@ -930,4 +581,3 @@ void menuMainView(uint8_t event) lcd_putsAtt(15*FW, 0, PSTR("BIND"), 0); #endif } -