Subversion Repositories Projects

Compare Revisions

Ignore whitespace Rev 245 → Rev 246

/QMK-Groundstation/trunk/Forms/mktool.cpp
1166,25 → 1166,25
 
void MKTool::new_NaviData(sRxData RX)
{
Navi.Current.Longitude = ToolBox::Data2Long(RX.Decode, 0, true);
Navi.Current.Latitude = ToolBox::Data2Long(RX.Decode, 4, true);
Navi.Current.Altitude = ToolBox::Data2Long(RX.Decode, 8, true);
Navi.Target.Longitude = ToolBox::Data2Long(RX.Decode, 16, true);
Navi.Target.Latitude = ToolBox::Data2Long(RX.Decode, 20, true);
Navi.Target.Altitude = ToolBox::Data2Long(RX.Decode, 24, true);
Navi.Current.Longitude = ToolBox::Data2Long(RX.Decode, N_CUR_LONGITUDE, true);
Navi.Current.Latitude = ToolBox::Data2Long(RX.Decode, N_CUR_LATITUDE, true);
Navi.Current.Altitude = ToolBox::Data2Long(RX.Decode, N_CUR_ALTITUDE, true);
Navi.Target.Longitude = ToolBox::Data2Long(RX.Decode, N_TAR_LONGITUDE, true);
Navi.Target.Latitude = ToolBox::Data2Long(RX.Decode, N_TAR_LATITUDE, true);
Navi.Target.Altitude = ToolBox::Data2Long(RX.Decode, N_TAR_ALTITUDE, true);
 
le_CDistance->setText(QString("%1 cm").arg(ToolBox::Data2Int(RX.Decode, 52)));
le_CWPA->setText(QString("%1").arg(RX.Decode[56]));
le_CWPT->setText(QString("%1").arg(RX.Decode[57]));
le_CSats->setText(QString("%1").arg(RX.Decode[58]));
le_CDistance->setText(QString("%1 cm").arg(ToolBox::Data2Int(RX.Decode, N_HOME_DISTANCE)));
le_CWPA->setText(QString("%1").arg(RX.Decode[N_WP_INDEX]));
le_CWPT->setText(QString("%1").arg(RX.Decode[N_WP_NUMBER]));
le_CSats->setText(QString("%1").arg(RX.Decode[N_SATS_IN_USER]));
 
qwt_Rate->setValue(double(ToolBox::Data2Int(RX.Decode, 61, true)));
qwt_Rate->setValue(double(ToolBox::Data2Int(RX.Decode, N_VARIOMETER, true)));
 
le_CTime->setText(QString("%1 sec.").arg(ToolBox::Data2Int(RX.Decode, 63)));
le_CTime->setText(QString("%1 sec.").arg(ToolBox::Data2Int(RX.Decode, N_FLYING_TIME)));
 
bar_UBAT->setValue(RX.Decode[65]);
bar_UBAT->setValue(RX.Decode[N_UBAT]);
 
double Speed = double((ToolBox::Data2Int(RX.Decode, 66)) / 10.0);
double Speed = double((ToolBox::Data2Int(RX.Decode, N_GROUND_SPEED)) / 10.0);
 
if ((Speed > 4.5) && SpeedMeter->property("END") == 5)
{
1202,12 → 1202,12
 
SpeedMeter->setValue(Speed);
 
Compass->setValue(ToolBox::Data2Int(RX.Decode, 70)); //(68)
Compass->setValue(ToolBox::Data2Int(RX.Decode, N_COMAPSS_HEADING)); //(68)
 
bar_RX->setValue(RX.Decode[74]);
bar_RX->setValue(RX.Decode[N_RC_QUALITY]);
 
int Nick = RX.Decode[72];
int Roll = RX.Decode[73];
int Nick = RX.Decode[N_ANGLE_NICK];
int Roll = RX.Decode[N_ANGLE_ROLL];
 
if (Roll > 128)
Roll = Roll - 255;
/QMK-Groundstation/trunk/Forms/wdg_Settings.cpp
33,7 → 33,6
cb_12_10->setVisible(false);
cb_12_11->setVisible(false);
sb_13_5->setVisible(false);
 
#endif
 
connect(pb_Load, SIGNAL(clicked()), this, SLOT(slot_LoadParameter()));
/QMK-Groundstation/trunk/Parameter_Positions.h
20,6 → 20,48
#define PARAMETER_POSITIONS_H
 
#ifdef _BETA_
// Positionen der Navidaten im OSD-Datensatz
////////////////////////////////////////////
static const int N_CUR_LONGITUDE = 0;
static const int N_CUR_LATITUDE = 4;
static const int N_CUR_ALTITUDE = 8;
static const int N_CUR_STATUS = 12;
 
static const int N_TAR_LONGITUDE = 13; //16
static const int N_TAR_LATITUDE = 17; //20
static const int N_TAR_ALTITUDE = 21; //24
static const int N_TAR_STATUS = 25; //28
static const int N_TAR_DISTANCE = 26; //32
static const int N_TAR_ANGLE = 28; //34
 
static const int N_HOME_LONGITUDE = 30; //36
static const int N_HOME_LATITUDE = 34; //40
static const int N_HOME_ALTITUDE = 38; //44
static const int N_HOME_STATUS = 42; //48
static const int N_HOME_DISTANCE = 43; //52
static const int N_HOME_ANGLE = 45; //54
 
static const int N_WP_INDEX = 47; //56
static const int N_WP_NUMBER = 48; //57
 
static const int N_SATS_IN_USER = 49; //58
static const int N_ALTIMETER = 50; //59
static const int N_VARIOMETER = 52; //61
static const int N_FLYING_TIME = 54; //63
static const int N_UBAT = 56; //65
static const int N_GROUND_SPEED = 57; //66
static const int N_HEADING = 59; //68
static const int N_COMAPSS_HEADING = 61; //70
static const int N_ANGLE_NICK = 63; //72
static const int N_ANGLE_ROLL = 64; //73
static const int N_RC_QUALITY = 65; //74
static const int N_MK_FLAGS = 66; //75
static const int N_NC_FLAGS = 67; //76
static const int N_ERRORCODE = 68; //77
 
 
// Positionen der Setting-Parameter
///////////////////////////////////
static const int VERSION_SETTINGS = 74;
 
static const int MaxParameter = 93;
111,6 → 153,50
static const int P_RESERVED = 77;
static const int P_NAME = 81;
#else
// Positionen der Navidaten im OSD-Datensatz
////////////////////////////////////////////
static const int N_CUR_LONGITUDE = 0;
static const int N_CUR_LATITUDE = 4;
static const int N_CUR_ALTITUDE = 8;
static const int N_CUR_STATUS = 12;
 
static const int N_TAR_LONGITUDE = 16;
static const int N_TAR_LATITUDE = 20;
static const int N_TAR_ALTITUDE = 24;
static const int N_TAR_STATUS = 28;
static const int N_TAR_DISTANCE = 32;
static const int N_TAR_ANGLE = 34;
 
static const int N_HOME_LONGITUDE = 36;
static const int N_HOME_LATITUDE = 40;
static const int N_HOME_ALTITUDE = 44;
static const int N_HOME_STATUS = 48;
static const int N_HOME_DISTANCE = 52;
static const int N_HOME_ANGLE = 54;
 
static const int N_WP_INDEX = 56;
static const int N_WP_NUMBER = 57;
 
static const int N_SATS_IN_USER = 58;
static const int N_ALTIMETER = 59;
static const int N_VARIOMETER = 61;
static const int N_FLYING_TIME = 63;
static const int N_UBAT = 65;
static const int N_GROUND_SPEED = 66;
static const int N_HEADING = 68;
static const int N_COMAPSS_HEADING = 70;
static const int N_ANGLE_NICK = 72;
static const int N_ANGLE_ROLL = 73;
static const int N_RC_QUALITY = 74;
static const int N_MK_FLAGS = 75;
static const int N_NC_FLAGS = 76;
static const int N_ERRORCODE = 77;
 
 
// Positionen der Setting-Parameter
///////////////////////////////////
 
 
static const int P_GYRO_D = 0;
static const int P_ACHS_KOPPLUNG2 = 0;
static const int P_NAV_GPS_P_LIMIT = 0;
118,7 → 204,6
static const int P_NAV_GPS_D_LIMIT = 0;
static const int P_NAV_PH_LOGINTIME = 0;
 
 
static const int VERSION_SETTINGS = 73;
 
static const int MaxParameter = 87;
/QMK-Groundstation/trunk/global.h
56,12 → 56,17
static const int SLEEP = 500000;
 
static const QString QA_NAME = "QMK-Groundstation";
static const QString QA_VERSION_NR = "0.7.0m";
 
#ifdef _BETA_
static const QString QA_VERSION = "0.7.0g (BETA)";
static const QString QA_VERSION = QA_VERSION_NR + " (BETA)";
static const QString QA_HWVERSION = "FlightCtrl v0.72f & NaviCtrl v0.13a";
#else
static const QString QA_VERSION = "0.7.0g";
static const QString QA_VERSION = QA_VERSION_NR;
static const QString QA_HWVERSION = "FlightCtrl v0.71h & NaviCtrl v0.12i";
#endif
static const QString QA_DATE = "28.01.2009";
 
static const QString QA_DATE = "03.02.2009";
static const QString QA_YEAR = "2008-2009";
static const QString QA_AUTHOR = "Manuel Schrape";
static const QString QA_EMAIL = "manuel.schrape@gmx.de";
71,6 → 76,7
"<p><b><font size=8>" + QA_NAME + "</font></b></p>"
"<br />"
"Version " + QA_VERSION + " - " + QA_DATE + ""
"<br /><b>kompatibel zu " + QA_HWVERSION + "</b>"
"<br /><br />"
"(C) " + QA_YEAR + " by " + QA_AUTHOR + " - "
"<a href=\"mailto:" + QA_EMAIL + "\">" + QA_EMAIL + "</a> <br /><br />"