Jelajahi Sumber

modify v2r & UI issue

HAPO-9# 3 tahun lalu
induk
melakukan
72b9611c72

+ 9 - 0
src/ui/ui_ads_hmi_1px/ADCIntelligentVehicle.cpp

@@ -620,25 +620,34 @@ void ADCIntelligentVehicle::updateV2R(iv::v2r::v2r_send xv2rMsg)
     {
         miBroadcastGpsLat = xv2rMsg.radiobroadcastgpslat();
         miBroadcastGpsLon = xv2rMsg.radiobroadcastgpslon();
+        miobuSt = 0;
+    }
+    if(xv2rMsg.has_radiobroadcastrange())
+    {
         miBroadcastRange  = xv2rMsg.radiobroadcastrange();
         miBroadcastTrafficType = xv2rMsg.radiobroadcasttraffictype();
+        miobuSt = 0;
     }
     if(xv2rMsg.has_radiowarningspeedlimit())
     {
         miBroadcastSpeedLimit = xv2rMsg.radiobroadcastspeedlimit();
+        miobuSt = 0;
     }
     if(xv2rMsg.has_radiowarningtype())
     {
         miWarningType = xv2rMsg.radiowarningtype();
+        miobuSt = 0;
     }
 
     if(xv2rMsg.has_radiowarningspeedlimit())
     {
         miWarningSpeedLimit = xv2rMsg.radiowarningspeedlimit();
+        miobuSt = 0;
     }
     if(xv2rMsg.has_radioidentistart())
     {
         miIdentiStart = xv2rMsg.radioidentistart();
+        miobuSt = 0;
     }
 }
 

+ 3 - 3
src/v2x/CommunicatePlatform/mainwindow.cpp

@@ -478,7 +478,7 @@ void MainWindow::UpdateControl(const char *strdata, const unsigned int nSize, co
 
 void MainWindow::UpdateState(const char *strdata, const unsigned int nSize, const unsigned int index, const QDateTime *dt, const char *strmemname)
 {
-    qDebug()<<"[BRAINSTATE]:INTO";
+    //qDebug()<<"[BRAINSTATE]:INTO";
     iv::brain::brainstate xstate;
     if(!xstate.ParseFromArray(strdata,nSize))
     {
@@ -490,10 +490,10 @@ void MainWindow::UpdateState(const char *strdata, const unsigned int nSize, cons
         int type = xstate.vehicle_state();
         if(type==1) {
             //ui->textEdit->setText("[brainstate]: get vehicle stat is speed limit!");
-            qDebug()<<"[brainstate]: get vehicle stat is speed limit!";
+            //qDebug()<<"[brainstate]: get vehicle stat is speed limit!";
         } else if(type==2) {
             //ui->textEdit->setText("[brainstate]: get vehicle stat is stop!");
-            qDebug()<<"[brainstate]: get vehicle stat is stop!";
+            //qDebug()<<"[brainstate]: get vehicle stat is stop!";
         }
         if((type==1)||(type==2)) {
             m_radio->sendResponseMessage(type);

+ 2 - 1
src/v2x/CommunicatePlatform/radio.cpp

@@ -155,7 +155,7 @@ void Radio::serialPortInit()
 //    }
 
     m_serialPort_Radio = new QSerialPort();
-    m_serialPort_Radio->setPortName("/dev/ttyUSB0");
+    m_serialPort_Radio->setPortName("/dev/ttyUSB1");
     //m_serialPort_Radio->setPortName("/dev/pts/1");
     m_serialPort_Radio->setBaudRate(QSerialPort::Baud115200);
     m_serialPort_Radio->setParity(QSerialPort::NoParity);
@@ -477,6 +477,7 @@ void Radio::decodeData()
         // 防包太大
         if (m_data.size() > 2048) {
             qDebug() << "size too large";
+            m_data.clear();
             return;
         }
         //  ##