Subversion Repositories Projects

Compare Revisions

Regard whitespace Rev 335 → Rev 336

/C-OSD/trunk/CHANGE.LOG
18,6 → 18,10
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
****************************************************************************/
 
20090405-0207
+NOOSD as requested
*height now corrected (thx lephisto) and displayed as .x up to 10m
 
20090402-0106
+ disabling the txd pin while not using it so it won't interfere with KopterTool usage (thx joko)
+ if no data has been received for over 2sec we re-request it
/C-OSD/trunk/main.c
515,7 → 515,7
 
while (1) {
// write icons at init or after menu/mode-switch
if (!(COSD_FLAGS & COSD_ICONS_WRITTEN)) {
if (!(COSD_FLAGS & COSD_ICONS_WRITTEN) && !(COSD_FLAGS & COSD_FLAG_NOOSD)) {
write_char_xy(5, top_line, 203); // km/h
write_char_xy(10, top_line, 202); // RC-transmitter
write_char_xy(16, top_line, 208); // degree symbol
528,6 → 528,7
COSD_FLAGS |= COSD_ICONS_WRITTEN;
}
if (rxd_buffer_locked) {
if (!(COSD_FLAGS & COSD_FLAG_NOOSD)) {
if (rxd_buffer[2] == 'D') { // FC Data
/*Decode64();
debugData = *((DebugOut_t*) pRxData);
574,7 → 575,14
 
// TODO: is this really dm?
//note:lephisto:according to several sources it's /30
//write_number_s(22, top_line, naviData.Altimeter/30);
if (naviData.Altimeter > 300) {
// above 10m only write full meters
write_number_s(22, top_line, naviData.Altimeter/30);
} else {
// up to 10m write meters.dm
write_number_u_10th(21, top_line, naviData.Altimeter/3);
}
 
// seccond line
draw_compass(11, top_line + 1, naviData.CompassHeading);
599,7 → 607,7
} else {
// stats
write_ascii_string(2, 5, "max Altitude:");
write_number_s(17, 5, max_Altimeter/10);
write_number_s(17, 5, max_Altimeter/30);
write_char_xy(22, 5, 204); // small meters m
write_ascii_string(2, 6, "max Speed :");
write_3digit_number_u(19, 6, (uint16_t)(((uint32_t)max_GroundSpeed*36)/1000));
652,6 → 660,7
if (naviData.FlyingTime > max_FlyingTime) max_FlyingTime = naviData.FlyingTime;
old_MKFlags = naviData.MKFlags;
} // (!(COSD_FLAGS & COSD_FLAG_NOOSD))
}
seconds_since_last_data = 0;
rxd_buffer_locked = 0;