Subversion Repositories Projects

Compare Revisions

Ignore whitespace Rev 336 → Rev 337

/QMK-Groundstation/trunk/Forms/dlg_Map.cpp
22,10 → 22,6
{
setupUi(this);
 
// Kartenwahl ausschalten
//lb_Maps->setVisible(false);
//cb_Maps->setVisible(false);
 
cb_Maps->removeItem(5);
cb_Maps->removeItem(4);
cb_Maps->removeItem(3);
68,7 → 64,6
o_Map->addLayer(o_Route);
 
o_Map->setZoom(17);
// o_Map->setView(QPointF(13.85615670,52.50787020));
o_Map->setView(QPointF(13.5,52.5));
 
connect(o_Map, SIGNAL(mouseEventCoordinate(const QMouseEvent*, const QPointF)), this, SLOT(slot_Click(const QMouseEvent*, const QPointF)));
/QMK-Groundstation/trunk/Forms/dlg_Motortest.cpp
21,17 → 21,44
dlg_Motortest::dlg_Motortest(QWidget *parent) : QDialog(parent)
{
setupUi(this);
connect(sl_Left, SIGNAL(valueChanged(int)), this, SLOT(slot_Motortest(int)));
connect(sl_Right, SIGNAL(valueChanged(int)), this, SLOT(slot_Motortest(int)));
connect(sl_Front, SIGNAL(valueChanged(int)), this, SLOT(slot_Motortest(int)));
connect(sl_Back, SIGNAL(valueChanged(int)), this, SLOT(slot_Motortest(int)));
connect(sl_All, SIGNAL(valueChanged(int)), this, SLOT(slot_Motortest(int)));
connect(sl_Speed, SIGNAL(valueChanged(int)), this, SLOT(slot_Motortest(int)));
}
 
void dlg_Motortest::slot_Motortest(int Wert)
{
Wert = Wert;
emit updateMotor(sl_Front->value(),sl_Back->value(),sl_Left->value(),sl_Right->value());
sMotor Motor;
 
for (int z = 0; z < 12; z++)
{
Motor.Speed[z] = 0;
}
 
if (cb_1->isChecked())
Motor.Speed[0] = Wert;
if (cb_2->isChecked())
Motor.Speed[1] = Wert;
if (cb_3->isChecked())
Motor.Speed[2] = Wert;
if (cb_4->isChecked())
Motor.Speed[3] = Wert;
if (cb_5->isChecked())
Motor.Speed[4] = Wert;
if (cb_6->isChecked())
Motor.Speed[5] = Wert;
if (cb_7->isChecked())
Motor.Speed[6] = Wert;
if (cb_8->isChecked())
Motor.Speed[7] = Wert;
if (cb_9->isChecked())
Motor.Speed[8] = Wert;
if (cb_10->isChecked())
Motor.Speed[9] = Wert;
if (cb_11->isChecked())
Motor.Speed[10] = Wert;
if (cb_12->isChecked())
Motor.Speed[11] = Wert;
 
emit updateMotor(Motor);
}
 
dlg_Motortest::~dlg_Motortest()
/QMK-Groundstation/trunk/Forms/dlg_Motortest.h
22,7 → 22,7
#include <QObject>
 
#include "ui_dlg_Motortest.h"
//#include "../global.h"
#include "../global.h"
 
class dlg_Motortest : public QDialog, public Ui::dlg_Motortest_UI
{
36,7 → 36,7
void slot_Motortest(int Wert);
 
signals:
void updateMotor(int Motor1, int Motor2, int Motor3, int Motor4);
void updateMotor(sMotor Motor);
};
 
#endif
/QMK-Groundstation/trunk/Forms/dlg_Motortest.ui
1,226 → 1,350
<ui version="4.0" >
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>dlg_Motortest_UI</class>
<widget class="QDialog" name="dlg_Motortest_UI" >
<property name="geometry" >
<widget class="QDialog" name="dlg_Motortest_UI">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>253</width>
<height>193</height>
<width>194</width>
<height>208</height>
</rect>
</property>
<property name="windowTitle" >
<property name="windowTitle">
<string>Motortest</string>
</property>
<layout class="QGridLayout" name="gridLayout" >
<item row="0" column="0" >
<widget class="QLabel" name="label_133" >
<property name="text" >
<string>Links</string>
<layout class="QGridLayout" name="gridLayout_2">
<item row="0" column="0">
<widget class="QGroupBox" name="groupBox">
<property name="title">
<string>Motoren</string>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
<widget class="QCheckBox" name="cb_1">
<property name="text">
<string>1</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QCheckBox" name="cb_2">
<property name="text">
<string>2</string>
</property>
</widget>
</item>
<item row="0" column="2">
<widget class="QCheckBox" name="cb_3">
<property name="text">
<string>3</string>
</property>
</widget>
</item>
<item row="0" column="3">
<widget class="QCheckBox" name="cb_4">
<property name="text">
<string>4</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QCheckBox" name="cb_5">
<property name="text">
<string>5</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QCheckBox" name="cb_6">
<property name="text">
<string>6</string>
</property>
</widget>
</item>
<item row="1" column="2">
<widget class="QCheckBox" name="cb_7">
<property name="text">
<string>7</string>
</property>
</widget>
</item>
<item row="1" column="3">
<widget class="QCheckBox" name="cb_8">
<property name="text">
<string>8</string>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QCheckBox" name="cb_9">
<property name="text">
<string>9</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QCheckBox" name="cb_10">
<property name="text">
<string>10</string>
</property>
</widget>
</item>
<item row="2" column="2">
<widget class="QCheckBox" name="cb_11">
<property name="text">
<string>11</string>
</property>
</widget>
</item>
<item row="2" column="3">
<widget class="QCheckBox" name="cb_12">
<property name="text">
<string>12</string>
</property>
</widget>
</item>
<item row="3" column="0" colspan="4">
<widget class="QCheckBox" name="cb_ALL">
<property name="text">
<string>Alle auswählen</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item row="0" column="1" >
<widget class="QSlider" name="sl_Left" >
<property name="minimumSize" >
<size>
<width>200</width>
<height>0</height>
</size>
</property>
<property name="maximum" >
<item row="1" column="0">
<widget class="QSlider" name="sl_Speed">
<property name="maximum">
<number>255</number>
</property>
<property name="orientation" >
<enum>Qt::Horizontal</enum>
<property name="pageStep">
<number>1</number>
</property>
</widget>
</item>
<item row="1" column="0" >
<widget class="QLabel" name="label_135" >
<property name="text" >
<string>Rechts</string>
</property>
</widget>
</item>
<item row="1" column="1" >
<widget class="QSlider" name="sl_Right" >
<property name="maximum" >
<number>255</number>
</property>
<property name="orientation" >
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item row="2" column="0" >
<widget class="QLabel" name="label_136" >
<property name="text" >
<string>Vorn</string>
</property>
</widget>
</item>
<item row="2" column="1" >
<widget class="QSlider" name="sl_Front" >
<property name="maximum" >
<number>255</number>
</property>
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item row="3" column="0" >
<widget class="QLabel" name="label_137" >
<property name="text" >
<string>Hinten</string>
</property>
</widget>
</item>
<item row="3" column="1" >
<widget class="QSlider" name="sl_Back" >
<property name="maximum" >
<number>255</number>
</property>
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item row="4" column="0" colspan="2" >
<widget class="Line" name="line" >
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item row="5" column="0" >
<widget class="QLabel" name="label_138" >
<property name="text" >
<string>Alle</string>
</property>
</widget>
</item>
<item row="5" column="1" >
<widget class="QSlider" name="sl_All" >
<property name="maximum" >
<number>255</number>
</property>
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item row="7" column="0" colspan="2" >
<widget class="Line" name="line_2" >
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item row="8" column="1" >
<widget class="QPushButton" name="pb_OK" >
<property name="text" >
<item row="2" column="0">
<widget class="QPushButton" name="pb_OK">
<property name="text">
<string>OK</string>
</property>
</widget>
</item>
</layout>
<zorder>sl_All</zorder>
<zorder>sl_Left</zorder>
<zorder>sl_Right</zorder>
<zorder>label_137</zorder>
<zorder>label_136</zorder>
<zorder>sl_Front</zorder>
<zorder>label_138</zorder>
<zorder>sl_Back</zorder>
<zorder>label_133</zorder>
<zorder>label_135</zorder>
<zorder>line</zorder>
<zorder>line_2</zorder>
<zorder>pb_OK</zorder>
</widget>
<resources/>
<connections>
<connection>
<sender>sl_All</sender>
<signal>valueChanged(int)</signal>
<receiver>sl_Back</receiver>
<slot>setValue(int)</slot>
<sender>pb_OK</sender>
<signal>clicked()</signal>
<receiver>dlg_Motortest_UI</receiver>
<slot>accept()</slot>
<hints>
<hint type="sourcelabel" >
<x>132</x>
<y>133</y>
<hint type="sourcelabel">
<x>63</x>
<y>174</y>
</hint>
<hint type="destinationlabel" >
<x>131</x>
<y>108</y>
<hint type="destinationlabel">
<x>29</x>
<y>177</y>
</hint>
</hints>
</connection>
<connection>
<sender>sl_All</sender>
<signal>valueChanged(int)</signal>
<receiver>sl_Front</receiver>
<slot>setValue(int)</slot>
<sender>cb_ALL</sender>
<signal>toggled(bool)</signal>
<receiver>cb_1</receiver>
<slot>setChecked(bool)</slot>
<hints>
<hint type="sourcelabel" >
<x>166</x>
<y>137</y>
<hint type="sourcelabel">
<x>96</x>
<y>128</y>
</hint>
<hint type="destinationlabel" >
<x>166</x>
<y>76</y>
<hint type="destinationlabel">
<x>29</x>
<y>47</y>
</hint>
</hints>
</connection>
<connection>
<sender>sl_All</sender>
<signal>valueChanged(int)</signal>
<receiver>sl_Right</receiver>
<slot>setValue(int)</slot>
<sender>cb_ALL</sender>
<signal>toggled(bool)</signal>
<receiver>cb_2</receiver>
<slot>setChecked(bool)</slot>
<hints>
<hint type="sourcelabel" >
<x>202</x>
<y>130</y>
<hint type="sourcelabel">
<x>96</x>
<y>128</y>
</hint>
<hint type="destinationlabel" >
<x>204</x>
<y>50</y>
<hint type="destinationlabel">
<x>71</x>
<y>47</y>
</hint>
</hints>
</connection>
<connection>
<sender>sl_All</sender>
<signal>valueChanged(int)</signal>
<receiver>sl_Left</receiver>
<slot>setValue(int)</slot>
<sender>cb_ALL</sender>
<signal>toggled(bool)</signal>
<receiver>cb_3</receiver>
<slot>setChecked(bool)</slot>
<hints>
<hint type="sourcelabel" >
<x>241</x>
<y>144</y>
<hint type="sourcelabel">
<x>96</x>
<y>128</y>
</hint>
<hint type="destinationlabel" >
<x>240</x>
<y>17</y>
<hint type="destinationlabel">
<x>115</x>
<y>47</y>
</hint>
</hints>
</connection>
<connection>
<sender>pb_OK</sender>
<signal>clicked()</signal>
<receiver>dlg_Motortest_UI</receiver>
<slot>accept()</slot>
<sender>cb_ALL</sender>
<signal>toggled(bool)</signal>
<receiver>cb_4</receiver>
<slot>setChecked(bool)</slot>
<hints>
<hint type="sourcelabel" >
<x>63</x>
<y>174</y>
<hint type="sourcelabel">
<x>96</x>
<y>128</y>
</hint>
<hint type="destinationlabel" >
<hint type="destinationlabel">
<x>160</x>
<y>47</y>
</hint>
</hints>
</connection>
<connection>
<sender>cb_ALL</sender>
<signal>toggled(bool)</signal>
<receiver>cb_5</receiver>
<slot>setChecked(bool)</slot>
<hints>
<hint type="sourcelabel">
<x>96</x>
<y>128</y>
</hint>
<hint type="destinationlabel">
<x>29</x>
<y>177</y>
<y>74</y>
</hint>
</hints>
</connection>
<connection>
<sender>cb_ALL</sender>
<signal>toggled(bool)</signal>
<receiver>cb_6</receiver>
<slot>setChecked(bool)</slot>
<hints>
<hint type="sourcelabel">
<x>96</x>
<y>128</y>
</hint>
<hint type="destinationlabel">
<x>71</x>
<y>74</y>
</hint>
</hints>
</connection>
<connection>
<sender>cb_ALL</sender>
<signal>toggled(bool)</signal>
<receiver>cb_7</receiver>
<slot>setChecked(bool)</slot>
<hints>
<hint type="sourcelabel">
<x>96</x>
<y>128</y>
</hint>
<hint type="destinationlabel">
<x>115</x>
<y>74</y>
</hint>
</hints>
</connection>
<connection>
<sender>cb_ALL</sender>
<signal>toggled(bool)</signal>
<receiver>cb_8</receiver>
<slot>setChecked(bool)</slot>
<hints>
<hint type="sourcelabel">
<x>96</x>
<y>128</y>
</hint>
<hint type="destinationlabel">
<x>160</x>
<y>74</y>
</hint>
</hints>
</connection>
<connection>
<sender>cb_ALL</sender>
<signal>toggled(bool)</signal>
<receiver>cb_9</receiver>
<slot>setChecked(bool)</slot>
<hints>
<hint type="sourcelabel">
<x>96</x>
<y>128</y>
</hint>
<hint type="destinationlabel">
<x>29</x>
<y>101</y>
</hint>
</hints>
</connection>
<connection>
<sender>cb_ALL</sender>
<signal>toggled(bool)</signal>
<receiver>cb_10</receiver>
<slot>setChecked(bool)</slot>
<hints>
<hint type="sourcelabel">
<x>96</x>
<y>128</y>
</hint>
<hint type="destinationlabel">
<x>71</x>
<y>101</y>
</hint>
</hints>
</connection>
<connection>
<sender>cb_ALL</sender>
<signal>toggled(bool)</signal>
<receiver>cb_11</receiver>
<slot>setChecked(bool)</slot>
<hints>
<hint type="sourcelabel">
<x>96</x>
<y>128</y>
</hint>
<hint type="destinationlabel">
<x>115</x>
<y>101</y>
</hint>
</hints>
</connection>
<connection>
<sender>cb_ALL</sender>
<signal>toggled(bool)</signal>
<receiver>cb_12</receiver>
<slot>setChecked(bool)</slot>
<hints>
<hint type="sourcelabel">
<x>96</x>
<y>128</y>
</hint>
<hint type="destinationlabel">
<x>160</x>
<y>101</y>
</hint>
</hints>
</connection>
</connections>
</ui>
/QMK-Groundstation/trunk/Forms/mktool.cpp
69,9 → 69,8
// Beta-Sachen einschalten.
#ifdef _BETA_
ac_QMKServer->setEnabled(true);
#else
ac_MotorMixer->setVisible(false);
#endif
 
// Settings-Tab hinzufügen.
f_Settings = new wdg_Settings( this );
f_Settings->set_Config(Settings);
480,6 → 479,7
}
}
 
