Subversion Repositories Projects

Compare Revisions

Ignore whitespace Rev 448 → Rev 449

/QMK-Groundstation/branches/libMK/Classes/ToolBox.cpp
49,9 → 49,10
}*/
 
// Datensatz nach QString
QString ToolBox::dataToQString(int Data[150], int Start, int End)
QString ToolBox::dataToQString(char data[MAX_DATA_SIZE], int start, int end)
{
return QString(Parser::dataToString(Data, Start, End).c_str());
return QString(data);
//return QString(Parser::dataToString(data, start, end));
}
 
// Alle Icons
/QMK-Groundstation/branches/libMK/Classes/ToolBox.h
27,7 → 27,7
class ToolBox
{
public :
static QString dataToQString(int Data[150], int Start = 0, int End = 150);
static QString dataToQString(char data[MAX_DATA_SIZE], int Start = 0, int End = 150);
static QIcon Icon(int ID);
//static QString get_Float(long Wert, int Count);
static void wait(int Time);
/QMK-Groundstation/branches/libMK/Classes/cConnection.cpp
44,7 → 44,7
{
//Data = Data;
 
while ((RxData.str.size() > 1) && (RxData.str.substr(1,1) == string("#")))
/* while ((RxData.str.size() > 1) && (RxData.str.substr(1,1) == string("#")))
{
RxData.str = RxData.str.substr(1, RxData.str.size());
}
58,11 → 58,12
{
emit(showTerminal(2, QString(RxData.str.c_str())));
}
 
*/
}
 
void cConnection::slot_newDataReceived(const QByteArray &dataReceived)
{
/*
const char *RXt;
RXt = dataReceived.data();
int a = 0;
80,6 → 81,7
}
a++;
}
*/
}
 
bool cConnection::isOpen()
181,26 → 183,25
if (Input[z] == '\r')
{
new_Data(QString(""));
RxData.str = string("");
//RxData.str = string("");
}
else
{
RxData.str = RxData.str + Input[z].toAscii();
//RxData.str = RxData.str + Input[z].toAscii();
}
}
}
 
bool cConnection::send_Cmd(char CMD, int Address, char Data[150],unsigned int Length, bool Resend)
bool cConnection::send_Cmd(char CMD, int Address, char Data[MAX_DATA_SIZE],unsigned int Length, bool Resend)
{
if (b_isOpen)
if (b_isOpen) //is_connected()
{
QByteArray Temp;
string TX_Data;
 
/*
if (CMD != '#')
{
TX_Data = Parser::encode64(Data, Length);
 
string TX_Data;
char addr = 'a' + Address;
TX_Data = string("#") + (string(&addr)) + string(&CMD) + TX_Data;
TX_Data = Parser::add_CRC(TX_Data) + '\r';
212,6 → 213,7
o_Timer->start(2000);
s_ReSend = Temp;
}
emit(showTerminal(3, QString(TX_Data.c_str())));
}
else
{
220,7 → 222,7
Temp[a] = Data[a];
}
}
 
*/
switch(i_Type)
{
case C_TTY :
234,8 → 236,6
}
break;
}
 
emit(showTerminal(3, QString(TX_Data.c_str())));
}
return true;
}
/QMK-Groundstation/branches/libMK/Classes/cConnection.h
40,7 → 40,7
bool isOpen();
bool Open(int Typ, QString Address);
bool Close();
bool send_Cmd(char CMD, int Address, char Data[150],unsigned int Length, bool Resend = true);
bool send_Cmd(char CMD, int Address, char Data[MAX_DATA_SIZE],unsigned int Length, bool Resend = true);
void stop_ReSend();
 
private:
52,7 → 52,7
 
bool b_isOpen;
int i_Type;
sRxData RxData;
// sRxData RxData;
 
void new_Data(QString Data);
 
66,7 → 66,7
// void slot_Error(QAbstractSocket::SocketError Error);
 
signals:
void newData(sRxData RxData);
// void newData(sRxData RxData);
void showTerminal(int Typ, QString Text);
};
 
/QMK-Groundstation/branches/libMK/Classes/cSettings.cpp
82,7 → 82,7
// Config der Analogwert-Anzeige (Plotter / CVS)
void cSettings::write_Settings_Analog(int ID)
{
QString Hardware = QString(HardwareType[ID].c_str());
QString Hardware = QString(HardwareType[ID]);
 
QSettings Setting("KeyOz-Net", "QMK-Groundstation");
 
97,7 → 97,7
QBitArray Def_View;
Def_View.fill(true,MaxAnalog);
 
QString Hardware = QString(HardwareType[ID].c_str());
QString Hardware = QString(HardwareType[ID]);
 
QSettings Setting("KeyOz-Net", "QMK-Groundstation");
 
110,7 → 110,7
// Labels der Analogwerte.
void cSettings::write_Settings_AnalogLabels(int ID)
{
QString Hardware = QString(HardwareType[ID].c_str());
QString Hardware = QString(HardwareType[ID]);
 
QSettings Setting("KeyOz-Net", "QMK-Groundstation-Labels");
 
125,7 → 125,7
 
void cSettings::read_Settings_AnalogLabels(int ID)
{
QString Hardware = QString(HardwareType[ID].c_str());
QString Hardware = QString(HardwareType[ID]);
 
QSettings Setting("KeyOz-Net", "QMK-Groundstation-Labels");