Subversion Repositories Projects

Compare Revisions

Ignore whitespace Rev 710 → Rev 711

/QMK-Groundstation/trunk/Global/Class_HandlerIP/HandlerIP.h
24,7 → 24,12
static const int ID_COMMUNICATOR = 1;
static const int ID_SCOPE = 11;
static const int ID_SETTINGS = 12;
static const int ID_MAPS = 13;
static const int ID_VOICE = 14;
static const int ID_LOGGER = 15;
static const int ID_SERVER = 100;
 
 
class HandlerIP
{
public:
/QMK-Groundstation/trunk/Global/Class_Input/Input_TCP.cpp
81,6 → 81,7
Temp = QByteArray(t_Data.toAscii());
 
TCP_Socket->write(Temp);
TCP_Socket->flush();
 
// qDebug(t_Data.toLatin1().data());
}
138,32 → 139,21
 
void Input_TCP::slot_TCP_ReadLine()
{
// if (TCP_Socket->canReadLine())
{
QString t_Data = QString(TCP_Socket->readLine(TCP_Socket->bytesAvailable())).remove(QChar('\n'));
// QString t_Data = QString(TCP_Socket->readLine(TCP_Socket->bytesAvailable())).remove(QChar('\n'));
QString t_Data = QString(TCP_Socket->readAll());
 
if ((t_Data.length() > 3) && (t_Data[t_Data.length() - 1] == '\r'))
{
emit(sig_NewData(t_Data));
}
}
QStringList l_Data;
l_Data = t_Data.split('\n');
 
for (int z = 0; z < l_Data.count(); z++)
{
 
/* int Len = Input.length();
 
for (int z = 0; z < Len; z++)
{
if (Input[z] == '\r')
if ((l_Data[z].length() > 3) && (t_Data[l_Data[z].length() - 1] == '\r'))
{
new_Data(QString(""));
RxData.String = QString("");
emit(sig_NewData(l_Data[z]));
// qDebug(QString("DATA: _" + l_Data[z] + "_ < END").toLatin1().data());
}
else
{
RxData.String = RxData.String + Input[z];
}
}
*/
}
 
void Input_TCP::slot_TCP_Error(QAbstractSocket::SocketError Error)
/QMK-Groundstation/trunk/Global/Class_Input/Input_TCP.h
23,6 → 23,7
#include <QTcpServer>
#include <QTcpSocket>
#include <QTimer>
#include <QStringList>
 
#include "Input.h"
 
/QMK-Groundstation/trunk/Global/Kopter.h
20,7 → 20,6
#define KOPTER_H
 
#include <QString>
#include <QRgb>
 
#include <stdint.h>
 
47,6 → 46,4
 
static const QString DEF_DebugNames[] = {"Integral Nick", "Integral Roll", "ACC Nick", "ACC Roll", "Gyro Gier", "Hoehen-Wert", "ACC Z", "GAS", "Kompass-Value", "Spannung", "Empfang", "Ersatzkompass", "Motor Vorne", "Motor Hinten", "Motor Links", "Motor Rechts", "Analog 16", "Distance", "OSD-Bar", "MK3Mag", "Servo", "Nick", "Roll", "Analog 23", "Analog 24", "Analog 25", "Analog 26", "Kalman Max", "Analog 28", "Kalman K", "GPS Nick", "GPS Roll"};
 
static const QRgb DEF_DebugColors[] = {0x00FF0000, 0x0000FF00, 0x00FFFF00, 0x000000FF, 0x00FF00FF, 0x0000FFFF, 0x00FFFFFF, 0x00660000, 0x00006600, 0x00666600, 0x00000066, 0x00660066, 0x000066, 0x00666666, 0x00990000, 0x00009900, 0x00999900, 0x00000099, 0x00990099, 0x00009999, 0x00999999, 0x00CC0000, 0x0000CC00, 0x00CCCC00, 0x000000CC, 0x00CC00CC, 0x0000CCCC, 0x00CCCCCC, 0x0066FF99, 0x009966FF, 0x00FF9966, 0x0099FF66};
 
#endif // KOPTER_H