Skip to content

Commit

Permalink
feat(b&w): Show time on main and telemetry 128x64 screens (#3306)
Browse files Browse the repository at this point in the history 
* Display time on main screen and telemetry for B&W radios.
Fix position for timer0 display on telemetry screen (was off screen).

* Put the time between the trim bars.
Center the stick boxes and the pot/slider bars.

* Remove code for unsupported radios.
  • Loading branch information
@philmoz
philmoz authored Mar 10, 2023
1 parent a416548 commit b88b4b6
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 168 deletions.
7 changes: 5 additions & 2 deletions radio/src/gui/128x64/lcd.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -626,11 +626,14 @@ void drawTelemetryTopBar()
{
drawModelName(0, 0, g_model.header.name, g_eeGeneral.currModel, 0);
uint8_t att = (IS_TXBATT_WARNING() ? BLINK : 0);
putsVBat(14*FW,0,att);
putsVBat(10*FW-1,0,att);
if (g_model.timers[0].mode) {
att = (timersStates[0].val<0 ? BLINK : 0);
drawTimer(17*FW+5*FWNUM+1, 0, timersStates[0].val, att, att);
drawTimer(13*FW+2, 0, timersStates[0].val, att, att);
}
#if defined(RTCLOCK)
drawRtcTime(17*FW+3, 0, LEFT|TIMEBLINK);
#endif
lcdInvertLine(0);
}

Expand Down
188 changes: 22 additions & 166 deletions radio/src/gui/128x64/view_main.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,18 +21,9 @@

#include "opentx.h"

#if defined(HARDWARE_NO_TRIMS)
struct {
int8_t preStickIdx = -1;
int8_t curStickIdx = -1;
tmr10ms_t preEnterTime;
bool preEnterValid = false;
} trimSelection;
#endif

#define BIGSIZE DBLSIZE
#if defined (PCBTARANIS)
#define LBOX_CENTERX (LCD_W/4 + 13)
#define LBOX_CENTERX (LCD_W/4 + 12)
#define RBOX_CENTERX (3*LCD_W/4 - 13)
#else
#define LBOX_CENTERX (LCD_W/4 + 10)
Expand All @@ -46,20 +37,22 @@ struct {
#define VBATT_X (6*FW-1)
#define VBATT_Y (2*FH)
#define VBATTUNIT_Y (3*FH)
#define REBOOT_X (20*FW-3)
#define REBOOT_X (2)
#define BAR_HEIGHT (BOX_WIDTH-1l) // don't remove the l here to force 16bits maths on 9X
#define TRIM_LH_X (LCD_W*1/4+2)
#define TRIM_LEN 21
#define TRIM_LH_X (TRIM_LEN+4)
#define TRIM_LV_X 3
#define TRIM_RV_X (LCD_W-4)
#define TRIM_RH_X (LCD_W*3/4-2)
#define TRIM_RH_X (LCD_W-TRIM_LEN-5)
#define TRIM_LH_NEG (TRIM_LH_X+1*FW)
#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)
#define RSSSI_X (30)
#define RSSSI_Y (31)
#define RSSI_MAX 105
#define TRIM_LEN 23
#define CLOCK_X 53
#define CLOCK_Y 57

void drawExternalAntennaAndRSSI()
{
Expand All @@ -84,7 +77,7 @@ void drawExternalAntennaAndRSSI()
void drawPotsBars()
{
// Optimization by Mike Blandford
for (uint8_t x = LCD_W / 2 - (NUM_POTS + NUM_SLIDERS - 1) * 5 / 2, i = NUM_STICKS; i < NUM_STICKS + NUM_POTS + NUM_SLIDERS; x += 5, i++) {
for (uint8_t x = LCD_W / 2 - (NUM_POTS + NUM_SLIDERS - 1) * 5 / 2 - 1, i = NUM_STICKS; i < NUM_STICKS + NUM_POTS + NUM_SLIDERS; x += 5, i++) {
if (IS_POT_SLIDER_AVAILABLE(i)) {
uint8_t len = ((calibratedAnalogs[i] + RESX) * BAR_HEIGHT / (RESX * 2)) + 1l; // calculate once per loop
V_BAR(x, LCD_H - 8, len);
Expand All @@ -108,35 +101,6 @@ void doMainScreenGraphics()
#endif
}

#if defined(HARDWARE_NO_TRIMS)
void doMainScreenGraphics(uint8_t views, uint32_t ptr)
{
int16_t * calibStickValPtr = nullptr;
int16_t calibStickVert = 0;

if (ptr)
calibStickValPtr = (int16_t *)(ptr);
else
calibStickValPtr = calibratedAnalogs;
calibStickVert = calibStickValPtr[CONVERT_MODE(1)];

if (views & MAINSCREEN_GRAPHICS_STICKS) {
if (g_model.throttleReversed && CONVERT_MODE(1) == THR_STICK)
calibStickVert = -calibStickVert;
drawStick(LBOX_CENTERX, calibStickValPtr[CONVERT_MODE(0)], calibStickVert);

calibStickVert = calibStickValPtr[CONVERT_MODE(2)];
if (g_model.throttleReversed && CONVERT_MODE(2) == THR_STICK)
calibStickVert = -calibStickVert;
drawStick(RBOX_CENTERX, calibStickValPtr[CONVERT_MODE(3)], calibStickVert);
}

if (views & MAINSCREEN_GRAPHICS_POTS) {
drawPotsBars();
}
}
#endif

void displayTrims(uint8_t phase)
{
for (uint8_t i = 0; i < 4; i++) {
Expand Down Expand Up @@ -167,30 +131,12 @@ void displayTrims(uint8_t phase)
}

if (vert[i]) {
#if defined(HARDWARE_NO_TRIMS)
ym = 61;
if (trimSelection.curStickIdx == i) {
lcdDrawSolidVerticalLine(xm, ym - TRIM_LEN, TRIM_LEN * 2);
if (i != 2 || !g_model.thrTrim) {
lcdDrawSolidVerticalLine(xm - 1, ym - TRIM_LEN, TRIM_LEN * 2);
lcdDrawSolidVerticalLine(xm + 1, ym - TRIM_LEN, TRIM_LEN * 2);
}
}
else {
lcdDrawSolidVerticalLine(xm, ym - TRIM_LEN, TRIM_LEN * 2);
if (i != 2 || !g_model.thrTrim) {
lcdDrawSolidVerticalLine(xm - 1, ym - 1, 3);
lcdDrawSolidVerticalLine(xm + 1, ym - 1, 3);
}
}
#else
ym = 31;
lcdDrawSolidVerticalLine(xm, ym - TRIM_LEN, TRIM_LEN * 2);
lcdDrawSolidVerticalLine(xm, ym - TRIM_LEN, TRIM_LEN * 2 + 1);
if (i != 2 || !g_model.thrTrim) {
lcdDrawSolidVerticalLine(xm - 1, ym - 1, 3);
lcdDrawSolidVerticalLine(xm + 1, ym - 1, 3);
}
#endif
ym -= val;
lcdDrawFilledRect(xm - 3, ym - 3, 7, 7, SOLID, att | ERASE);
if (dir >= 0) {
Expand All @@ -209,24 +155,10 @@ void displayTrims(uint8_t phase)
}
}
else {
#if defined(HARDWARE_NO_TRIMS)
ym = 92;
if (trimSelection.curStickIdx == i) {
lcdDrawSolidHorizontalLine(xm - TRIM_LEN, ym, TRIM_LEN * 2);
lcdDrawSolidHorizontalLine(xm - TRIM_LEN, ym - 1, TRIM_LEN * 2);
lcdDrawSolidHorizontalLine(xm - TRIM_LEN, ym + 1, TRIM_LEN * 2);
}
else {
lcdDrawSolidHorizontalLine(xm - TRIM_LEN, ym, TRIM_LEN * 2);
lcdDrawSolidHorizontalLine(xm - 1, ym - 1, 3);
lcdDrawSolidHorizontalLine(xm - 1, ym + 1, 3);
}
#else
ym = 60;
lcdDrawSolidHorizontalLine(xm - TRIM_LEN, ym, TRIM_LEN * 2);
lcdDrawSolidHorizontalLine(xm - TRIM_LEN, ym, TRIM_LEN * 2 + 1);
lcdDrawSolidHorizontalLine(xm - 1, ym - 1, 3);
lcdDrawSolidHorizontalLine(xm - 1, ym + 1, 3);
#endif
xm += val;
lcdDrawFilledRect(xm - 3, ym - 3, 7, 7, SOLID, att | ERASE);
if (dir >= 0) {
Expand Down Expand Up @@ -418,21 +350,11 @@ void menuMainView(event_t event)
*/
case EVT_KEY_NEXT_PAGE:
case EVT_KEY_PREVIOUS_PAGE:
#if defined(HARDWARE_NO_TRIMS)
if (g_trimEditMode == EDIT_TRIM_DISABLED) {
if (view_base == VIEW_INPUTS)
g_eeGeneral.view ^= ALTERNATE_VIEW;
else
g_eeGeneral.view = (g_eeGeneral.view + (4 * ALTERNATE_VIEW) + ((event == EVT_KEY_PREVIOUS_PAGE) ? -ALTERNATE_VIEW : ALTERNATE_VIEW)) % (4 * ALTERNATE_VIEW);
}
break;
#else
if (view_base == VIEW_INPUTS)
g_eeGeneral.view ^= ALTERNATE_VIEW;
else
g_eeGeneral.view = (g_eeGeneral.view + (4 * ALTERNATE_VIEW) + ((event == EVT_KEY_PREVIOUS_PAGE) ? -ALTERNATE_VIEW : ALTERNATE_VIEW)) % (4 * ALTERNATE_VIEW);
break;
#endif

case EVT_KEY_CONTEXT_MENU:
killEvents(event);
Expand Down Expand Up @@ -465,38 +387,6 @@ void menuMainView(event_t event)
killEvents(event);
break;

#if defined(HARDWARE_NO_TRIMS)
case EVT_KEY_FIRST(KEY_ENTER):
if (!trimSelection.preEnterValid) {
trimSelection.preEnterValid = true;
trimSelection.preEnterTime = get_tmr10ms();
}
else {
trimSelection.preEnterValid = false;
if (++g_trimEditMode > EDIT_TRIM_MAX) {
g_trimEditMode = EDIT_TRIM_1;
}

trimSelection.curStickIdx = CONVERT_MODE_TRIMS(g_trimEditMode - 1);

if (trimSelection.preStickIdx != trimSelection.curStickIdx) {
if (trimSelection.curStickIdx == RUD_STICK) {
AUDIO_RUDDER_TRIM();
}
else if (trimSelection.curStickIdx == ELE_STICK) {
AUDIO_ELEVATOR_TRIM();
}
else if (trimSelection.curStickIdx == THR_STICK) {
AUDIO_THROTTLE_TRIM();
}
else if (trimSelection.curStickIdx == AIL_STICK) {
AUDIO_AILERON_TRIM();
}
trimSelection.preStickIdx = trimSelection.curStickIdx;
}
}
break;
#endif
#if defined(EVT_KEY_PREVIOUS_VIEW)
// TODO try to split those 2 cases on 9X
case EVT_KEY_PREVIOUS_VIEW:
Expand Down Expand Up @@ -531,22 +421,9 @@ void menuMainView(event_t event)
if (gvarDisplayTimer > 0) {
gvarDisplayTimer = 0;
}
#endif
#if defined(HARDWARE_NO_TRIMS)
if (g_trimEditMode != EDIT_TRIM_DISABLED) {
g_trimEditMode = EDIT_TRIM_DISABLED;
AUDIO_MAIN_MENU();
trimSelection.curStickIdx = -1;
trimSelection.preStickIdx = -1;
}
#endif
break;
}
#if defined(HARDWARE_NO_TRIMS)
if (trimSelection.preEnterValid && (get_tmr10ms() - trimSelection.preEnterTime) > 50) {
trimSelection.preEnterValid = false;
}
#endif

switch (view_base) {
case VIEW_CHAN_MONITOR:
Expand Down Expand Up @@ -660,38 +537,6 @@ void menuMainView(event_t event)
drawSwitch(x, y, sw, 0, false);
}
}
#elif defined(PCBTANGO)
int sw_i;
for (int i = 0; i < NUM_SWITCHES; ++i) {
if (SWITCH_EXISTS(i)) {
uint8_t x = 2 * FW - 2, y = 4 * FH + i * FH + 20;
if (i >= NUM_SWITCHES / 2) {
x = 16 * FW + 6;
y -= (NUM_SWITCHES / 2) * FH;
}
//TDOD : move switchesReorder definition in board.h
static const uint8_t switchesReorder[] = {0, 1, 5, 3, 2, 4};

// re-arrange order according to physical layout
i = switchesReorder[i];
getvalue_t val = getValue(MIXSRC_FIRST_SWITCH + sw_i);
getvalue_t sw = ((val < 0) ? 3 * sw_i + 1 : ((val == 0) ? 3 * sw_i + 2 : 3 * sw_i + 3));
drawSwitch(x, y, sw, 0);
}
}
#elif defined(PCBMAMBO)
for (int i = 0; i < NUM_SWITCHES; ++i) {
if (SWITCH_EXISTS(i)) {
uint8_t x = 2 * FW - 2, y = 4 * FH + i * FH + 1;
if (i >= NUM_SWITCHES / 2) {
x = 16 * FW + 6;
y -= (NUM_SWITCHES / 2) * FH;
}
getvalue_t val = getValue(MIXSRC_FIRST_SWITCH + i);
getvalue_t sw = ((val < 0) ? 3 * i + 1 : ((val == 0) ? 3 * i + 2 : 3 * i + 3));
drawSwitch(x, y, sw, 0);
}
}
#else
// The ID0 3-POS switch is merged with the TRN switch
for (uint8_t i = SWSRC_THR; i <= SWSRC_TRN; i++) {
Expand Down Expand Up @@ -745,7 +590,7 @@ void menuMainView(event_t event)

// And ! in case of unexpected shutdown
if (isAsteriskDisplayed()) {
lcdDrawChar(REBOOT_X, 0 * FH, '!', INVERS);
lcdDrawChar(REBOOT_X, 1, '!', INVERS|BLINK);
}
}

Expand All @@ -771,6 +616,17 @@ void menuMainView(event_t event)
// Issue 98
lcdDrawText(15 * FW, 0, "BIND", 0);
}
#if defined(RTCLOCK)
else if (view_base != VIEW_CHAN_MONITOR) {
drawRtcTime(CLOCK_X, CLOCK_Y, LEFT|TIMEBLINK);
}
#endif
#else
#if defined(RTCLOCK)
if (view_base != VIEW_CHAN_MONITOR) {
drawRtcTime(CLOCK_X, CLOCK_Y, LEFT|TIMEBLINK);
}
#endif
#endif
}

Expand Down

0 comments on commit b88b4b6

Please sign in to comment.