/C-OSD/trunk/CHANGE.LOG |
---|
18,6 → 18,11 |
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * |
****************************************************************************/ |
20110331-1200 |
*small adaption to NC 0.24b and FC 0.84a |
*added CF-indicator icon |
@To see the correct CF-indicator you will have to flash the characters! |
20110307-1845 |
*added debug output option for MAX7456 emulation |
*moved horizon one line higher when displaying GPS-Coordinates |
/C-OSD/trunk/c-osd.mcm |
---|
9152,69 → 9152,69 |
01010101 |
01010101 |
01010101 |
10101010 |
01010101 |
01010101 |
10000010 |
01010101 |
01010101 |
10000010 |
01010101 |
01010101 |
10000010 |
01010101 |
01010101 |
01010101 |
01010101 |
10101010 |
10000010 |
10101010 |
10000000 |
00000000 |
00000010 |
10001010 |
10101010 |
10100010 |
10001000 |
00101000 |
00100010 |
10001010 |
10000010 |
10100010 |
10001000 |
10101010 |
00100010 |
10001010 |
00000000 |
10100010 |
10000000 |
00000000 |
00000010 |
10101010 |
10101010 |
10101010 |
01100000 |
00101000 |
00001001 |
01100010 |
10101000 |
10101001 |
01100010 |
10101000 |
00100101 |
01100000 |
00101000 |
10100101 |
01101010 |
10101010 |
10010101 |
01010101 |
01010101 |
01100101 |
01010101 |
01010101 |
10010101 |
01010101 |
01010110 |
01010101 |
01010101 |
01101001 |
01010101 |
01010110 |
10010101 |
01010101 |
01011001 |
01010101 |
01010101 |
01011001 |
01010101 |
01010101 |
01010110 |
10010101 |
01010101 |
01010101 |
01101001 |
01010101 |
01010101 |
01010110 |
10010101 |
01010101 |
01010101 |
01100101 |
01010101 |
01010101 |
01011001 |
01010101 |
01010101 |
01011001 |
01010101 |
01010101 |
01010101 |
01010101 |
01010101 |
01010101 |
01010101 |
01010101 |
01010101 |
01010101 |
01010101 |
01010101 |
01010101 |
01010100 |
00000000 |
00010101 |
/C-OSD/trunk/characters.c |
---|
33,7 → 33,7 |
*/ |
// chars 0 - 255 with 54 byte per char |
// orginal filename: c-osd.mcm |
// Wed, 02 Feb 2011 12:29:26 +0100 |
// Thu, 31 Mar 2011 11:55:52 +0200 |
3326,27 → 3326,27 |
const char chr142[] PROGMEM = {0x55,0x56,0x55,0x55,0x58,0x95,0x55,0x58,0x95,0x55,0xa8,0x95,0x56,0x00,0x95,0x58,0xa8,0x95,0x58,0x98,0x95,0x58,0xa8,0x95,0x56,0x00,0x95,0x55,0xaa,0x55,0x65,0x55,0x59,0x89,0x55,0x62,0x89,0x14,0x62,0x88,0x82,0x22,0x82,0xaa,0x82,0x88,0x82,0x22,0x89,0x14,0x62,0x65,0x55,0x59}; |
// 0 ------------ |
// 1 ------------ |
// 2 ------------ |
// 3 -------- --- |
// 4 --------- -- |
// 5 -------- --- |
// 6 ------- ---- |
// 7 ----- ----- |
// 8 --- ------- |
// 9 -- --------- |
// 10 -- --------- |
// 11 --- ------- |
// 12 ----- ----- |
// 13 ------- --- |
// 14 --------- -- |
// 15 ---------- - |
// 16 ---------- - |
// 17 ------------ |
// 0 ---- ---- |
// 1 ---- ## ---- |
// 2 ---- ## ---- |
// 3 ---- ## ---- |
// 4 ## |
// 5 ########## |
// 6 # # |
// 7 # ## ## # |
// 8 # ## # |
// 9 # # # # |
// 10 # #### # |
// 11 ########## |
// 12 |
// 13 - ### ### - |
// 14 - # # - |
// 15 - # ## -- |
// 16 - ### # -- |
// 17 - --- |
// 000000000011 |
// 012345678901 |
const char chr143[] PROGMEM = {0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x95,0x55,0x55,0x65,0x55,0x55,0x95,0x55,0x56,0x55,0x55,0x69,0x55,0x56,0x95,0x55,0x59,0x55,0x55,0x59,0x55,0x55,0x56,0x95,0x55,0x55,0x69,0x55,0x55,0x56,0x95,0x55,0x55,0x65,0x55,0x55,0x59,0x55,0x55,0x59,0x55,0x55,0x55}; |
const char chr143[] PROGMEM = {0x55, 0xaa, 0x55, 0x55, 0x82, 0x55, 0x55, 0x82, 0x55, 0x55, 0x82, 0x55, 0xaa, 0x82, 0xaa, 0x80, 0x00, 0x02, 0x8a, 0xaa, 0xa2, 0x88, 0x28, 0x22, 0x8a, 0x82, 0xa2, 0x88, 0xaa, 0x22, 0x8a, 0x00, 0xa2, 0x80, 0x00, 0x02, 0xaa, 0xaa, 0xaa, 0x60, 0x28, 0x09, 0x62, 0xa8, 0xa9, 0x62, 0xa8, 0x25, 0x60, 0x28, 0xa5, 0x6a, 0xaa, 0x95}; |
// 0 ---######--- |
/C-OSD/trunk/default/dist.bat |
---|
19,7 → 19,7 |
:: * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * |
:: ****************************************************************************/ |
set DATE=20110202-1323 |
set DATE=20110331-1200 |
:: date /T |
/C-OSD/trunk/mk-data-structs.h |
---|
83,7 → 83,7 |
/* |
* NaviCtrl OSD Structs |
* portions taken and adapted from |
* http://svn.mikrokopter.de/filedetails.php?repname=NaviCtrl&path=/tags/V0.22a/uart1.h |
* http://svn.mikrokopter.de/filedetails.php?repname=NaviCtrl&path=/tags/V0.24b/uart1.h |
*/ |
typedef struct { |
u16 Distance; // distance to target in dm |
116,7 → 116,7 |
u8 OperatingRadius; // current operation radius around the Home Position in m |
s16 TopSpeed; // velocity in vertical direction in cm/s |
u8 TargetHoldTime; // time in s to stay at the given target, counts down to 0 if target has been reached |
u8 RC_RSSI; // Receiver signal strength (since version 2 added) |
u8 FCStatusFlags2; // StatusFlags2 (since version 5 added) |
s16 SetpointAltitude; // setpoint for altitude |
u8 Gas; // for future use |
u16 Current; // actual current in 0.1A steps |
146,6 → 146,10 |
#define FCFLAG_VARIO_TRIM_UP 0x40 |
#define FCFLAG_VARIO_TRIM_DOWN 0x80 |
// FC STATUS FLAGS2 |
#define FC_STATUS2_CAREFREE 0x01 |
#define FC_STATUS2_ALTITUDE_CONTROL 0x02 |
#define DEFEKT_G_NICK 0x01 |
#define DEFEKT_G_ROLL 0x02 |
#define DEFEKT_G_GIER 0x04 |
/C-OSD/trunk/osd_ncmode_default.c |
---|
26,8 → 26,6 |
#if (!(ALLCHARSDEBUG || (WRITECHARS != -1)) && !FCONLY) |
int osd_ncmode_default() { |
uint8_t rc_signal = naviData.RC_RSSI ? naviData.RC_RSSI : naviData.RC_Quality; // if RSSI is present use it, else use Qality |
if (COSD_FLAGS_MODES & COSD_FLAG_HUD) { |
// write icons at init or after menu/mode-switch |
if (!(COSD_FLAGS_RUNTIME & COSD_ICONS_WRITTEN)) { |
41,13 → 39,11 |
write_char_xy(27, top_line, 0xCC); // small meters m height |
} |
write_char_xy(10, top_line, 0xCA); // RC-transmitter |
write_char_xy(16, top_line, 0xD0); // degree symbol |
write_char_xy(20, top_line + 1, 0xB0); // left circle |
write_char_xy(22, top_line + 1, 0xB2); // right circle |
write_char_xy(7, bottom_line, 0x9E); // small V |
if ((COSD_FLAGS_RUNTIME & COSD_FLAG_STROMREC) || (COSD_FLAGS_MODES & COSD_FLAG_FCCURRENT)) { |
write_char_xy(7, bottom_line - 1, 0x9F); // small A |
79,16 → 75,22 |
} |
} |
write_ndigit_number_u(7, top_line, rc_signal, 3, 0); |
if (rc_signal <= RCLVL_WRN && last_RC_Quality > RCLVL_WRN) { |
write_ndigit_number_u(7, top_line, naviData.RC_Quality, 3, 0); |
if (naviData.RC_Quality <= RCLVL_WRN && last_RC_Quality > RCLVL_WRN) { |
for (uint8_t x = 0; x < 4; x++) |
write_char_att_xy(7 + x, top_line, BLINK); |
} else if (rc_signal > RCLVL_WRN && last_RC_Quality <= RCLVL_WRN) { |
} else if (naviData.RC_Quality > RCLVL_WRN && last_RC_Quality <= RCLVL_WRN) { |
for (uint8_t x = 0; x < 4; x++) |
write_char_att_xy(7 + x, top_line, 0); |
} |
if (naviData.FCStatusFlags2 & FC_STATUS2_CAREFREE) { |
write_char_xy(10, top_line, 0x8F); // smiling CF transmitter |
} else { |
write_char_xy(10, top_line, 0xCA); // RC-transmitter |
} |
if (naviData.NCFlags & NC_FLAG_NOSERIALLINK) { |
write_char_xy(11, top_line, 0); // clear |
} else { |
303,7 → 305,7 |
} |
// remember last values |
last_RC_Quality = rc_signal; |
last_RC_Quality = naviData.RC_Quality; |
last_UBat = naviData.UBat; |
old_MKFlags = naviData.FCFlags; |
old_NCFlags = naviData.NCFlags; |