WebSVN - Projects - Diff - Rev 1866 and 1992 - /C-OSD/trunk/mk-data-structs.h

 #define NC_ADDRESS 2
 #define MK3MAG_ADDRESS 3
 #define MKOSD_ADDRESS 4
 #define BL_ADDRESS 5
 /*
  * FC Debug Struct
  * portions taken and adapted from
  * http://svn.mikrokopter.de/filedetails.php?repname=FlightCtrl&path=/tags/V0.88e/uart.h
  */
-typedef struct  {
+typedef struct {
-        unsigned char Status[2];
+    unsigned char Status[2];
-        signed int Analog[32];    // Debugwerte
+    signed int Analog[32]; // Debugwerte
 } __attribute__((packed)) str_DebugOut;
 typedef struct {
-        unsigned char SWMajor;
+    unsigned char SWMajor;
-        unsigned char SWMinor;
+    unsigned char SWMinor;
-        unsigned char ProtoMajor;
+    unsigned char ProtoMajor;
-        unsigned char ProtoMinor;
+    unsigned char ProtoMinor;
-        unsigned char SWPatch;
+    unsigned char SWPatch;
-        unsigned char HardwareError[5];
+    unsigned char HardwareError[5];
 } __attribute__((packed)) str_VersionInfo;
 /*
  * NaviCtrl GPS Structs
  * portions taken and adapted from
  * http://svn.mikrokopter.de/filedetails.php?repname=NaviCtrl&path=/tags/V0.20c/ubx.h
  */
 typedef struct {
-        s32 Longitude;  // in 1E-7 deg
+    s32 Longitude; // in 1E-7 deg
-        s32 Latitude;   // in 1E-7 deg
+    s32 Latitude; // in 1E-7 deg
-        s32 Altitude;   // in mm
+    s32 Altitude; // in mm
-        u8 Status;// validity of data
+    u8 Status; // validity of data
 } __attribute__((packed)) GPS_Pos_t;
-#define INVALID         0x00
-#define NEWDATA         0x01
+#define INVALID         0x00
-#define PROCESSED       0x02
+#define NEWDATA         0x01
 #define PROCESSED       0x02
 /*
  * NaviCtrl OSD Structs
  * portions taken and adapted from
  * http://svn.mikrokopter.de/filedetails.php?repname=NaviCtrl&path=/tags/V0.24b/uart1.h
  */
 typedef struct {
-        u16 Distance;                                   // distance to target in dm
+    u16 Distance; // distance to target in dm
-        s16 Bearing;                                    // course to target in deg
+    s16 Bearing; // course to target in deg
 } __attribute__((packed)) GPS_PosDev_t;
 typedef struct {
-        u8 Version;                                             // version of the data structure
+    u8 Version; // version of the data structure
-        GPS_Pos_t CurrentPosition;                              // see ubx.h for details
+    GPS_Pos_t CurrentPosition; // see ubx.h for details
-        GPS_Pos_t TargetPosition;
+    GPS_Pos_t TargetPosition;
-        GPS_PosDev_t TargetPositionDeviation;
+    GPS_PosDev_t TargetPositionDeviation;
-        GPS_Pos_t HomePosition;
+    GPS_Pos_t HomePosition;
-        GPS_PosDev_t HomePositionDeviation;
+    GPS_PosDev_t HomePositionDeviation;
-        u8  WaypointIndex;                              // index of current waypoints running from 0 to WaypointNumber-1
+    u8 WaypointIndex; // index of current waypoints running from 0 to WaypointNumber-1
-        u8  WaypointNumber;                             // number of stored waypoints
+    u8 WaypointNumber; // number of stored waypoints
-        u8  SatsInUse;                                  // number of satellites used for position solution
+    u8 SatsInUse; // number of satellites used for position solution
-        s16 Altimeter;                                  // hight according to air pressure
+    s16 Altimeter; // hight according to air pressure
-        s16 Variometer;                                 // climb(+) and sink(-) rate
+    s16 Variometer; // climb(+) and sink(-) rate
-        u16 FlyingTime;                                 // in seconds
+    u16 FlyingTime; // in seconds
-        u8  UBat;                                       // Battery Voltage in 0.1 Volts
+    u8 UBat; // Battery Voltage in 0.1 Volts
-        u16 GroundSpeed;                                // speed over ground in cm/s (2D)
+    u16 GroundSpeed; // speed over ground in cm/s (2D)
-        s16 Heading;                                    // current flight direction in ° as angle to north
+    s16 Heading; // current flight direction in ° as angle to north
-        s16 CompassHeading;                             // current compass value in °
+    s16 CompassHeading; // current compass value in °
-        s8  AngleNick;                                  // current Nick angle in 1°
+    s8 AngleNick; // current Nick angle in 1°
-        s8  AngleRoll;                                  // current Rick angle in 1°
+    s8 AngleRoll; // current Rick angle in 1°
-        u8  RC_Quality;                                 // RC_Quality
+    u8 RC_Quality; // RC_Quality
-        u8  FCFlags;                                    // Flags from FC
+    u8 FCFlags; // Flags from FC
-        u8  NCFlags;                                    // Flags from NC
+    u8 NCFlags; // Flags from NC
-        u8  Errorcode;                                  // 0 --> okay
+    u8 Errorcode; // 0 --> okay
-        u8  OperatingRadius;                            // current operation radius around the Home Position in m
+    u8 OperatingRadius; // current operation radius around the Home Position in m
-        s16 TopSpeed;                                   // velocity in vertical direction in cm/s
+    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 TargetHoldTime; // time in s to stay at the given target, counts down to 0 if target has been reached
-        u8  FCStatusFlags2;                             // StatusFlags2 (since version 5 added)
+    u8 FCStatusFlags2; // StatusFlags2 (since version 5 added)
-        s16 SetpointAltitude;                           // setpoint for altitude
+    s16 SetpointAltitude; // setpoint for altitude
-        u8  Gas;                                        // for future use
+    u8 Gas; // for future use
-        u16 Current;                                    // actual current in 0.1A steps
+    u16 Current; // actual current in 0.1A steps
 #define DEFEKT_BL_MISSING       0x02
 #define DEFEKT_SPI_RX_ERR       0x04
 #define DEFEKT_PPM_ERR          0x08
 #define DEFEKT_MIXER_ERR    0x10
 /*
  * MikroKopter config struct
  * portions taken and adapted from
- * http://svn.mikrokopter.de/filedetails.php?repname=FlightCtrl&path=/tags/V0.88e/eeprom.h
+ * http://svn.mikrokopter.de/filedetails.php?repname=FlightCtrl&path=/tags/V0.90j/eeprom.h
  */
-} __attribute__((packed)) paramset_t;
+} paramset_t;
 typedef struct {
-        u8 SettingsIndex;
+    u8 SettingsIndex;
-        paramset_t param;
-} __attribute__((packed)) paramset_serial;
     paramset_t param;
 } __attribute__((packed)) paramset_serial;
 /*
  * MikroKopter 3D-Data struct
  * portions taken and adapted from
  * http://svn.mikrokopter.de/filedetails.php?repname=NaviCtrl&path=%2Ftags%2FV0.28o%2Fuart1.h
  */
 typedef struct {
-    s16 AngleNick;  // in 0.1 deg
+    s16 AngleNick; // in 0.1 deg
-    s16 AngleRoll;   // in 0.1 deg
+    s16 AngleRoll; // in 0.1 deg
-    s16 Heading;    // in 0.1 deg
+    s16 Heading; // in 0.1 deg
     u8 StickNick;
     u8 StickRoll;
     u8 StickYaw;
     u8 StickGas;
     u8 reserve[4];
 } __attribute__((packed)) Data3D_t;

Subversion Repositories Projects

(root)/C-OSD/trunk/mk-data-structs.h - Rev 1866 → 1992