Subversion Repositories Projects

Compare Revisions

Ignore whitespace Rev 278 → Rev 279

/QMK-Groundstation/trunk/Forms/mktool.cpp
65,6 → 65,11
pb_Flash->hide();
rb_NC->hide();
 
// Beta-Sachen einschalten.
#ifdef _BETA_
ac_QMKServer->setEnabled(true);
#endif
 
// Settings-Tab hinzufügen.
f_Settings = new wdg_Settings( this );
f_Settings->set_Config(Settings);
/QMK-Groundstation/trunk/Forms/mktool.ui
2329,7 → 2329,7
<bool>true</bool>
</property>
<property name="enabled" >
<bool>true</bool>
<bool>false</bool>
</property>
<property name="icon" >
<iconset resource="../MKTool.qrc" >
/QMK-Groundstation/trunk/Forms/wdg_Settings.cpp
27,12 → 27,6
setupUi(this);
 
#ifndef _BETA_
cb_5_8->setVisible(false);
cb_8_3->setVisible(false);
cb_12_9->setVisible(false);
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
19,7 → 19,6
#ifndef PARAMETER_POSITIONS_H
#define PARAMETER_POSITIONS_H
 
#ifdef _BETA_
// Positionen der Navidaten im OSD-Datensatz
////////////////////////////////////////////
static const int N_CUR_LONGITUDE = 0;
152,142 → 151,5
static const int P_SERVO_NICK_COMPI = 76;
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;
static const int P_NAV_GPS_I_LIMIT = 0;
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;
 
static const int P_KANAL_GAS = 0;
static const int P_KANAL_GIER = 1;
static const int P_KANAL_NICK = 2;
static const int P_KANAL_ROLL = 3;
static const int P_KANAL_POTI1 = 4;
static const int P_KANAL_POTI2 = 5;
static const int P_KANAL_POTI3 = 6;
static const int P_KANAL_POTI4 = 7;
static const int P_GLOBAL_CONF = 8;
static const int P_MIN_GAS = 9;
 
static const int P_DRUCK_D = 10;
static const int P_MAXHOEHE = 11;
static const int P_HOEHE_P = 12;
static const int P_HOEHE_GAIN = 13;
static const int P_HOEHE_ACC = 14;
static const int P_STICK_P = 15;
static const int P_STICK_D = 16;
static const int P_GIER_P = 17;
static const int P_GAS_MIN = 18;
static const int P_GAS_MAX = 19;
 
static const int P_GYRO_ACC_FAKTOR = 20;
static const int P_KOMPASS_WIRKUNG = 21;
static const int P_GYRO_P = 22;
static const int P_GYRO_I = 23;
static const int P_UNTERSPANNUNG = 24;
static const int P_NOTGAS = 25;
static const int P_NOTGASZEIT = 26;
static const int P_AUSRICHTUNG = 27;
static const int P_FAKTOR_I = 28;
static const int P_USER_1 = 29;
 
static const int P_USER_2 = 30;
static const int P_USER_3 = 31;
static const int P_USER_4 = 32;
static const int P_SERVO_NICK_CONT = 33;
static const int P_SERVO_NICK_COMP = 34;
static const int P_SERVO_NICK_MIN = 35;
static const int P_SERVO_NICK_MAX = 36;
static const int P_SERVO_NICK_REFR = 37;
static const int P_LOOP_GAS_LIMIT = 38;
static const int P_LOOP_THRESHOLD = 39;
 
static const int P_LOOP_HYSTERESE = 40;
static const int P_ACHS_KOPPLUNG1 = 41;
static const int P_ACHS_GKOPPLUNG = 42;
static const int P_WINKEL_NICK = 43;
static const int P_WINKEL_ROLL = 44;
static const int P_GYRO_ACC_ABGL = 45;
static const int P_DRIFT_KOMP = 46;
static const int P_DYNAMIC_STAB = 47;
static const int P_USER_5 = 48;
static const int P_USER_6 = 49;
 
static const int P_USER_7 = 50;
static const int P_USER_8 = 51;
static const int P_J16_BITMASK = 52;
static const int P_J16_TIMING = 53;
static const int P_J17_BITMASK = 54;
static const int P_J17_TIMING = 55;
static const int P_NAV_GPS_MODE = 56;
static const int P_NAV_GPS_GAIN = 57;
static const int P_NAV_GPS_P = 58;
static const int P_NAV_GPS_I = 59;
 
static const int P_NAV_GPS_D = 60;
static const int P_NAV_GPS_ACC = 61;
static const int P_NAV_GPS_MIN = 62;
static const int P_NAV_STICK_THRE = 63;
static const int P_NAV_WIND_CORR = 64;
static const int P_NAV_SPEED_COMP = 65;
static const int P_NAV_RADIUS = 66;
static const int P_NAV_ANGLE_LIMIT = 67;
 
static const int P_EXTERNAL = 68;
static const int P_LOOP_CONFIG = 69;
static const int P_SERVO_NICK_COMPI = 70;
static const int P_RESERVED = 71;
static const int P_NAME = 75;
#endif
 
#endif
/QMK-Groundstation/trunk/global.h
56,7 → 56,7
static const int SLEEP = 500000;
 
static const QString QA_NAME = "QMK-Groundstation";
static const QString QA_VERSION_NR = "0.7.2g";
static const QString QA_VERSION_NR = "0.7.3";
 
#ifdef _BETA_
static const QString QA_VERSION = QA_VERSION_NR + " (BETA)";
63,10 → 63,10
static const QString QA_HWVERSION = "FlightCtrl v0.72f & NaviCtrl v0.13a";
#else
static const QString QA_VERSION = QA_VERSION_NR;
static const QString QA_HWVERSION = "FlightCtrl v0.71h & NaviCtrl v0.12i";
static const QString QA_HWVERSION = "FlightCtrl v0.72p & NaviCtrl v0.14a";
#endif
 
static const QString QA_DATE = "01.03.2009";
static const QString QA_DATE = "02.03.2009";
static const QString QA_YEAR = "2008-2009";
static const QString QA_AUTHOR = "Manuel Schrape";
static const QString QA_EMAIL = "manuel.schrape@gmx.de";