// Hardware-Auswahl im Menp
void MKTool::slot_ac_Hardware()
{
QAction *Action = (QAction*)sender();
492,6 → 492,7
slot_rb_Hardware();
}
 
// Hardware Auswahl und umschalten
void MKTool::slot_rb_Hardware()
{
if ((rb_SelNC->isChecked() == false) && (Mode.ID != ADDRESS_NC))
546,7 → 547,7
TickerDiv = false;
else
TickerDiv = true;
 
/*
if (cb_ClipBoard->isChecked())
{
QString s_OLD = te_KML->toPlainText();
557,7 → 558,7
parse_TargetKML();
}
}
 
*/
for (int a = 0; a < MaxTickerEvents; a++)
{
if (TickerEvent[a] == true)
565,10 → 566,7
switch(a)
{
case 0 :
if (TickerDiv)
{
QByteArray Temp(LastSend.toUtf8());
// serialPort->sendData(Temp);
}
break;
case 1 :
600,11 → 598,21
o_Connection->send_Cmd('d', ADDRESS_ALL, TX_Data, 1, false);
}
break;
case 4 :
{
for (int z = 0; z<12; z++)
{
TX_Data[z] = Motor.Speed[z];
}
o_Connection->send_Cmd('t', ADDRESS_FC, TX_Data, 12, false);
}
 
}
}
}
}
 
