Subversion Repositories Projects

Compare Revisions

Regard whitespace Rev 1281 → Rev 1197

/C-OSD/trunk/osd_helpers.c
101,26 → 101,7
//write_ndigit_number_u(x, y-1, percent * 13 / 100, 100, 0);
}
 
 
 
/* ##########################################################################
* draw logo
* ##########################################################################*/
 
/**
* draw the logo at <x>/<y>
*/
void draw_logo(uint8_t x, uint8_t y) {
uint8_t chr = 0x50;
 
for (uint8_t yy = y; yy < y + 2; yy++) {
for (uint8_t xx = x; xx < x + 8; xx++) {
write_char_xy(xx, yy, chr++);
}
}
}
 
/* ##########################################################################
* variometer
* ##########################################################################*/
 
331,53 → 312,51
#if FCONLY
#else
uint8_t line = 3;
write_ascii_string_pgm(1, line, PSTR("max Alt :")); // max Altitude
write_ascii_string_pgm(1, ++line, PSTR("max Spd :")); // max Speed
write_ascii_string_pgm(1, ++line, PSTR("max Dist:")); // max Distance
write_ascii_string_pgm(1, line, PSTR("max Altitude:")); // max Altitude
write_ascii_string_pgm(1, ++line, PSTR("max Speed :")); // max Speed
write_ascii_string_pgm(1, ++line, PSTR("max Distance:")); // max Distance
 
draw_logo(19, 4);
 
if (COSD_FLAGS_CONFIG & COSD_FLAG_FEET) {
write_ndigit_number_s(13, line - 2, max_Altimeter * 32 / 10, 4, 0);
write_char_xy(17, line - 2, 0x7E); // small feet ft
write_ndigit_number_u(14, line - 1, (uint16_t)(((uint32_t)max_GroundSpeed * (uint32_t)279) / (uint32_t)12500), 3, 0);
write_char_xy(17, line - 1, 0x7D); // mp/h
write_ndigit_number_u(13, line - 0, max_Distance / 10 * 32 / 10, 4, 0);
write_char_xy(17, line - 0, 0x7E); // small feet ft
write_ndigit_number_s(16, line - 2, max_Altimeter * 32 / 10, 4, 0);
write_char_xy(20, line - 2, 0x7E); // small feet ft
write_ndigit_number_u(17, line - 1, (uint16_t)(((uint32_t)max_GroundSpeed * (uint32_t)279) / (uint32_t)12500), 3, 0);
write_char_xy(20, line - 1, 0x7D); // mp/h
write_ndigit_number_u(16, line - 0, max_Distance / 10 * 32 / 10, 4, 0);
write_char_xy(20, line - 0, 0x7E); // small feet ft
} else {
write_ndigit_number_s(13, line - 2, max_Altimeter, 4, 0);
write_char_xy(17, line - 2, 204); // small meters m
write_ndigit_number_u(14, line - 1, (uint16_t)(((uint32_t)max_GroundSpeed * (uint32_t)9) / (uint32_t)250), 3, 0);
write_char_xy(17, line - 1, 203); // km/h
write_ndigit_number_u(13, line - 0, max_Distance / 10, 4, 0);
write_char_xy(17, line - 0, 204); // small meters m
write_ndigit_number_s(16, line - 2, max_Altimeter, 4, 0);
write_char_xy(20, line - 2, 204); // small meters m
write_ndigit_number_u(17, line - 1, (uint16_t)(((uint32_t)max_GroundSpeed * (uint32_t)9) / (uint32_t)250), 3, 0);
write_char_xy(20, line - 1, 203); // km/h
write_ndigit_number_u(16, line - 0, max_Distance / 10, 4, 0);
write_char_xy(20, line - 0, 204); // small meters m
}
 
write_ascii_string_pgm(1, ++line, PSTR("min Volt:")); // min voltage
write_ndigit_number_u_10th(13, line, min_UBat, 3, 0);
write_char_xy(17, line, 0x9E); // small V
write_ascii_string_pgm(1, ++line, PSTR("min Voltage :")); // min voltage
write_ndigit_number_u_10th(16, line, min_UBat, 3, 0);
write_char_xy(20, line, 0x9E); // small V
if ((COSD_FLAGS_RUNTIME & COSD_FLAG_STROMREC) || (COSD_FLAGS_MODES & COSD_FLAG_FCCURRENT)) {
write_ascii_string_pgm(1, ++line, PSTR("max curr:")); // ampere
write_ascii_string_pgm(1, ++line, PSTR("max current :")); // ampere
write_ndigit_number_u_10th(16, line, max_ampere / 10, 3, 0);
write_char_xy(17, line, 0x9F); // small A
write_char_xy(20, line, 0x9F); // small A
 
// wasted mampere in this flight (will count up after landing)
if ((COSD_FLAGS_RUNTIME & COSD_FLAG_STROMREC) && !(COSD_FLAGS_MODES & COSD_FLAG_FCCURRENT)) {
write_ndigit_number_u(18, line, (ampere_wasted / 10) - wasted_ampere_offset, 5, 0);
write_ndigit_number_u(21, line, (ampere_wasted / 10) - wasted_ampere_offset, 5, 0);
} else if (COSD_FLAGS_MODES & COSD_FLAG_FCCURRENT) {
 
write_ndigit_number_u(18, line, naviData.UsedCapacity - wasted_ampere_offset, 5, 0);
write_ndigit_number_u(21, line, naviData.UsedCapacity - wasted_ampere_offset, 5, 0);
}
 
write_char_xy(23, line, 0xB5); // mah
write_char_xy(26, line, 0xB5); // mah
}
write_ascii_string_pgm(1, ++line, PSTR("max Time:")); // max time
write_time(11, line, max_FlyingTime);
write_char_xy(17, line, 210); // fly clock
write_ascii_string_pgm(1, ++line, PSTR("long :")); // longitude
write_gps_pos(11, line, naviData.CurrentPosition.Longitude);
write_ascii_string_pgm(1, ++line, PSTR("lat :")); // latitude
write_gps_pos(11, line, naviData.CurrentPosition.Latitude);
write_time(14, line, max_FlyingTime);
write_char_xy(20, line, 210); // fly clock
write_ascii_string_pgm(1, ++line, PSTR("longitude :")); // longitude
write_gps_pos(14, line, naviData.CurrentPosition.Longitude);
write_ascii_string_pgm(1, ++line, PSTR("latitude:")); // latitude
write_gps_pos(14, line, naviData.CurrentPosition.Latitude);
#endif
}