/C-OSD/trunk/CHANGE.LOG |
---|
18,6 → 18,10 |
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * |
****************************************************************************/ |
20090519-0115 |
+mah currently wasted |
*some small changes |
20090517-2345 |
*modded the real alpha stuff i have been talking about below |
/C-OSD/trunk/main.c |
---|
150,9 → 150,10 |
volatile size_t icnt = 0; |
volatile unsigned char * iptr; |
volatile unsigned char spi_cmd_buffer[5]; |
volatile unsigned char spi_cmd_buffer[8]; |
volatile uint8_t spi_ready = 1; |
int16_t ampere = 0, max_ampere = 0; |
int32_t ampere_wasted = 0; |
/** |
* SPI interrupt handler |
554,6 → 555,15 |
if (spi_cmd_buffer[0] == 'd') { |
ampere = spi_cmd_buffer[1] << 8; |
ampere |= spi_cmd_buffer[2]; |
ampere_wasted = spi_cmd_buffer[3]; |
ampere_wasted = ampere_wasted << 8; |
ampere_wasted |= spi_cmd_buffer[4]; |
ampere_wasted = ampere_wasted << 8; |
ampere_wasted |= spi_cmd_buffer[5]; |
ampere_wasted = ampere_wasted << 8; |
ampere_wasted |= spi_cmd_buffer[6]; |
//ampere = *((int16_t *) spi_cmd_buffer + 1); |
//ampere_wasted = *((int32_t *) &spi_cmd_buffer + 3); |
// if this is the first receival we should print the small A |
if (!(COSD_FLAGS2 & COSD_FLAG_STROMREC)) { |
COSD_FLAGS &= ~COSD_ICONS_WRITTEN; |
569,7 → 579,11 |
spi_cmd_buffer[0] = 'A'; |
spi_cmd_buffer[1] = 'B'; |
spi_cmd_buffer[2] = 'C'; |
StartTransfer((unsigned char*) spi_cmd_buffer, 3); |
spi_cmd_buffer[3] = 'D'; |
spi_cmd_buffer[4] = 'E'; |
spi_cmd_buffer[5] = 'F'; |
spi_cmd_buffer[6] = 'G'; |
StartTransfer((unsigned char*) spi_cmd_buffer, 7); |
} |
if (rxd_buffer_locked) { |
if (COSD_FLAGS & COSD_FLAG_HUD) { |
/C-OSD/trunk/osd_fcmode_default.c |
---|
23,6 → 23,10 |
write_char_xy(10, top_line, 0xCA); // RC-transmitter |
write_char_xy(27, top_line, 0xCC); // small meters m height |
write_char_xy(7, bottom_line, 0x9E); // small v |
if (COSD_FLAGS2 & COSD_FLAG_STROMREC) { |
write_char_xy(7, bottom_line - 1, 0x9F); // small A |
write_char_xy(14, bottom_line - 1, 0xB5); // mah |
} |
COSD_FLAGS |= COSD_ICONS_WRITTEN; |
} |
50,6 → 54,12 |
draw_artificial_horizon(top_line + 2, bottom_line - 1, debugData.Analog[0], debugData.Analog[1]); |
} |
// pre-bottom line |
if (COSD_FLAGS2 & COSD_FLAG_STROMREC) { |
//write_ndigit_number_s(3, bottom_line - 1, ampere, 1000, 0); |
write_ndigit_number_u_10th(3, bottom_line - 1, ampere / 10, 100, 0); |
} |
draw_battery(2, bottom_line, min_voltage, debugData.Analog[9], max_voltage); |
write_ndigit_number_u_10th(3, bottom_line, debugData.Analog[9], 100, 0); |
if (debugData.Analog[9] <= min_voltage && last_UBat > min_voltage) { |
/C-OSD/trunk/osd_ncmode_default.c |
---|
30,6 → 30,7 |
write_char_xy(7, bottom_line, 0x9E); // small V |
if (COSD_FLAGS2 & COSD_FLAG_STROMREC) { |
write_char_xy(7, bottom_line - 1, 0x9F); // small A |
write_char_xy(14, bottom_line - 1, 0xB5); // mah |
} |
write_char_xy(14, bottom_line, 0xD1); // on clock |
write_char_xy(21, bottom_line, 0xD2); // fly clock |
99,7 → 100,7 |
} else { |
// stats |
if ((COSD_FLAGS & COSD_WASFLYING) && (COSD_FLAGS & COSD_FLAG_STATS)) { |
uint8_t line = 4; |
uint8_t line = 3; |
write_ascii_string_pgm(2, line, stats_item_pointers[0]); // max Altitude |
write_ndigit_number_s(18, line, max_Altimeter / 30, 1000, 0); |
write_char_xy(22, line, 204); // small meters m |
115,7 → 116,6 |
if (COSD_FLAGS2 & COSD_FLAG_STROMREC) { |
write_ascii_string_pgm(2, ++line, stats_item_pointers[7]); // ampere |
write_ndigit_number_u_10th(18, line, max_ampere / 10, 100, 0); |
write_char_xy(22, line, 0x9F); // small v |
} |
write_ascii_string_pgm(2, ++line, stats_item_pointers[4]); // max time |
write_time(16, line, max_FlyingTime); |
136,6 → 136,7 |
if (COSD_FLAGS2 & COSD_FLAG_STROMREC) { |
//write_ndigit_number_s(3, bottom_line - 1, ampere, 1000, 0); |
write_ndigit_number_u_10th(3, bottom_line - 1, ampere / 10, 100, 0); |
write_ndigit_number_s(10, bottom_line - 1, ampere_wasted, 1000, 0); |
} |
// bottom line |