Subversion Repositories Projects

Compare Revisions

Ignore whitespace Rev 441 → Rev 442

/QMK-Groundstation/branches/libMK/libMK/Kopter.h
9,17 → 9,20
*/
 
// version information for the serial connection
static const int VERSION_SERIAL_MAJOR = 10;
static const int VERSION_SERIAL_MINOR = 0;
#define VERSION_SERIAL_MAJOR 10
#define VERSION_SERIAL_MINOR 0
 
// Basis-Adresses for different Hardware components
static const int ADDRESS_ALL = 0;
static const int ADDRESS_FC = 1;
static const int ADDRESS_NC = 2;
static const int ADDRESS_MK3MAG = 3;
// Basis-Adresses for different hardware components
#define ADDRESS_ALL 0
#define ADDRESS_FC 1
#define ADDRESS_NC 2
#define ADDRESS_MK3MAG 3
 
//maximum amount of motors
#define MAX_MOTORS 12
 
// settings ID
static const int SETTINGS_ID = 2;
#define SETTINGS_ID 2
 
static const string HardwareType[] = {"Default", "FlightCtrl", "NaviCtrl", "MK3Mag"};
 
30,28 → 33,27
 
static const int MaxNaviPos = 2000;
 
struct sMotor
struct sMotorData
{
int Speed[12];
int mixer_gas[MAX_MOTORS];
int mixer_nick[MAX_MOTORS];
int mixer_roll[MAX_MOTORS];
int mixer_yaw[MAX_MOTORS];
int desired_speed[MAX_MOTORS];
string mixer_name;
int mixer_version;
};
 
struct MotorData
{
int motor[16][4];
string mixerName;
int mixerVersion;
};
 
struct sMode
{
int ID;
int VERSION_MAJOR;
int VERSION_MINOR;
int VERSION_PATCH;
int VERSION_SERIAL_MAJOR;
int VERSION_SERIAL_MINOR;
string Hardware;
string Version;
int id;
int version_major;
int version_minor;
int version_patch;
int version_serial_major;
int version_serial_minor;
string hardware;
string version;
};
 
struct sGPS_Pos
88,7 → 90,7
public:
sMode mode;
sNaviData navi;
sMotor motor;
sMotorData motor;
int analogData[MaxAnalog];
// current LCD page
int lcd_cur;