Subversion Repositories Projects

Compare Revisions

Regard whitespace Rev 2601 → Rev 2600

/C-OSD/trunk/mk-data-structs.h
1,5 → 1,5
/****************************************************************************
* Copyright (C) 2009-2018 by Claas Anders "CaScAdE" Rathje *
* Copyright (C) 2009-2017 by Claas Anders "CaScAdE" Rathje *
* admiralcascade@gmail.com *
* Project-URL: http://www.mylifesucks.de/oss/c-osd/ *
* *
85,7 → 85,7
/*
* NaviCtrl OSD Structs
* portions taken and adapted from
* http://svn.mikrokopter.de/filedetails.php?repname=NaviCtrl&path=/tags/V2.20h/uart1.h
* http://svn.mikrokopter.de/filedetails.php?repname=NaviCtrl&path=/tags/V2.18a/uart1.h
*/
typedef struct {
u16 Distance; // distance to target in dm
134,7 → 134,6
u8 reserve1; // to fit into 84 bytes (must be divisible by 3)
u8 reserve2; // to fit into 84 bytes (must be divisible by 3)
} __attribute__((packed)) NaviData_t;
extern NaviData_t NaviData;
 
/*
* NaviCtrl & FCFlags Flags
201,12 → 200,12
/*
* MikroKopter config struct
* portions taken and adapted from
* http://svn.mikrokopter.de/filedetails.php?repname=FlightCtrl&path=/tags/V2.20c/eeprom.h
* http://svn.mikrokopter.de/filedetails.php?repname=FlightCtrl&path=/tags/V2.16a/eeprom.h
*/
 
#define EEPARAM_REVISION 113 // -> InsertDefaultParameters()
#define EEPARAM_REVISION 110 // !!!Update NC also!!! is count up, if paramater stucture has changed (compatibility)
#define EEMIXER_REVISION 1 // is count up, if mixer stucture has changed (compatibility)
#define EE_BACKWARD_COMP 1 // count up if the eepropm parameters are not backwards compatible
#define EE_BACKWARD_COMP 1 // change if the eepropm parameters are not backwards compatible
 
 
 
334,11 → 333,7
unsigned char MenuKeyChannel;
unsigned char CamCtrlModeChannel;
unsigned char CamCtrlZoomChannel;
unsigned char FailsSafeAltitude;
unsigned char GimbalYawChannel;
unsigned char GimbalOut1Channel;
unsigned char GimbalOut2Channel;
unsigned char reserved[28]; // for later use
unsigned char reserved[32]; // for later use
//------------------------------------------------
unsigned char BitConfig; // (war Loop-Cfg) Bitcodiert: 0x01=oben, 0x02=unten, 0x04=links, 0x08=rechts / wird getrennt behandelt
unsigned char ServoCompInvert; // // 0x01 = Nick, 0x02 = Roll, 0x04 = relative moving // WICHTIG!!! am Ende lassen