|
@@ -164,7 +164,7 @@ Line::Line(QWidget *parent)
|
|
|
portui.comboBox = NULL;
|
|
|
down = 0;
|
|
|
portdialog = new QDialog();
|
|
|
-
|
|
|
+ timer_id_searil = 0;
|
|
|
portui.setupUi(portdialog);
|
|
|
timerid=startTimer(280);
|
|
|
}
|
|
@@ -1394,7 +1394,9 @@ void Line::SetControlDateTime()
|
|
|
SerialSend(buf);
|
|
|
qDebug("%s",qtime.toString("yyyy-MM-dd hh:mm:ss").toUtf8().data());
|
|
|
}
|
|
|
-void Line::timerEvent(QTimerEvent *event)
|
|
|
+
|
|
|
+
|
|
|
+void Line::timerEvent_old(QTimerEvent *event)
|
|
|
{
|
|
|
int i;
|
|
|
unsigned int int_val;
|
|
@@ -1449,35 +1451,35 @@ void Line::timerEvent(QTimerEvent *event)
|
|
|
switch(sendflag)
|
|
|
{
|
|
|
case 1:
|
|
|
- ReadStore();
|
|
|
- break;
|
|
|
+ ReadStore();
|
|
|
+ break;
|
|
|
case 2:
|
|
|
- GetControlDateTime();
|
|
|
- break;
|
|
|
- case 3:
|
|
|
- ReadAutoSealTime();
|
|
|
- break;
|
|
|
- case 4:
|
|
|
- ReadConfig();
|
|
|
- break;
|
|
|
- case 5:
|
|
|
- ReadCoefExp();
|
|
|
- break;
|
|
|
- case 6:
|
|
|
- ReadUart1TimeOut();
|
|
|
- break;
|
|
|
- case 7:
|
|
|
- ReadTankCapicity();
|
|
|
- break;
|
|
|
- case 8:
|
|
|
- ReadBlankSeal();
|
|
|
- break;
|
|
|
- case 9:
|
|
|
- ReadControlSoftwareVer();
|
|
|
- break;
|
|
|
- default:
|
|
|
- sendflag=0;
|
|
|
- return;
|
|
|
+ GetControlDateTime();
|
|
|
+ break;
|
|
|
+ case 3:
|
|
|
+ ReadAutoSealTime();
|
|
|
+ break;
|
|
|
+ case 4:
|
|
|
+ ReadConfig();
|
|
|
+ break;
|
|
|
+ case 5:
|
|
|
+ ReadCoefExp();
|
|
|
+ break;
|
|
|
+ case 6:
|
|
|
+ ReadUart1TimeOut();
|
|
|
+ break;
|
|
|
+ case 7:
|
|
|
+ ReadTankCapicity();
|
|
|
+ break;
|
|
|
+ case 8:
|
|
|
+ ReadBlankSeal();
|
|
|
+ break;
|
|
|
+ case 9:
|
|
|
+ ReadControlSoftwareVer();
|
|
|
+ break;
|
|
|
+ default:
|
|
|
+ sendflag=0;
|
|
|
+ return;
|
|
|
}
|
|
|
++sendflag;
|
|
|
#else
|
|
@@ -1489,6 +1491,19 @@ void Line::timerEvent(QTimerEvent *event)
|
|
|
|
|
|
}
|
|
|
|
|
|
+void Line::timerEvent(QTimerEvent *event)
|
|
|
+{
|
|
|
+ if(event->timerId() == timer_id_searil)
|
|
|
+ {
|
|
|
+ //label2 每隔1秒+1
|
|
|
+ Receive_Data();
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+ timerEvent_old(event);
|
|
|
+ }
|
|
|
+}
|
|
|
+
|
|
|
void Line::readver()
|
|
|
{
|
|
|
int retry;
|
|
@@ -1926,7 +1941,8 @@ void Line::on_openfile()
|
|
|
if (!fileName.isEmpty())
|
|
|
{
|
|
|
QFile qfile(fileName);
|
|
|
- qDebug("%s", fileName.toUtf8());
|
|
|
+ fileName.toUtf8();
|
|
|
+ //qDebug("%s", fileName.toUtf8());
|
|
|
if (!qfile.open(QIODevice::ReadOnly))
|
|
|
{
|
|
|
return;
|
|
@@ -2086,14 +2102,33 @@ void Line::Receive_Data()
|
|
|
|
|
|
if(myserial && myserial->isOpen())
|
|
|
{
|
|
|
- tt = myserial->readAll();
|
|
|
+ tt = myserial->readAll();
|
|
|
q = q+tt;
|
|
|
|
|
|
+ if(tt.isEmpty())
|
|
|
+ {
|
|
|
+
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+ if( timer_id_searil != 0)
|
|
|
+ {
|
|
|
+ killTimer(timer_id_searil);
|
|
|
+ }
|
|
|
+ timer_id_searil = startTimer(50);
|
|
|
+ return;
|
|
|
+ }
|
|
|
//qDebug("avans received: %x", str2));
|
|
|
}
|
|
|
|
|
|
{
|
|
|
- if(recv_datalen == 0){
|
|
|
+ if(recv_datalen == 0)
|
|
|
+ {
|
|
|
+ if(q.isEmpty())
|
|
|
+ {
|
|
|
+ return;
|
|
|
+ }
|
|
|
+
|
|
|
if((q.at(0)==0x39) && (q.at(1)==0x01)) //远程标定
|
|
|
{
|
|
|
memcpy(recv_buffer+recv_datalen, q.data(), q.length());
|