Subversion Repositories Projects

Compare Revisions

Ignore whitespace Rev 312 → Rev 313

/QMK-Groundstation/ChangeLog.txt
155,3 → 155,10
* Pfad für Map-Cache einstellbar
* Anfliegen eines Zielpunktes aus der Map heraus moglich.
* GPS-Mode Anzeige im Cockpit (Free, Position Hold, Coming Home, Range Limit)
 
######################################
# 19.03.2009 * Version 0.7.9 -> 0.7.10
 
Neu:
====
* Einstelldialog für MotorMixer.
/QMK-Groundstation/TODO.TXT
5,12 → 5,13
 
DONE ** Anzeigen von Flugdaten im Cockpit.
** Übertragen von Targets und Waypoints.
** Icons und Iconhandling überarbeiten.
DONE ** Icons und Iconhandling überarbeiten.
** Help-Texte bei den Settings aus Datei laden.
 
* Settings-Vergleich
* Motorregler als Poties auf angedeutetem MK.
* Flashen der AVR's (Bootloader).
* Software-Update ohne AVRDUDE.
* Sofftwareupdate für NaviCtrl.
* Software-Update für NaviCtrl.
 
* Lösen der Tabs als einzelne Fenster ermöglichen.
/QMK-Groundstation/trunk/Classes/cConnection.cpp
23,7 → 23,10
i_Type = 0;
 
TTY = new ManageSerialPort();
o_Timer = new QTimer(this);
 
connect(o_Timer, SIGNAL(timeout()), SLOT(slot_Timer()));
 
TTY->setBaudRate(BAUD57600); //BaudRate
TTY->setDataBits(DATA_8); //DataBits
TTY->setParity(PAR_NONE); //Parity
201,12 → 204,13
TX_Data = QString("#") + (QString('a' + Address)) + QString(CMD) + TX_Data;
TX_Data = ToolBox::add_CRC(TX_Data) + '\r';
 
Temp = QByteArray(TX_Data.toUtf8());
 
if (Resend)
{
// LastSend = TX_Data;
// TickerEvent[0] = true;
o_Timer->start(2000);
s_ReSend = Temp;
}
Temp = QByteArray(TX_Data.toUtf8());
}
else
{
234,3 → 238,27
}
return true;
}
 
void cConnection::stop_ReSend()
{
o_Timer->stop();
}
 
void cConnection::slot_Timer()
{
switch(i_Type)
{
case C_TTY :
{
TTY->sendData(s_ReSend);
}
break;
case C_IP :
{
TcpSocket->write(s_ReSend);
}
break;
}
 
emit(showTerminal(3, QString(s_ReSend)));
}
/QMK-Groundstation/trunk/Classes/cConnection.h
21,6 → 21,7
 
#include <QObject>
#include <QTcpSocket>
#include <QTimer>
 
#include "ToolBox.h"
#include "../global.h"
39,10 → 40,15
bool Open(int Typ, QString Address);
bool Close();
bool send_Cmd(char CMD, int Address, char Data[150],unsigned int Length, bool Resend = true);
void stop_ReSend();
 
private:
ManageSerialPort *TTY;
QTcpSocket *TcpSocket;
QTimer *o_Timer;
 
QByteArray s_ReSend;
 
bool b_isOpen;
int i_Type;
sRxData RxData;
54,6 → 60,8
void slot_IP_Connected();
void slot_IP_Disconnect();
void slot_IP_ReadLine();
 
void slot_Timer();
// void slot_Error(QAbstractSocket::SocketError Error);
 
signals:
/QMK-Groundstation/trunk/Forms/dlg_MotorMixer.cpp
291,7 → 291,7
void dlg_MotorMixer::read_Mixer()
{
TX_Data[0] = 0;
o_Connection->send_Cmd('n', ADDRESS_FC, TX_Data, 1, false);
o_Connection->send_Cmd('n', ADDRESS_FC, TX_Data, 1, true);
}
 
// Motordaten auslesen
298,13 → 298,13
void dlg_MotorMixer::slot_pb_READ()
{
TX_Data[0] = 0;
o_Connection->send_Cmd('n', ADDRESS_FC, TX_Data, 1, false);
o_Connection->send_Cmd('n', ADDRESS_FC, TX_Data, 1, true);
}
 
void dlg_MotorMixer::slot_pb_WRITE()
{
int Length = get_MotorConfig();
o_Connection->send_Cmd('m', ADDRESS_FC, TX_Data, Length, false);
o_Connection->send_Cmd('m', ADDRESS_FC, TX_Data, Length, true);
}
 
void dlg_MotorMixer::slot_pb_LOAD()
/QMK-Groundstation/trunk/Forms/mktool.cpp
724,10 → 724,6
{
if (!f_Map->isVisible())
{
// delete f_Map;
// f_Map = new dlg_Map(this);
// f_Map->create_Map(Settings);
 
f_Map->show();
}
}
1140,7 → 1136,7
if ((tab_Main->currentWidget()->objectName() == QString("Tab_2")) && (f_Settings->listWidget->currentRow() == 1))
{
TX_Data[0] = 0;
o_Connection->send_Cmd('p', ADDRESS_FC, TX_Data, 0, true);
o_Connection->send_Cmd('p', ADDRESS_FC, TX_Data, 0, false);
 
Ticker->setInterval(500);
TickerEvent[1] = true;
1182,7 → 1178,7
lb_Status->setText(tr("Lese FlightCtrl-Settings aus."));
TX_Data[0] = f_Settings->sb_Set->value();
TX_Data[1] = 0;
o_Connection->send_Cmd('q', ADDRESS_FC, TX_Data, 1);
o_Connection->send_Cmd('q', ADDRESS_FC, TX_Data, 1, true);
}
 
