Explorar el Código

解决PIS系统协议中存在的问题

lishengyin hace 3 años
padre
commit
1d6161206c

BIN
lib/libmodules.so


+ 3 - 3
modules/dataType/include/PIDSClientResultMsg.h

@@ -44,15 +44,15 @@ public:
         data[15] = this->TrainLine;
         data[16] = this->Train;
 
-        int id = 0;
-        for(int i=0; i < 18; i+=3)
+        int id = 1;
+        for(int i = 0; i < 18; i+=3)
         {
             data[17+i] = this->data[id].Grade;
             data[18+i] = (this->data[id].Num & 0x00FF);
             data[19+i] = (this->data[id].Num & 0xFF00) >> 8;
             id++;
         }
-
+        
         int16_t crc = Crc16::GetCRC16(data, 9, length);
         data[45] = (crc & 0x00FF);
         data[46] = (crc & 0xFF00) >> 8; 

+ 4 - 3
modules/userApp/src/user_app.cpp

@@ -193,7 +193,8 @@ namespace MIVA
         // 查询数据
         vector<vector<std::string>> sqlRet;
         PIDSClientResultMsg clentResultMsg;
-
+        clentResultMsg.Train = 04;
+        clentResultMsg.TrainLine = 01;
         SqlWriter sqlSelect("SELECT CarId,Grade,Num FROM MIVA_DB.`CarData`");
         sqlSelect << sqlRet;
         if(sqlRet.empty()){
@@ -216,7 +217,7 @@ namespace MIVA
         // 传输至PIS系统
         struct sockaddr addrDst;
         makeAddr(&addrDst,this->PIS_ip.c_str(),this->PIS_port);//UDP数据发送地址
-        this->m_udpClient->send((char *)data,&addrDst, sizeof(struct sockaddr_in));
+        this->m_udpClient->send((char *)data,48,&addrDst, sizeof(struct sockaddr_in));
 
         // 传输至Netty端
         if(this->m_tcpClient->alive()){
@@ -333,7 +334,7 @@ namespace MIVA
     uint32_t UserApp::DataCalculation(uint32_t noLoad, uint32_t dynamicLoad, int num)
     {
         uint32_t result;
-
+        
 
         return result;
     }

BIN
source/bin/FP16/yolov5s.engine


BIN
source/bin/INT8/yolov5s.engine


BIN
source/bin/main


+ 1 - 1
source/config/config.ini

@@ -5,7 +5,7 @@ Netty_IdName = Netty
 
 [PIS]
 PIS_ip = 192.168.31.95
-PIS_port = 2022
+PIS_port = 8091
 PIS_IdName = PIS
 
 [MySql]