Subversion Repositories Projects

Compare Revisions

Ignore whitespace Rev 829 → Rev 832

/C-OSD/trunk/CHANGE.LOG
18,6 → 18,9
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
****************************************************************************/
 
20101115-0800
*updated structs and flags to fit FC 0.80a && NC 0.20a
*sat-icon will blink when not enough sats are found (nc_mode_default)
 
20101008-0945
*fixed EPi-Strom voltage-display when using FC-Ampere
/C-OSD/trunk/main.h
191,6 → 191,7
 
// flags from last round to check for changes
uint8_t old_MKFlags;
uint8_t old_NCFlags;
 
const char *directions[8];
const char *stats_item_pointers[8];
/C-OSD/trunk/mk-data-structs.h
31,6 → 31,19
#define u32 uint32_t
#define s32 int32_t
 
/**
* MikroKopter Slave-Addresses
* portions taken and adapted from
* http://svn.mikrokopter.de/filedetails.php?repname=NaviCtrl&path=/tags/V0.22a/mkprotocol.h
*/
#define ANY_ADDRESS 0
#define FC_ADDRESS 1
#define NC_ADDRESS 2
#define MK3MAG_ADDRESS 3
#define MKOSD_ADDRESS 4
#define BL_ADDRESS 5
 
 
/*
* FC Debug Struct
* portions taken and adapted from
70,7 → 83,7
/*
* NaviCtrl OSD Structs
* portions taken and adapted from
* http://svn.mikrokopter.de/filedetails.php?repname=NaviCtrl&path=/tags/V0.20c/uart1.h
* http://svn.mikrokopter.de/filedetails.php?repname=NaviCtrl&path=/tags/V0.22a/uart1.h
*/
typedef struct {
u16 Distance; // distance to target in dm
117,7 → 130,7
#define NC_FLAG_NOSERIALLINK 0x10
#define NC_FLAG_TARGET_REACHED 0x20
#define NC_FLAG_MANUAL_CONTROL 0x40
#define NC_FLAG_8 0x80
#define NC_FLAG_GPS_OK 0x80
 
/*
* MikroKopter Flags
130,8 → 143,8
#define FCFLAG_START 0x08
#define FCFLAG_NOTLANDUNG 0x10
#define FCFLAG_LOWBAT 0x20
#define FCFLAG_SPI_RX_ERR 0x40
#define FCFLAG_I2CERR 0x80
#define FCFLAG_VARIO_TRIM_UP 0x40
#define FCFLAG_VARIO_TRIM_DOWN 0x80
 
#define DEFEKT_G_NICK 0x01
#define DEFEKT_G_ROLL 0x02
200,6 → 213,8
unsigned char ServoRollMax; // Wert : 0-250
//---
unsigned char ServoNickRefresh; // Speed of the Servo
unsigned char ServoManualControlSpeed;//
unsigned char CamOrientation; //
unsigned char Servo3; // Value or mapping of the Servo Output
unsigned char Servo4; // Value or mapping of the Servo Output
unsigned char Servo5; // Value or mapping of the Servo Output
/C-OSD/trunk/osd_ncmode_default.c
270,6 → 270,13
write_time(15, bottom_line, naviData.FlyingTime);
 
write_ndigit_number_u(24, bottom_line, naviData.SatsInUse, 2, 0);
if (!(naviData.NCFlags & NC_FLAG_GPS_OK) && (old_NCFlags & NC_FLAG_GPS_OK)) {
for (uint8_t x = 24; x < 28; x++)
write_char_att_xy(x, bottom_line, BLINK);
} else if ((naviData.NCFlags & NC_FLAG_GPS_OK) && !(old_NCFlags & NC_FLAG_GPS_OK)) {
for (uint8_t x = 24; x < 28; x++)
write_char_att_xy(x, bottom_line, 0);
}
 
if (naviData.NCFlags & NC_FLAG_MANUAL_CONTROL) {
write_char_xy(23, bottom_line, 0xB3); // rc transmitter
313,6 → 320,7
last_RC_Quality = rc_signal;
last_UBat = naviData.UBat;
old_MKFlags = naviData.FCFlags;
old_NCFlags = naviData.NCFlags;
seconds_since_last_data = 0;
 
return 0;