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

Align Taranis 128*64 stats to its larger sister (#4985)

Browse source 
* Align Taranis 128*64 stats to it's larger sister

* Make it for all ARM
This commit is contained in:
3djc 2017-06-02 16:37:12 +02:00 • committed by Bertrand Songis
parent 726b989f6c
commit d0a57d4c47
1 changed files with 30 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

32
radio/src/gui/128x64/view_statistics.cpp
View file

@ -20,6 +20,11 @@
#include "opentx.h" #include "opentx.h"
#define STATS_1ST_COLUMN 1
#define STATS_2ND_COLUMN 7*FW+FW/2
#define STATS_3RD_COLUMN 14*FW+FW/2
#define STATS_LABEL_WIDTH 3*FW
void menuStatisticsView(event_t event) void menuStatisticsView(event_t event)
{ {
TITLE(STR_MENUSTAT); TITLE(STR_MENUSTAT);
@ -41,8 +46,30 @@ void menuStatisticsView(event_t event)
break; break;
} }
#if defined(CPUARM)
// Session and Total timers
lcdDrawText(STATS_1ST_COLUMN, FH*1+1, "SES", BOLD);
drawTimer(STATS_1ST_COLUMN + STATS_LABEL_WIDTH, FH*1+1, sessionTimer, 0, 0);
lcdDrawText(STATS_1ST_COLUMN, FH*2+1, "TOT", BOLD);
drawTimer(STATS_1ST_COLUMN + STATS_LABEL_WIDTH, FH*2+1, g_eeGeneral.globalTimer + sessionTimer, TIMEHOUR, 0);
// Throttle special timers
lcdDrawText(STATS_2ND_COLUMN, FH*0+1, "THR", BOLD);
drawTimer(STATS_2ND_COLUMN + STATS_LABEL_WIDTH, FH*0+1, s_timeCumThr, 0, 0);
lcdDrawText(STATS_2ND_COLUMN, FH*1+1, "TH%", BOLD);
drawTimer(STATS_2ND_COLUMN + STATS_LABEL_WIDTH, FH*1+1, s_timeCum16ThrP/16, 0, 0);
// Timers
for (int i=0; i<TIMERS; i++) {
drawStringWithIndex(STATS_3RD_COLUMN, FH*i+1, "TM", i+1, BOLD);
if (timersStates[i].val > 3600)
drawTimer(STATS_3RD_COLUMN + STATS_LABEL_WIDTH, FH*i+1, timersStates[i].val, TIMEHOUR, 0);
else
drawTimer(STATS_3RD_COLUMN + STATS_LABEL_WIDTH, FH*i+1, timersStates[i].val, 0, 0);
}
#else
lcdDrawText( 1*FW, FH*0, STR_TOTTM1TM2THRTHP); lcdDrawText( 1*FW, FH*0, STR_TOTTM1TM2THRTHP);
drawTimer( 5*FW+5*FWNUM+1, FH*1, timersStates[0].val, RIGHT, 0); drawTimer( 5*FW+5*FWNUM+1, FH*1, timersStates[0].val, RIGHT, 0);
drawTimer( 12*FW+5*FWNUM+1, FH*1, timersStates[1].val, RIGHT, 0); drawTimer( 12*FW+5*FWNUM+1, FH*1, timersStates[1].val, RIGHT, 0);
@ -50,6 +77,7 @@ void menuStatisticsView(event_t event)
drawTimer( 12*FW+5*FWNUM+1, FH*2, s_timeCum16ThrP/16, RIGHT, 0); drawTimer( 12*FW+5*FWNUM+1, FH*2, s_timeCum16ThrP/16, RIGHT, 0);
drawTimer( 12*FW+5*FWNUM+1, FH*0, sessionTimer, RIGHT, 0); drawTimer( 12*FW+5*FWNUM+1, FH*0, sessionTimer, RIGHT, 0);
#endif
#if defined(THRTRACE) #if defined(THRTRACE)
const coord_t x = 5; const coord_t x = 5;
@ -98,7 +126,7 @@ void menuStatisticsDebug(event_t event)
killEvents(event); killEvents(event);
break; break;
#endif #endif
case EVT_KEY_FIRST(KEY_ENTER): case EVT_KEY_FIRST(KEY_ENTER):
#if !defined(CPUARM) #if !defined(CPUARM)
g_tmr1Latency_min = 0xff; g_tmr1Latency_min = 0xff;