void MKTool::slot_SetFCSettings() // DONE 0.71g
1191,7 → 1187,7
 
lb_Status->setText(tr("Schreibe FlightCtrl-Settings."));
 
o_Connection->send_Cmd('s', ADDRESS_FC, TX_Data2, MaxParameter + 2, false);
o_Connection->send_Cmd('s', ADDRESS_FC, TX_Data2, MaxParameter + 2, true);
}
 
 
1401,6 → 1397,8
case 'N' :
if (ToolBox::Decode64(RX))
{
o_Connection->stop_ReSend();
 
if (RX.Decode[0] == VERSION_MIXER)
{
f_MotorMixer->set_MotorConfig(RX);
1411,6 → 1409,8
case 'M' :
if (ToolBox::Decode64(RX))
{
o_Connection->stop_ReSend();
 
if (RX.Decode[0] == 1)
{
lb_Status->setText(tr("MotorMixer-Daten in FC geschrieben."));
1436,7 → 1436,7
case 'Q' : // DONE 0.71g
if (ToolBox::Decode64(RX))
{
TickerEvent[0] = false;
o_Connection->stop_ReSend();
 
if (RX.Decode[1] == VERSION_SETTINGS)
{
1445,7 → 1445,6
{
FCSettings[a] = RX.Decode[a + 2];
}
//show_ParameterSet(Settings_ID);
f_Settings->show_FCSettings(Settings_ID, FCSettings);
f_Settings->pb_Read->setEnabled(true);
f_Settings->pb_Write->setEnabled(true);
1462,7 → 1461,7
break;
// Settings geschrieben
case 'S' : // DONE 0.71g
TickerEvent[0] = false;
o_Connection->stop_ReSend();
break;
}
 
1486,6 → 1485,8
case 'L' : // DONE 0.71g
if (ToolBox::Decode64(RX))
{
o_Connection->stop_ReSend();
 
int LCD[150];
memcpy(LCD,RX.Decode, sizeof(RX.Decode));
 
1493,8 → 1494,6
 
LCD_Page = RX.Decode[0];
LCD_MAX_Page = RX.Decode[1];
 
TickerEvent[0] = false;
}
break;
// Analoglabels
1501,6 → 1500,8
case 'A' : // DONE 0.71g
if (ToolBox::Decode64(RX))
{
o_Connection->stop_ReSend();
 
int Position = RX.Decode[0];
if (Position != 31)
{
1540,7 → 1541,7
case 'V' : // DONE 0.71h
if (ToolBox::Decode64(RX))
{
TickerEvent[0] = false;
o_Connection->stop_ReSend();
 
Mode.ID = HardwareID;
Mode.VERSION_MAJOR = RX.Decode[0];
/QMK-Groundstation/trunk/Forms/wdg_Settings.ui
1854,30 → 1854,6
</widget>
</item>
</layout>
<zorder>label_37</zorder>
<zorder>cb_5_1</zorder>
<zorder>label_44</zorder>
<zorder>label_38</zorder>
<zorder>cb_5_2</zorder>
<zorder>label_45</zorder>
<zorder>label_39</zorder>
<zorder>cb_5_3</zorder>
<zorder>label_46</zorder>
<zorder>label_40</zorder>
<zorder>sb_5_4</zorder>
<zorder>label_47</zorder>
<zorder>label_41</zorder>
<zorder>sb_5_5</zorder>
<zorder>label_48</zorder>
<zorder>label_42</zorder>
<zorder>cb_5_6</zorder>
<zorder>label_49</zorder>
<zorder>label_43</zorder>
<zorder>sb_5_7</zorder>
<zorder>label_50</zorder>
<zorder>label_133</zorder>
<zorder>cb_5_8</zorder>
<zorder>label_135</zorder>
</widget>
</item>
<item row="0" column="1">
4912,8 → 4888,9
<widget class="QLabel" name="label_153">
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
<weight>50</weight>
<italic>false</italic>
<bold>false</bold>
</font>
</property>
<property name="text">
4920,8 → 4897,8
<string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
p, li { white-space: pre-wrap; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Sans Serif'; font-size:11pt; font-weight:600; font-style:normal;&quot;&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Position Hold Login Time:&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Sans Serif'; font-size:10pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Position Hold Login Time:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
</widget>
</item>
/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.10";
static const QString QA_VERSION_NR = "0.7.11";
 
#ifdef _BETA_
static const QString QA_VERSION = QA_VERSION_NR + " (BETA)";
81,7 → 81,7
#endif
 
 
static const QString QA_DATE = "19.03.2009";
static const QString QA_DATE = "22.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";