Subversion Repositories Projects

Compare Revisions

Ignore whitespace Rev 333 → Rev 334

/QMK-Groundstation/trunk/Forms/dlg_Map.cpp
23,9 → 23,14
setupUi(this);
 
// Kartenwahl ausschalten
lb_Maps->setVisible(false);
cb_Maps->setVisible(false);
//lb_Maps->setVisible(false);
//cb_Maps->setVisible(false);
 
cb_Maps->removeItem(5);
cb_Maps->removeItem(4);
cb_Maps->removeItem(3);
cb_Maps->removeItem(2);
 
// Noch nicht eingebaut also Button weg.
pb_SendWaypoints->setVisible(false);
 
213,29 → 218,30
o_Adapter = new OSMMapAdapter();
}
break;
case 1 : // Google Maps
case 1 : // Yahoo Sat
{
o_Adapter = new WMSMapAdapter("openaerialmap.org", "/wms/wms.asp?wms=WorldMap&LAYERS=world&FORMAT=image/png&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&STYLES=&EXCEPTIONS=application/vnd.ogc.se_inimage&SRS=EPSG:4326&TRANSPARENT=FALSE", 256);
}
break;
case 2 : // Google Maps
{
o_Adapter = new GoogleMapAdapter();
}
break;
case 2 : // Google Sat
case 3 : // Google Sat
{
o_Adapter = new GoogleSatMapAdapter();
}
break;
case 3 : // Yahoo Maps
case 4 : // Yahoo Maps
{
o_Adapter = new YahooMapAdapter();
}
break;
case 4 : // Yahoo Sat
case 5 : // Yahoo Sat
{
o_Adapter = new YahooMapAdapter("us.maps3.yimg.com", "/aerial.maps.yimg.com/png?v=1.7&t=a&s=256&x=%2&y=%3&z=%1");
}
case 5 : // Yahoo Sat
{
o_Adapter = new WMSMapAdapter("openaerialmap.org", "/wms/wms.asp?wms=WorldMap&LAYERS=world&FORMAT=image/png&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&STYLES=&EXCEPTIONS=application/vnd.ogc.se_inimage&SRS=EPSG:4326&TRANSPARENT=FALSE", 256);
}
break;
}
 
/QMK-Groundstation/trunk/Forms/dlg_Map.ui
215,6 → 215,11
</item>
<item>
<property name="text">
<string>OpenAerialMap</string>
</property>
</item>
<item>
<property name="text">
<string>Google: Map</string>
</property>
</item>
/QMK-Groundstation/trunk/Forms/mktool.cpp
447,7 → 447,7
desired_pos.Position.Latitude = int32_t(desired_lat);
desired_pos.Position.Status = NEWDATA;
desired_pos.Heading = -1;
desired_pos.ToleranceRadius = 1;
desired_pos.ToleranceRadius = 5;
desired_pos.HoldTime = 60;
desired_pos.Event_Flag = 0;
desired_pos.reserve[0] = 0; // reserve
1309,10 → 1309,13
 
switch(RX.Decode[N_NC_FLAGS])
{
case 1 : lb_Mode->setText("Free"); break;
case 2 : lb_Mode->setText("Position Hold"); break;
case 4 : lb_Mode->setText("Coming Home"); break;
case 8 : lb_Mode->setText("Range Limit"); break;
case 0x01 : lb_Mode->setText("Free"); break;
case 0x02 : lb_Mode->setText("Position Hold"); break;
case 0x04 : lb_Mode->setText("Coming Home"); break;
case 0x08 : lb_Mode->setText("Range Limit"); break;
case 0x10 : lb_Mode->setText("Serial Error"); break;
case 0x20 : lb_Mode->setText("Target reached"); break;
case 0x40 : lb_Mode->setText("Manual Control"); break;
}
 