// Zum QMK-Datenserver verbinden
void MKTool::slot_QMKS_Connect()
{
if (ac_QMKServer->isChecked())
630,6 → 638,7
}
}
 
// Verbindung zum QMK-Server hergestellt.
void MKTool::slot_QMKS_Connected()
{
QMK_Server->setProperty("Connect", true);
637,6 → 646,7
lb_Status->setText(tr("Verbunden mit QMK-Datenserver."));
}
 
// QMK-Serververbindung getrennt
void MKTool::slot_QMKS_Disconnected(int Error)
{
QMK_Server->setProperty("Connect", false);
679,16 → 689,42
{
dlg_Motortest *f_Motortest = new dlg_Motortest(this);
 
connect(f_Motortest, SIGNAL(updateMotor(int, int, int, int)), this, SLOT(slot_Motortest(int, int, int, int)));
// connect(f_Motortest, SIGNAL(updateMotor(int, int, int, int)), this, SLOT(slot_Motortest(int, int, int, int)));
connect(f_Motortest, SIGNAL(updateMotor(sMotor)), this, SLOT(slot_Motortest(sMotor)));
 
 
Ticker->setInterval(500);
TickerEvent[4] = true;
 
if (f_Motortest->exec()==QDialog::Accepted)
{
}
 
disconnect(f_Motortest, 0,0,0);
slot_Motortest(0,0,0,0);
 
for (int z = 0; z<12; z++)
{
Motor.Speed[z] = 0;
}
 
slot_Motortest(Motor);
 
Ticker->setInterval(2000);
TickerEvent[4] = false;
}
 
void MKTool::slot_Motortest(sMotor p_Motor)
{
Motor = p_Motor;
 
for (int z = 0; z<12; z++)
{
TX_Data[z] = Motor.Speed[z];
}
o_Connection->send_Cmd('t', ADDRESS_FC, TX_Data, 12, false);
}
 
// Motormixer-Einstellungen anzeigen
void MKTool::slot_ac_MotorMixer()
{
f_MotorMixer->set_Objects(o_Connection, Settings);
699,6 → 735,7
}
}
 
