Subversion Repositories Projects

Compare Revisions

Regard whitespace Rev 411 → Rev 412

/C-OSD/trunk/main.c
70,8 → 70,10
char stats_item_2[] PROGMEM = "max Distance:";
char stats_item_3[] PROGMEM = "min voltage :";
char stats_item_4[] PROGMEM = "max time :";
char stats_item_5[] PROGMEM = "longitude :";
char stats_item_6[] PROGMEM = "latitude :";
char* stats_item_pointers[] PROGMEM = {stats_item_0, stats_item_1, stats_item_2,
stats_item_3, stats_item_4};
stats_item_3, stats_item_4, stats_item_5, stats_item_6};
 
// store more fixed strings in progmen
char ON[] PROGMEM = "ON ";
512,21 → 514,25
} else {
// stats
if ((COSD_FLAGS & COSD_WASFLYING) && (COSD_FLAGS & COSD_FLAG_STATS)) {
write_ascii_string_pgm(2, 5, stats_item_pointers[0]); // max Altitude
write_ndigit_number_s(18, 5, max_Altimeter / 30, 1000, 0);
write_char_xy(22, 5, 204); // small meters m
write_ascii_string_pgm(2, 6, stats_item_pointers[1]); // max Speed
write_ndigit_number_u(19, 6, (uint16_t) (((uint32_t) max_GroundSpeed * (uint32_t)9) / (uint32_t)250), 100, 0);
write_char_xy(22, 6, 203); // km/h
write_ascii_string_pgm(2, 7, stats_item_pointers[2]); // max Distance
write_ndigit_number_u(19, 7, max_Distance / 10, 100, 0);
write_char_xy(22, 7, 204); // small meters m
write_ascii_string_pgm(2, 8, stats_item_pointers[3]); // min voltage
write_ndigit_number_u_10th(18, 8, min_UBat, 100, 0);
write_char_xy(22, 8, 0x9E); // small v
write_ascii_string_pgm(2, 9, stats_item_pointers[4]); // max time
write_time(16, 9, max_FlyingTime);
write_char_xy(22, 9, 210); // fly clock
write_ascii_string_pgm(2, 4, stats_item_pointers[0]); // max Altitude
write_ndigit_number_s(18, 4, max_Altimeter / 30, 1000, 0);
write_char_xy(22, 4, 204); // small meters m
write_ascii_string_pgm(2, 5, stats_item_pointers[1]); // max Speed
write_ndigit_number_u(19, 5, (uint16_t) (((uint32_t) max_GroundSpeed * (uint32_t)9) / (uint32_t)250), 100, 0);
write_char_xy(22, 5, 203); // km/h
write_ascii_string_pgm(2, 6, stats_item_pointers[2]); // max Distance
write_ndigit_number_u(19, 6, max_Distance / 10, 100, 0);
write_char_xy(22, 6, 204); // small meters m
write_ascii_string_pgm(2, 7, stats_item_pointers[3]); // min voltage
write_ndigit_number_u_10th(18, 7, min_UBat, 100, 0);
write_char_xy(22, 7, 0x9E); // small v
write_ascii_string_pgm(2, 8, stats_item_pointers[4]); // max time
write_time(16, 8, max_FlyingTime);
write_char_xy(22, 8, 210); // fly clock
write_ascii_string_pgm(2, 9, stats_item_pointers[5]); // longitude
write_gps_pos(15, 9, naviData.CurrentPosition.Longitude);
write_ascii_string_pgm(2, 10, stats_item_pointers[6]); // latitude
write_gps_pos(15, 10, naviData.CurrentPosition.Latitude);
} else if (COSD_FLAGS & COSD_FLAG_ARTHORIZON) { // if no stats there is space horizon
draw_artificial_horizon(top_line + 2, bottom_line - 1, naviData.AngleNick, naviData.AngleRoll);
}