| 42,21 → 42,21 |
|---|
| |
| void cConnection::new_Data(QString Data) |
| { |
| Data = Data; |
| //Data = Data; |
| |
| while ((RxData.String.length() > 1) && (RxData.String.at(1) == '#')) |
| while ((RxData.str.size() > 1) && (RxData.str.substr(1,1) == string("#"))) |
| { |
| RxData.String.remove(0,1); |
| RxData.str = RxData.str.substr(1, RxData.str.size()); |
| } |
| |
| if (ToolBox::check_CRC(RxData.String)) |
| if (Parser::check_CRC(RxData.str)) |
| { |
| RxData.Input = RxData.String.toLatin1().data(); |
| RxData.input = (char *)RxData.str.c_str(); |
| emit(newData(RxData)); |
| } |
| else |
| { |
| emit(showTerminal(2, RxData.String)); |
| emit(showTerminal(2, QString(RxData.str.c_str()))); |
| } |
| |
| } |
| 72,11 → 72,11 |
|---|
| if (RXt[a] == '\r') |
| { |
| new_Data(QString("")); |
| RxData.String = QString(""); |
| RxData.str = string(""); |
| } |
| else |
| { |
| RxData.String = RxData.String + QString(RXt[a]); |
| RxData.str = RxData.str + string(&RXt[a]); |
| } |
| a++; |
| } |
| 124,7 → 124,7 |
|---|
| TTY->setPort(Address); //Port |
| TTY->open(); |
| |
| ToolBox::Wait(1000); |
| ToolBox::wait(1000); |
| |
| if (TTY->isOpen()) |
| { |
| 181,11 → 181,11 |
|---|
| if (Input[z] == '\r') |
| { |
| new_Data(QString("")); |
| RxData.String = QString(""); |
| RxData.str = string(""); |
| } |
| else |
| { |
| RxData.String = RxData.String + Input[z]; |
| RxData.str = RxData.str + Input[z].toAscii(); |
| } |
| } |
| } |
| 195,16 → 195,17 |
|---|
| if (b_isOpen) |
| { |
| QByteArray Temp; |
| QString TX_Data; |
| string TX_Data; |
| |
| if (CMD != '#') |
| { |
| TX_Data = ToolBox::Encode64(Data, Length); |
| TX_Data = Parser::encode64(Data, Length); |
| |
| TX_Data = QString("#") + (QString('a' + Address)) + QString(CMD) + TX_Data; |
| TX_Data = ToolBox::add_CRC(TX_Data) + '\r'; |
| char addr = 'a' + Address; |
| TX_Data = string("#") + (string(&addr)) + string(&CMD) + TX_Data; |
| TX_Data = Parser::add_CRC(TX_Data) + '\r'; |
| |
| Temp = QByteArray(TX_Data.toUtf8()); |
| Temp = QByteArray(TX_Data.c_str()); |
| |
| if (Resend) |
| { |
| 234,7 → 235,7 |
|---|
| break; |
| } |
| |
| emit(showTerminal(3, TX_Data)); |
| emit(showTerminal(3, QString(TX_Data.c_str()))); |
| } |
| return true; |
| } |