// LCD Anzeigen
void MKTool::slot_ac_LCD()
{
if (!f_LCD->isVisible())
720,6 → 757,7
}
}
 
// Map-Fenster anzeigen
void MKTool::slot_ac_Map()
{
if (!f_Map->isVisible())
747,15 → 785,6
slot_pb_SendWaypoint();
}
 
void MKTool::slot_Motortest(int Motor1, int Motor2, int Motor3, int Motor4)
{
TX_Data[0] = Motor1;
TX_Data[1] = Motor2;
TX_Data[2] = Motor3;
TX_Data[3] = Motor4;
o_Connection->send_Cmd('t', ADDRESS_FC, TX_Data, 4, false);
}
 
void MKTool::slot_ac_Config()
{
set_Analog Old_Analog1;
/QMK-Groundstation/trunk/Forms/mktool.h
127,6 → 127,7
sMode Mode;
sRxData RxData;
sNaviData Navi;
sMotor Motor;
 
QString RXS;
QString LastSend;
205,7 → 206,7
void slot_LCD_UP();
void slot_LCD_DOWN();
 
void slot_Motortest(int Motor1, int Motor2, int Motor3, int Motor4);
void slot_Motortest(sMotor p_Motor);
 
// Firmeware-Update
void slot_pb_Update();
/QMK-Groundstation/trunk/Forms/wdg_Settings.cpp
531,8 → 531,8
ParameterSet[Set][P_LOOP_CONFIG] = ParameterSet[Set][P_LOOP_CONFIG] | 0x04;
if (tb_9_9->text() == QString("1"))
ParameterSet[Set][P_LOOP_CONFIG] = ParameterSet[Set][P_LOOP_CONFIG] | 0x08;
if (cb_4_7->isChecked())
ParameterSet[Set][P_LOOP_CONFIG] = ParameterSet[Set][P_LOOP_CONFIG] | 0x10;
// if (cb_4_7->isChecked())
// ParameterSet[Set][P_LOOP_CONFIG] = ParameterSet[Set][P_LOOP_CONFIG] | 0x10;
 
ParameterSet[Set][P_LOOP_GAS_LIMIT] = get_Value(cb_9_1);
ParameterSet[Set][P_LOOP_THRESHOLD] = sb_9_2->value();
792,7 → 792,7
cb_4_4 = setCombo(cb_4_4, Set, FCSettings[P_DRUCK_D]);
cb_4_5 = setCombo(cb_4_5, Set, FCSettings[P_HOEHE_ACC]);
sb_4_6->setValue(FCSettings[P_HOEHE_GAIN]);
cb_4_7->setChecked(FCSettings[P_LOOP_CONFIG] & 0x10);
// cb_4_7->setChecked(FCSettings[P_LOOP_CONFIG] & 0x10);
}
// Seite 5
{
/QMK-Groundstation/trunk/Forms/wdg_Settings.ui
231,7 → 231,7
<enum>QFrame::Box</enum>
</property>
<property name="currentIndex">
<number>0</number>
<number>3</number>
</property>
<widget class="QWidget" name="page">
<layout class="QGridLayout" name="gridLayout_7">
1294,7 → 1294,7
</property>
</widget>
</item>
<item row="5" column="0" rowspan="2">
<item row="4" column="0" rowspan="2">
<widget class="QLabel" name="label_27">
<property name="font">
<font>
1307,7 → 1307,7
</property>
</widget>
</item>
<item row="5" column="1" rowspan="2" colspan="2">
<item row="4" column="1" rowspan="2" colspan="2">
<widget class="QComboBox" name="cb_4_3">
<property name="editable">
<bool>true</bool>
1339,7 → 1339,7
</item>
</widget>
</item>
<item row="5" column="3" rowspan="2">
<item row="4" column="3" rowspan="2">
<widget class="QLabel" name="label_33">
<property name="text">
<string>[0..32]</string>
1346,7 → 1346,7
</property>
</widget>
</item>
<item row="7" column="0" rowspan="2">
<item row="6" column="0" rowspan="2">
<widget class="QLabel" name="label_28">
<property name="font">
<font>
1359,7 → 1359,7
</property>
</widget>
</item>
<item row="7" column="1" rowspan="2" colspan="2">
<item row="6" column="1" rowspan="2" colspan="2">
<widget class="QComboBox" name="cb_4_4">
<property name="editable">
<bool>true</bool>
1391,7 → 1391,7
</item>
</widget>
</item>
<item row="7" column="3" rowspan="2">
<item row="6" column="3" rowspan="2">
<widget class="QLabel" name="label_34">
<property name="text">
<string>[0..250]</string>
1398,7 → 1398,7
</property>
</widget>
</item>
<item row="10" column="0" rowspan="4">
<item row="9" column="0" rowspan="4">
<widget class="QLabel" name="label_29">
<property name="font">
<font>
1411,7 → 1411,7
</property>
</widget>
</item>
<item row="10" column="1" rowspan="4" colspan="2">
<item row="9" column="1" rowspan="4" colspan="2">
<widget class="QComboBox" name="cb_4_5">
<property name="editable">
<bool>true</bool>
1443,7 → 1443,7
</item>
</widget>
</item>
<item row="10" column="3" rowspan="4">
<item row="9" column="3" rowspan="4">
<widget class="QLabel" name="label_35">
<property name="text">
<string>[0..250]</string>
1450,7 → 1450,7
</property>
</widget>
</item>
<item row="14" column="0">
<item row="13" column="0">
<widget class="QLabel" name="label_30">
<property name="font">
<font>
1463,7 → 1463,7
</property>
</widget>
</item>
<item row="14" column="1" colspan="2">
<item row="13" column="1" colspan="2">
<widget class="QSpinBox" name="sb_4_6">
<property name="maximum">
<number>50</number>
1470,7 → 1470,7
</property>
</widget>
</item>
<item row="14" column="3">
<item row="13" column="3">
<widget class="QLabel" name="label_36">
<property name="text">
<string>[0..50]</string>
1477,7 → 1477,7
</property>
</widget>
</item>
<item row="4" column="1">
<item row="3" column="1">
<spacer name="verticalSpacer_6">
<property name="orientation">
<enum>Qt::Vertical</enum>
1493,7 → 1493,7
</property>
</spacer>
</item>
<item row="9" column="1">
<item row="8" column="1">
<spacer name="verticalSpacer_8">
<property name="orientation">
<enum>Qt::Vertical</enum>
1509,7 → 1509,7
</property>
</spacer>
</item>
<item row="15" column="1">
<item row="14" column="1">
<spacer name="verticalSpacer_10">
<property name="orientation">
<enum>Qt::Vertical</enum>
1525,19 → 1525,6
</property>
</spacer>
</item>
<item row="3" column="1">
<widget class="QCheckBox" name="cb_4_7">
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text">
<string>3fach Schalter </string>
</property>
</widget>
</item>
<item row="0" column="3">
<widget class="QLabel" name="label_31">
<property name="text">
1575,7 → 1562,6
&lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:11pt; font-weight:600;&quot;&gt;Soll-Höhe:&lt;/span&gt;&lt;span style=&quot; font-size:11pt;&quot;&gt; Gibt die maximale Höhe an. Normalerweise wird hier ein Poti als Kanal der Funke eingetragen. Kleine Werte ermöglichen nur niedrige Maximalhöhen.&lt;/span&gt;&lt;span style=&quot; font-size:11pt; font-weight:600;&quot;&gt; &lt;/span&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:11pt;&quot;&gt;Fluganfänger sollten das Feature nutzen, hier evtl. 0 eintragen und den Höhenregler aktivieren (siehe oben). Dann kann es nicht passieren, dass der MikroKopter zu hoch steigt. Bei Nutzung des Höhenreglers als Schalter ist hier auch das entsprechende Poti einzutragen, um den Kanal der Funke damit festzulegen. &lt;/span&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:11pt; font-weight:600;&quot;&gt;Min Gas:&lt;/span&gt;&lt;span style=&quot; font-size:11pt;&quot;&gt; unter diesen Wert wird das Gas nicht gestellt, wenn die Höhe überschritten wurde. &lt;/span&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:11pt; font-weight:600;&quot;&gt;3-Fach-Schalter: &lt;/span&gt;&lt;span style=&quot; font-size:11pt; text-decoration: underline;&quot;&gt;Höhenschalter&lt;/span&gt;&lt;span style=&quot; font-size:11pt;&quot;&gt; kann auf 3-Poligen Schalter gelegt werden --&amp;gt; z.B. mit dem GPS-Schalter kombiniert&lt;br /&gt;Bei Mittelstellung ist die Höhenregelung dann aus&lt;/span&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:11pt; font-weight:600;&quot;&gt;P-Anteil:&lt;/span&gt;&lt;span style=&quot; font-size:11pt;&quot;&gt; Abhängigkeit von Rücknahme von Gas bei Höhe über. Je höher dieser Wert, desto kleiner ist der Flugbereich oberhalb der Maximalhöhe. &lt;/span&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:11pt; font-weight:600;&quot;&gt;Luftdruck-D:&lt;/span&gt;&lt;span style=&quot; font-size:11pt;&quot;&gt; Dämpft das Schwingverhalten des Höhenreglers. Geringste Luftdruckänderungen haben damit grosse Wirkung auf Gas. &lt;/span&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:11pt; font-weight:600;&quot;&gt;Z-ACC:&lt;/span&gt;&lt;span style=&quot; font-size:11pt;&quot;&gt; Dämpft das Schwingverhalten mittels des Beschleunigungssensors. &lt;/span&gt;&lt;/p&gt;
/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
////////////////////////////////////////////
 
64,51 → 63,6
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;
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
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
///////////////////////////////////
 
117,8 → 71,8
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_SETTINGS = 75;
static const int VERSION_OSD = 1;
static const int VERSION_MIXER = 1;
#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.14";
static const QString QA_VERSION_NR = "0.8.0";
 
#ifdef _BETA_
static const QString QA_VERSION = QA_VERSION_NR + " (BETA)";
63,7 → 63,7
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";
static const QString QA_HWVERSION = "FlightCtrl v0.73d & NaviCtrl v0.15c";
#endif
 
#ifdef Q_OS_LINUX
81,7 → 81,7
#endif
 
 
static const QString QA_DATE = "03.04.2009";
static const QString QA_DATE = "05.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";
115,6 → 115,11
 
static const int MaxNaviPos = 2000;
 
struct sMotor
{
int Speed[12];
};
 
struct sMode
{
int ID;