[Horus] Refactoring continued

This commit is contained in:
Bertrand Songis
2015-10-24 11:27:34 +02:00
parent fb371cf5b7
commit ab0272c16c
116 changed files with 1042 additions and 1269 deletions
+17 -17
View File
@@ -514,10 +514,10 @@ void menuTelemetryArduPilot1(uint8_t event)
title ('1');
lcd_puts (5*FW, 1*FH, PSTR(" Latitude")); // line 1 column 5
// first buffer into line 2 column 2
lcd_putsAtt (2*FW, 2*FH, VALSTR(0), APSIZE);
lcdDrawText (2*FW, 2*FH, VALSTR(0), APSIZE);
lcd_puts (5*FW, 4*FH, PSTR(" Longitude")); // line 4 column 5
// second buffer into line 5 column 2
lcd_putsAtt (1*FW, 5*FH, VALSTR(1), APSIZE);
lcdDrawText (1*FW, 5*FH, VALSTR(1), APSIZE);
}
void menuTelemetryArduPilot2(uint8_t event)
@@ -539,9 +539,9 @@ void menuTelemetryArduPilot2(uint8_t event)
initval (1, PACK_POS, CRT);
title ('2');
lcd_puts (1*FW, 1*FH, PSTR(" Ground speed"));
lcd_putsAtt (2*FW, 2*FH, VALSTR(0), APSIZE);
lcdDrawText (2*FW, 2*FH, VALSTR(0), APSIZE);
lcd_puts (1*FW, 4*FH, PSTR(" Climb rate") );
lcd_putsAtt (2*FW, 5*FH, VALSTR(1), APSIZE);
lcdDrawText (2*FW, 5*FH, VALSTR(1), APSIZE);
}
void menuTelemetryArduPilot3(uint8_t event)
@@ -563,9 +563,9 @@ void menuTelemetryArduPilot3(uint8_t event)
initval (1, PACK_POS, ALH);
title ('3');
lcd_puts (1*FW, 1*FH, PSTR(" Altitude"));
lcd_putsAtt (2*FW, 2*FH, VALSTR(0), APSIZE);
lcdDrawText (2*FW, 2*FH, VALSTR(0), APSIZE);
lcd_puts (1*FW, 4*FH, PSTR(" Altitude Hold") );
lcd_putsAtt (2*FW, 5*FH, VALSTR(1), APSIZE);
lcdDrawText (2*FW, 5*FH, VALSTR(1), APSIZE);
}
void menuTelemetryArduPilot4(uint8_t event)
@@ -587,9 +587,9 @@ void menuTelemetryArduPilot4(uint8_t event)
initval (1, PACK_POS, BER);
title ('4');
lcd_puts (1*FW, 1*FH, PSTR(" Course"));
lcd_putsAtt (2*FW, 2*FH, VALSTR(0), APSIZE);
lcdDrawText (2*FW, 2*FH, VALSTR(0), APSIZE);
lcd_puts (1*FW, 4*FH, PSTR(" Bearing"));
lcd_putsAtt (2*FW, 5*FH, VALSTR(1), APSIZE);
lcdDrawText (2*FW, 5*FH, VALSTR(1), APSIZE);
}
void menuTelemetryArduPilot5(uint8_t event)
@@ -613,9 +613,9 @@ void menuTelemetryArduPilot5(uint8_t event)
initval (1, PACK_POS, DST);
title ('5');
lcd_puts (1*FW, 1*FH, PSTR(" Way Point # "));
lcd_putsAtt (2*FW, 2*FH, VALSTR(0), APSIZE);
lcdDrawText (2*FW, 2*FH, VALSTR(0), APSIZE);
lcd_puts (1*FW, 4*FH, PSTR(" Distance "));
lcd_putsAtt (2*FW, 5*FH, VALSTR(1), APSIZE);
lcdDrawText (2*FW, 5*FH, VALSTR(1), APSIZE);
}
void menuTelemetryArduPilot6(uint8_t event)
@@ -639,9 +639,9 @@ void menuTelemetryArduPilot6(uint8_t event)
initval (1, PACK_ATT, THH);
title ('6');
lcd_puts (1*FW, 1*FH, PSTR(" Air Speed "));
lcd_putsAtt (2*FW, 2*FH, VALSTR(0), APSIZE);
lcdDrawText (2*FW, 2*FH, VALSTR(0), APSIZE);
lcd_puts (1*FW, 4*FH, PSTR(" Climb Rate "));
lcd_putsAtt (2*FW, 5*FH, VALSTR(1), APSIZE);
lcdDrawText (2*FW, 5*FH, VALSTR(1), APSIZE);
}
void menuTelemetryArduPilot7(uint8_t event)
@@ -665,9 +665,9 @@ void menuTelemetryArduPilot7(uint8_t event)
initval (1, PACK_ATT, PCH);
title ('7');
lcd_puts (1*FW, 1*FH, PSTR(" Roll Angle"));
lcd_putsAtt (2*FW, 2*FH, VALSTR(0), APSIZE);
lcdDrawText (2*FW, 2*FH, VALSTR(0), APSIZE);
lcd_puts (1*FW, 4*FH, PSTR(" Pitch Angle"));
lcd_putsAtt (2*FW, 5*FH, VALSTR(1), APSIZE);
lcdDrawText (2*FW, 5*FH, VALSTR(1), APSIZE);
}
void menuTelemetryArduPilot8(uint8_t event)
@@ -691,14 +691,14 @@ void menuTelemetryArduPilot8(uint8_t event)
initval (1, PACK_WPC, WPC);
title ('8');
lcd_puts (1*FW, 1*FH, PSTR(" ArduPilot Mode"));
lcd_putsAtt (2*FW, 2*FH, VALSTR(0), APSIZE);
lcdDrawText (2*FW, 2*FH, VALSTR(0), APSIZE);
lcd_puts (1*FW, 4*FH, PSTR(" RTL Distance"));
lcd_putsAtt (2*FW, 5*FH, VALSTR(1), APSIZE);
lcdDrawText (2*FW, 5*FH, VALSTR(1), APSIZE);
}
void title(char x)
{
lcd_putsAtt (0, 0, PSTR(" ARDU PILOT Mega ?/8 "), INVERS);
lcdDrawText (0, 0, PSTR(" ARDU PILOT Mega ?/8 "), INVERS);
lcdDrawChar(17*FW, 0*FH, x, INVERS);
}
+20 -20
View File
@@ -464,14 +464,14 @@ 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
lcd_putsnAtt ( 2*FW, 2*FH, &rbuf[0][0], 2, APSIZE); // hours
lcdDrawTextWithLen ( 2*FW, 2*FH, &rbuf[0][0], 2, APSIZE); // hours
lcdDrawChar ( 6*FW, 2*FH, ':', DBLSIZE); // ":"
lcd_putsnAtt ( 8*FW, 2*FH, &rbuf[0][2], 2, APSIZE); // minutes
lcdDrawTextWithLen ( 8*FW, 2*FH, &rbuf[0][2], 2, APSIZE); // minutes
lcdDrawChar ( 12*FW, 2*FH, ':', DBLSIZE); // ":"
lcd_putsnAtt ( 14*FW, 2*FH, &rbuf[0][4], 2, APSIZE); // seconds
lcdDrawTextWithLen ( 14*FW, 2*FH, &rbuf[0][4], 2, APSIZE); // seconds
}
else
lcd_putsAtt ( 2*FW, 2*FH, val_unknown, APSIZE); // "?"
lcdDrawText ( 2*FW, 2*FH, val_unknown, APSIZE); // "?"
if ((show_timer == 1) && rbuf[0][0]) { // show the Timer when data have been received
@@ -483,14 +483,14 @@ void menuTelemetryNMEA1(uint8_t event)
lcd_puts ( 2*FW, 4*FH, PSTR("Date")); // show the UTC Date
if (rbuf[1][0]) {
lcd_putsnAtt( 2*FW, 5*FH, &rbuf[1][0], 2, APSIZE); // year
lcdDrawTextWithLen( 2*FW, 5*FH, &rbuf[1][0], 2, APSIZE); // year
lcdDrawChar ( 6*FW, 5*FH, '/', DBLSIZE); // "/"
lcd_putsnAtt( 8*FW, 5*FH, &rbuf[1][2], 2, APSIZE); // month
lcdDrawTextWithLen( 8*FW, 5*FH, &rbuf[1][2], 2, APSIZE); // month
lcdDrawChar (12*FW, 5*FH, '/', DBLSIZE); // "/"
lcd_putsnAtt(14*FW, 5*FH, &rbuf[1][4], 2, APSIZE); // day
lcdDrawTextWithLen(14*FW, 5*FH, &rbuf[1][4], 2, APSIZE); // day
}
else
lcd_putsAtt ( 2*FW, 5*FH, val_unknown, APSIZE); // "?"
lcdDrawText ( 2*FW, 5*FH, val_unknown, APSIZE); // "?"
}
}
@@ -651,8 +651,8 @@ void menuTelemetryNMEA2(uint8_t event)
}
}
else {
lcd_putsAtt ( 2*FW, 2*FH, val_unknown, APSIZE);
lcd_putsAtt ( 2*FW, 5*FH, val_unknown, APSIZE);
lcdDrawText ( 2*FW, 2*FH, val_unknown, APSIZE);
lcdDrawText ( 2*FW, 5*FH, val_unknown, APSIZE);
}
}
@@ -694,15 +694,15 @@ void menuTelemetryNMEA3(uint8_t event)
}
i++;
}
lcd_putsAtt ( 2*FW, 2*FH, VALSTR(0), APSIZE); // speed over ground
lcdDrawText ( 2*FW, 2*FH, VALSTR(0), APSIZE); // speed over ground
}
else
lcd_putsAtt ( 2*FW, 2*FH, val_unknown, APSIZE);
lcdDrawText ( 2*FW, 2*FH, val_unknown, APSIZE);
lcdDrawChar ( 19*FW, 1*FH, sbuf[2], 0); // satellites in view
lcd_puts ( 1*FW, 4*FH, PSTR("Course over ground") );
lcd_putsAtt ( 2*FW, 5*FH, VALSTR(1), APSIZE); // course over ground
lcdDrawText ( 2*FW, 5*FH, VALSTR(1), APSIZE); // course over ground
}
@@ -741,29 +741,29 @@ 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
lcd_putsnAtt ( 1*FW, 2*FH, rbuf[0], 2, APSIZE);
lcdDrawTextWithLen ( 1*FW, 2*FH, rbuf[0], 2, APSIZE);
lcdDrawChar ( 5*FW, 2*FH, '@',0);
lcd_putsAtt ( 6*FW, 2*FH, &rbuf[0][2], APSIZE); // minutes with small decimal point
lcdDrawText ( 6*FW, 2*FH, &rbuf[0][2], APSIZE); // minutes with small decimal point
}
else
lcd_putsAtt ( 2*FW, 2*FH, val_unknown, APSIZE);
lcdDrawText ( 2*FW, 2*FH, val_unknown, APSIZE);
lcd_puts ( 3*FW, 4*FH, PSTR("Longitude")); // line 4 column 5
// second buffer into line 5 column 2
if (rbuf[0][0])
{
lcdDrawChar ( 13*FW, 4*FH, sbuf[1], 0); // E or W
lcd_putsnAtt ( 0*FW, 5*FH, rbuf[1], 3, APSIZE);
lcdDrawTextWithLen ( 0*FW, 5*FH, rbuf[1], 3, APSIZE);
lcdDrawChar ( 6*FW, 5*FH, '@',0);
lcd_putsAtt ( 7*FW, 5*FH, &rbuf[1][3], APSIZE); // minutes with small decimal point
lcdDrawText ( 7*FW, 5*FH, &rbuf[1][3], APSIZE); // minutes with small decimal point
}
else
lcd_putsAtt ( 2*FW, 5*FH, val_unknown, APSIZE);
lcdDrawText ( 2*FW, 5*FH, val_unknown, APSIZE);
}
void title(char x)
{
lcd_putsAtt (0*FW, 0*FH, PSTR(" GPS NMEA data ?/4 "), INVERS);
lcdDrawText (0*FW, 0*FH, PSTR(" GPS NMEA data ?/4 "), INVERS);
lcdDrawChar(16*FW, 0*FH, x, INVERS);
}