Another couple of functions renamed
And nothing else this time!
This commit is contained in:
@@ -512,10 +512,10 @@ void menuTelemetryArduPilot1(uint8_t event)
|
||||
initval (1, PACK_POS, LON);
|
||||
// title of the screen
|
||||
title ('1');
|
||||
lcd_puts (5*FW, 1*FH, PSTR(" Latitude")); // line 1 column 5
|
||||
lcdDrawText(5*FW, 1*FH, PSTR(" Latitude")); // line 1 column 5
|
||||
// first buffer into line 2 column 2
|
||||
lcdDrawText (2*FW, 2*FH, VALSTR(0), APSIZE);
|
||||
lcd_puts (5*FW, 4*FH, PSTR(" Longitude")); // line 4 column 5
|
||||
lcdDrawText(5*FW, 4*FH, PSTR(" Longitude")); // line 4 column 5
|
||||
// second buffer into line 5 column 2
|
||||
lcdDrawText (1*FW, 5*FH, VALSTR(1), APSIZE);
|
||||
}
|
||||
@@ -538,9 +538,9 @@ void menuTelemetryArduPilot2(uint8_t event)
|
||||
initval (0, PACK_POS, SPD);
|
||||
initval (1, PACK_POS, CRT);
|
||||
title ('2');
|
||||
lcd_puts (1*FW, 1*FH, PSTR(" Ground speed"));
|
||||
lcdDrawText(1*FW, 1*FH, PSTR(" Ground speed"));
|
||||
lcdDrawText (2*FW, 2*FH, VALSTR(0), APSIZE);
|
||||
lcd_puts (1*FW, 4*FH, PSTR(" Climb rate") );
|
||||
lcdDrawText(1*FW, 4*FH, PSTR(" Climb rate") );
|
||||
lcdDrawText (2*FW, 5*FH, VALSTR(1), APSIZE);
|
||||
}
|
||||
|
||||
@@ -562,9 +562,9 @@ void menuTelemetryArduPilot3(uint8_t event)
|
||||
initval (0, PACK_POS, ALT);
|
||||
initval (1, PACK_POS, ALH);
|
||||
title ('3');
|
||||
lcd_puts (1*FW, 1*FH, PSTR(" Altitude"));
|
||||
lcdDrawText(1*FW, 1*FH, PSTR(" Altitude"));
|
||||
lcdDrawText (2*FW, 2*FH, VALSTR(0), APSIZE);
|
||||
lcd_puts (1*FW, 4*FH, PSTR(" Altitude Hold") );
|
||||
lcdDrawText(1*FW, 4*FH, PSTR(" Altitude Hold") );
|
||||
lcdDrawText (2*FW, 5*FH, VALSTR(1), APSIZE);
|
||||
}
|
||||
|
||||
@@ -586,9 +586,9 @@ void menuTelemetryArduPilot4(uint8_t event)
|
||||
initval (0, PACK_POS, CRS);
|
||||
initval (1, PACK_POS, BER);
|
||||
title ('4');
|
||||
lcd_puts (1*FW, 1*FH, PSTR(" Course"));
|
||||
lcdDrawText(1*FW, 1*FH, PSTR(" Course"));
|
||||
lcdDrawText (2*FW, 2*FH, VALSTR(0), APSIZE);
|
||||
lcd_puts (1*FW, 4*FH, PSTR(" Bearing"));
|
||||
lcdDrawText(1*FW, 4*FH, PSTR(" Bearing"));
|
||||
lcdDrawText (2*FW, 5*FH, VALSTR(1), APSIZE);
|
||||
}
|
||||
|
||||
@@ -612,9 +612,9 @@ void menuTelemetryArduPilot5(uint8_t event)
|
||||
initval (0, PACK_POS, WPN);
|
||||
initval (1, PACK_POS, DST);
|
||||
title ('5');
|
||||
lcd_puts (1*FW, 1*FH, PSTR(" Way Point # "));
|
||||
lcdDrawText(1*FW, 1*FH, PSTR(" Way Point # "));
|
||||
lcdDrawText (2*FW, 2*FH, VALSTR(0), APSIZE);
|
||||
lcd_puts (1*FW, 4*FH, PSTR(" Distance "));
|
||||
lcdDrawText(1*FW, 4*FH, PSTR(" Distance "));
|
||||
lcdDrawText (2*FW, 5*FH, VALSTR(1), APSIZE);
|
||||
}
|
||||
|
||||
@@ -638,9 +638,9 @@ void menuTelemetryArduPilot6(uint8_t event)
|
||||
initval (0, PACK_ATT, ASP);
|
||||
initval (1, PACK_ATT, THH);
|
||||
title ('6');
|
||||
lcd_puts (1*FW, 1*FH, PSTR(" Air Speed "));
|
||||
lcdDrawText(1*FW, 1*FH, PSTR(" Air Speed "));
|
||||
lcdDrawText (2*FW, 2*FH, VALSTR(0), APSIZE);
|
||||
lcd_puts (1*FW, 4*FH, PSTR(" Climb Rate "));
|
||||
lcdDrawText(1*FW, 4*FH, PSTR(" Climb Rate "));
|
||||
lcdDrawText (2*FW, 5*FH, VALSTR(1), APSIZE);
|
||||
}
|
||||
|
||||
@@ -664,9 +664,9 @@ void menuTelemetryArduPilot7(uint8_t event)
|
||||
initval (0, PACK_ATT, RLL);
|
||||
initval (1, PACK_ATT, PCH);
|
||||
title ('7');
|
||||
lcd_puts (1*FW, 1*FH, PSTR(" Roll Angle"));
|
||||
lcdDrawText(1*FW, 1*FH, PSTR(" Roll Angle"));
|
||||
lcdDrawText (2*FW, 2*FH, VALSTR(0), APSIZE);
|
||||
lcd_puts (1*FW, 4*FH, PSTR(" Pitch Angle"));
|
||||
lcdDrawText(1*FW, 4*FH, PSTR(" Pitch Angle"));
|
||||
lcdDrawText (2*FW, 5*FH, VALSTR(1), APSIZE);
|
||||
}
|
||||
|
||||
@@ -690,9 +690,9 @@ void menuTelemetryArduPilot8(uint8_t event)
|
||||
initval (0, PACK_MOD, MOD);
|
||||
initval (1, PACK_WPC, WPC);
|
||||
title ('8');
|
||||
lcd_puts (1*FW, 1*FH, PSTR(" ArduPilot Mode"));
|
||||
lcdDrawText(1*FW, 1*FH, PSTR(" ArduPilot Mode"));
|
||||
lcdDrawText (2*FW, 2*FH, VALSTR(0), APSIZE);
|
||||
lcd_puts (1*FW, 4*FH, PSTR(" RTL Distance"));
|
||||
lcdDrawText(1*FW, 4*FH, PSTR(" RTL Distance"));
|
||||
lcdDrawText (2*FW, 5*FH, VALSTR(1), APSIZE);
|
||||
}
|
||||
|
||||
|
||||
@@ -464,11 +464,11 @@ void menuTelemetryNMEA1(uint8_t event)
|
||||
|
||||
if (rbuf[0][0]) { // show always if data have been received
|
||||
lcdDrawChar ( 19*FW, 1*FH, sbuf[2], 0); // satellites in view
|
||||
lcdDrawTextWithLen ( 2*FW, 2*FH, &rbuf[0][0], 2, APSIZE); // hours
|
||||
lcdDrawSizedText ( 2*FW, 2*FH, &rbuf[0][0], 2, APSIZE); // hours
|
||||
lcdDrawChar ( 6*FW, 2*FH, ':', DBLSIZE); // ":"
|
||||
lcdDrawTextWithLen ( 8*FW, 2*FH, &rbuf[0][2], 2, APSIZE); // minutes
|
||||
lcdDrawSizedText ( 8*FW, 2*FH, &rbuf[0][2], 2, APSIZE); // minutes
|
||||
lcdDrawChar ( 12*FW, 2*FH, ':', DBLSIZE); // ":"
|
||||
lcdDrawTextWithLen ( 14*FW, 2*FH, &rbuf[0][4], 2, APSIZE); // seconds
|
||||
lcdDrawSizedText ( 14*FW, 2*FH, &rbuf[0][4], 2, APSIZE); // seconds
|
||||
}
|
||||
else
|
||||
lcdDrawText ( 2*FW, 2*FH, val_unknown, APSIZE); // "?"
|
||||
@@ -483,11 +483,11 @@ void menuTelemetryNMEA1(uint8_t event)
|
||||
lcd_puts ( 2*FW, 4*FH, PSTR("Date")); // show the UTC Date
|
||||
|
||||
if (rbuf[1][0]) {
|
||||
lcdDrawTextWithLen( 2*FW, 5*FH, &rbuf[1][0], 2, APSIZE); // year
|
||||
lcdDrawSizedText( 2*FW, 5*FH, &rbuf[1][0], 2, APSIZE); // year
|
||||
lcdDrawChar ( 6*FW, 5*FH, '/', DBLSIZE); // "/"
|
||||
lcdDrawTextWithLen( 8*FW, 5*FH, &rbuf[1][2], 2, APSIZE); // month
|
||||
lcdDrawSizedText( 8*FW, 5*FH, &rbuf[1][2], 2, APSIZE); // month
|
||||
lcdDrawChar (12*FW, 5*FH, '/', DBLSIZE); // "/"
|
||||
lcdDrawTextWithLen(14*FW, 5*FH, &rbuf[1][4], 2, APSIZE); // day
|
||||
lcdDrawSizedText(14*FW, 5*FH, &rbuf[1][4], 2, APSIZE); // day
|
||||
}
|
||||
else
|
||||
lcdDrawText ( 2*FW, 5*FH, val_unknown, APSIZE); // "?"
|
||||
@@ -593,7 +593,7 @@ void menuTelemetryNMEA2(uint8_t event)
|
||||
lcd_puts ( 17*FW, 6*FH, PSTR("OFF") );
|
||||
|
||||
|
||||
lcd_outdezNAtt( 20*FW, 4*FH, home_alt, PREC1, 6); // display home_alt, small characters
|
||||
lcdDrawNumber( 20*FW, 4*FH, home_alt, PREC1, 6); // display home_alt, small characters
|
||||
|
||||
if (xpack[0] != PACK_GGA)
|
||||
ggareceived = 0;
|
||||
@@ -635,17 +635,17 @@ void menuTelemetryNMEA2(uint8_t event)
|
||||
if (sbuf[1]>0x30) { // & GGA has FIX > 0
|
||||
|
||||
|
||||
lcd_outdezNAtt( 10*FW, 2*FH, rel_alt, DBLSIZE|PREC1, 7); // altitude
|
||||
lcdDrawNumber( 10*FW, 2*FH, rel_alt, DBLSIZE|PREC1, 7); // altitude
|
||||
|
||||
if (home_alt >= 0)
|
||||
lcd_outdezNAtt( 20*FW, 2*FH, (max_alt-home_alt), PREC1, 6); // display small characters
|
||||
lcdDrawNumber( 20*FW, 2*FH, (max_alt-home_alt), PREC1, 6); // display small characters
|
||||
else
|
||||
lcd_outdezNAtt( 20*FW, 2*FH, max_alt, PREC1, 6); // display small characters
|
||||
lcdDrawNumber( 20*FW, 2*FH, max_alt, PREC1, 6); // display small characters
|
||||
|
||||
|
||||
lcdDrawChar ( 11*FW, 3*FH, sbuf[0], 0); // dimension [m]
|
||||
|
||||
lcd_outdezNAtt( 10*FW, 5*FH, lift_alt, DBLSIZE|PREC1, 6); // lift
|
||||
lcdDrawNumber( 10*FW, 5*FH, lift_alt, DBLSIZE|PREC1, 6); // lift
|
||||
lcdDrawChar ( 11*FW, 6*FH, sbuf[0], 0); // dimension [m/S]
|
||||
lcd_puts ( 12*FW, 6*FH, PSTR("/S") );
|
||||
}
|
||||
@@ -741,7 +741,7 @@ void menuTelemetryNMEA4(uint8_t event)
|
||||
{
|
||||
lcdDrawChar ( 13*FW, 1*FH, sbuf[0], 0); // N or S
|
||||
lcdDrawChar ( 19*FW, 1*FH, sbuf[2], 0); // satellites in view
|
||||
lcdDrawTextWithLen ( 1*FW, 2*FH, rbuf[0], 2, APSIZE);
|
||||
lcdDrawSizedText ( 1*FW, 2*FH, rbuf[0], 2, APSIZE);
|
||||
lcdDrawChar ( 5*FW, 2*FH, '@',0);
|
||||
lcdDrawText ( 6*FW, 2*FH, &rbuf[0][2], APSIZE); // minutes with small decimal point
|
||||
}
|
||||
@@ -752,7 +752,7 @@ void menuTelemetryNMEA4(uint8_t event)
|
||||
if (rbuf[0][0])
|
||||
{
|
||||
lcdDrawChar ( 13*FW, 4*FH, sbuf[1], 0); // E or W
|
||||
lcdDrawTextWithLen ( 0*FW, 5*FH, rbuf[1], 3, APSIZE);
|
||||
lcdDrawSizedText ( 0*FW, 5*FH, rbuf[1], 3, APSIZE);
|
||||
lcdDrawChar ( 6*FW, 5*FH, '@',0);
|
||||
lcdDrawText ( 7*FW, 5*FH, &rbuf[1][3], APSIZE); // minutes with small decimal point
|
||||
|
||||
|
||||
Reference in New Issue
Block a user