Navi.Current.Longitude = ToolBox::Data2Long(RX.Decode, N_CUR_LONGITUDE, true);
/QMK-Groundstation/trunk/Forms/wdg_Settings.ui
395,8 → 395,8
</layout>
</widget>
<widget class="QWidget" name="Seite_2">
<layout class="QGridLayout" name="gridLayout_12">
<item row="0" column="0">
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<widget class="QFrame" name="frame_2">
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
592,7 → 592,7
</layout>
</widget>
</item>
<item row="0" column="1">
<item>
<widget class="QFrame" name="frame">
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
600,23 → 600,79
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property>
<layout class="QGridLayout" name="gridLayout_10">
<item row="5" column="0">
<layout class="QGridLayout" name="gridLayout_2">
<item row="1" column="1">
<widget class="QLabel" name="label_3">
<property name="text">
<string>1</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item row="1" column="2">
<widget class="QLabel" name="label_4">
<property name="text">
<string>2</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item row="1" column="3">
<widget class="QLabel" name="label_13">
<property name="text">
<string>3</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item row="1" column="4">
<widget class="QLabel" name="label_14">
<property name="text">
<string>4</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item row="1" column="5">
<widget class="QLabel" name="label_15">
<property name="text">
<string>5</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item row="1" column="6">
<widget class="QLabel" name="label_16">
<property name="text">
<string>Kanal 6:</string>
<string>6</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="label_3">
<item row="1" column="7">
<widget class="QLabel" name="label_17">
<property name="text">
<string>Kanal 1:</string>
<string>7</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item row="5" column="1">
<widget class="QProgressBar" name="pb_K6">
<item row="2" column="1">
<widget class="QProgressBar" name="pb_K1">
<property name="minimum">
<number>-128</number>
</property>
626,6 → 682,9
<property name="value">
<number>0</number>
</property>
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="textDirection">
<enum>QProgressBar::TopToBottom</enum>
</property>
634,8 → 693,8
</property>
</widget>
</item>
<item row="4" column="1">
<widget class="QProgressBar" name="pb_K5">
<item row="2" column="2">
<widget class="QProgressBar" name="pb_K2">
<property name="minimum">
<number>-128</number>
</property>
645,6 → 704,12
<property name="value">
<number>0</number>
</property>
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="invertedAppearance">
<bool>false</bool>
</property>
<property name="textDirection">
<enum>QProgressBar::TopToBottom</enum>
</property>
653,21 → 718,7
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="label_13">
<property name="text">
<string>Kanal 3:</string>
</property>
</widget>
</item>
<item row="6" column="0">
<widget class="QLabel" name="label_17">
<property name="text">
<string>Kanal 7:</string>
</property>
</widget>
</item>
<item row="2" column="1">
<item row="2" column="3">
<widget class="QProgressBar" name="pb_K3">
<property name="minimum">
<number>-128</number>
678,6 → 729,9
<property name="value">
<number>0</number>
</property>
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="textDirection">
<enum>QProgressBar::TopToBottom</enum>
</property>
686,15 → 740,8
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="label_14">
<property name="text">
<string>Kanal 4:</string>
</property>
</widget>
</item>
<item row="7" column="1">
<widget class="QProgressBar" name="pb_K8">
<item row="2" column="4">
<widget class="QProgressBar" name="pb_K4">
<property name="minimum">
<number>-128</number>
</property>
704,6 → 751,9
<property name="value">
<number>0</number>
</property>
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="textDirection">
<enum>QProgressBar::TopToBottom</enum>
</property>
712,15 → 762,8
</property>
</widget>
</item>
<item row="4" column="0">
<widget class="QLabel" name="label_15">
<property name="text">
<string>Kanal 5:</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QProgressBar" name="pb_K2">
<item row="2" column="5">
<widget class="QProgressBar" name="pb_K5">
<property name="minimum">
<number>-128</number>
</property>
730,8 → 773,8
<property name="value">
<number>0</number>
</property>
<property name="invertedAppearance">
<bool>false</bool>
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="textDirection">
<enum>QProgressBar::TopToBottom</enum>
741,8 → 784,8
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QProgressBar" name="pb_K4">
<item row="2" column="6">
<widget class="QProgressBar" name="pb_K6">
<property name="minimum">
<number>-128</number>
</property>
752,6 → 795,9
<property name="value">
<number>0</number>
</property>
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="textDirection">
<enum>QProgressBar::TopToBottom</enum>
</property>
760,14 → 806,7
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_4">
<property name="text">
<string>Kanal 2:</string>
</property>
</widget>
</item>
<item row="6" column="1">
<item row="2" column="7">
<widget class="QProgressBar" name="pb_K7">
<property name="minimum">
<number>-128</number>
778,6 → 817,9
<property name="value">
<number>0</number>
</property>
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="textDirection">
<enum>QProgressBar::TopToBottom</enum>
</property>
786,8 → 828,34
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QProgressBar" name="pb_K1">
<item row="0" column="1" colspan="8">
<widget class="QLabel" name="label_128">
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text">
<string>Kanäle der Fernsteuerung</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item row="1" column="8">
<widget class="QLabel" name="label_18">
<property name="text">
<string>8</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item row="2" column="8">
<widget class="QProgressBar" name="pb_K8">
<property name="minimum">
<number>-128</number>
</property>
797,6 → 865,9
<property name="value">
<number>0</number>
</property>
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="textDirection">
<enum>QProgressBar::TopToBottom</enum>
</property>
805,17 → 876,36
</property>
</widget>
</item>
<item row="7" column="0">
<widget class="QLabel" name="label_18">
<property name="text">
<string>Kanal 8:</string>
<item row="2" column="9">
<spacer name="horizontalSpacer_12">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="2" column="0">
<spacer name="horizontalSpacer_13">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</item>
<item row="0" column="2">
<item>
<widget class="QTextEdit" name="te_Help_2">
<property name="minimumSize">
<size>
/QMK-Groundstation/trunk/Parameter_Positions.h
19,8 → 19,55
#ifndef PARAMETER_POSITIONS_H
#define PARAMETER_POSITIONS_H
 
#ifdef _BETA_
// Positionen der Navidaten im OSD-Datensatz
////////////////////////////////////////////
 
static const int N_VERSION = 0;
static const int N_CUR_LONGITUDE = 1;
static const int N_CUR_LATITUDE = 5;
static const int N_CUR_ALTITUDE = 9;
static const int N_CUR_STATUS = 13;
 
static const int N_TAR_LONGITUDE = 14; //16
static const int N_TAR_LATITUDE = 18; //20
static const int N_TAR_ALTITUDE = 22; //24
static const int N_TAR_STATUS = 26; //28
static const int N_TAR_DISTANCE = 27; //32
static const int N_TAR_ANGLE = 29; //34
 
static const int N_HOME_LONGITUDE = 31; //36
static const int N_HOME_LATITUDE = 35; //40
static const int N_HOME_ALTITUDE = 39; //44
static const int N_HOME_STATUS = 43; //48
static const int N_HOME_DISTANCE = 44; //52
static const int N_HOME_ANGLE = 46; //54
 
static const int N_WP_INDEX = 48; //56
static const int N_WP_NUMBER = 49; //57
 
static const int N_SATS_IN_USER = 50; //58
static const int N_ALTIMETER = 51; //59
static const int N_VARIOMETER = 53; //61
static const int N_FLYING_TIME = 55; //63
static const int N_UBAT = 57; //65
static const int N_GROUND_SPEED = 58; //66
static const int N_HEADING = 60; //68
static const int N_COMAPSS_HEADING = 62; //70
static const int N_ANGLE_NICK = 64; //72
static const int N_ANGLE_ROLL = 65; //73
static const int N_RC_QUALITY = 66; //74
static const int N_MK_FLAGS = 67; //75
static const int N_NC_FLAGS = 68; //76
static const int N_ERRORCODE = 69; //77
static const int N_OP_RADIUS = 70; //77
static const int N_TOP_SPEED = 71; //77
static const int N_HOLD_TIME = 73; //77
 
#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;
57,16 → 104,21
static const int N_MK_FLAGS = 66; //75
static const int N_NC_FLAGS = 67; //76
static const int N_ERRORCODE = 68; //77
static const int N_OP_RADIUS = 70; //77
static const int N_TOP_SPEED = 71; //77
static const int N_HOLD_TIME = 73; //77
#endif
 
 
// Positionen der Setting-Parameter
///////////////////////////////////
 
#ifdef _BETA_
static const int VERSION_SETTINGS = 75;
static const int VERSION_OSD = 1;
static const int VERSION_MIXER = 1;
#else
static const int VERSION_SETTINGS = 74;
static const int VERSION_OSD = 0;
static const int VERSION_MIXER = 1;
#endif
 
/QMK-Groundstation/trunk/global.h
56,11 → 56,11
static const int SLEEP = 500000;
 
static const QString QA_NAME = "QMK-Groundstation";
static const QString QA_VERSION_NR = "0.7.12";
static const QString QA_VERSION_NR = "0.7.14";
 
#ifdef _BETA_
static const QString QA_VERSION = QA_VERSION_NR + " (BETA)";
static const QString QA_HWVERSION = "FlightCtrl v0.73c & NaviCtrl v0.14e";
static const QString QA_HWVERSION = "FlightCtrl v0.73d & NaviCtrl v0.15c";
#else
static const QString QA_VERSION = QA_VERSION_NR;
static const QString QA_HWVERSION = "FlightCtrl v0.72p & NaviCtrl v0.14b";
81,7 → 81,7
#endif
 
 
static const QString QA_DATE = "22.03.2009";
static const QString QA_DATE = "03.04.2009";
static const QString QA_YEAR = "2008-2009";
static const QString QA_AUTHOR = "Manuel Schrape";
static const QString QA_EMAIL = "manuel.schrape@gmx.de";