tangchao0503/airborne_CO2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

优化气体传感器数据解析和消息传递

Browse Source 
- 使用union解析CO2/H2O数据，解决大小端问题
- 添加LINECOMMEND/LINEDATASHOW消息类型区分
- 添加WorkingState/SavingDate原子变量
- 修正气体传感器部分逻辑
This commit is contained in:
xin
2026-03-04 10:22:51 +08:00
parent 82608bfa0a
commit e7cd1e93a6
5 changed files with 172 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

132
Source/IrisSensor_Gas_P0.cpp
View File

@ -86,50 +86,114 @@ int IrisSensor_Gas_P0::RecvData_Chk(/*std::string sRecv*/)
return 0;
}
union Union16 {
short s16; // 有符号短整型 (处理正负)
unsigned short u16; // 无符号短整型
unsigned char b[2]; // 字节数组
};
// 用于处理4字节（32位）数据
union Union32 {
int s32; // 有符号长整型
unsigned int u32; // 无符号长整型
unsigned char b[4]; // 字节数组
};
int IrisSensor_Gas_P0::ParseMeasuredData_Chk()
{
if (m_sRecv.size()!=0x1f+4)
// 如果长度不匹配（0x1f + 4 = 35）
if (m_sRecv.size() != 35)
{
qDebug() << "Err:Sensor_Gas ParseData Failed,Incorrect Data Length.Exit Code:1";
qDebug() << "Err:Sensor_Gas ParseData Failed, Incorrect Data Length. Exit Code:1";
return 1;
}
else
{
unsigned char uc12, uc13, uc14, uc15, uc16,uc17,uc18,uc19,uc28,uc29,uc30,uc31,uc32, uc33;
char aaaa[34];
memcpy(aaaa,m_sRecv.c_str(),m_sRecv.size());
uc32 = m_sRecv[32];
uc33 = m_sRecv[33];
m_fTPTemperature = (uc32 * 256 + uc33) / 100;
Union16 u16;
Union32 u32;
uc30 = m_sRecv[30];
uc31 = m_sRecv[31];
m_fPB = (uc30 * 256 + uc31) / 10;
// 1. 解析温度 (Index 32, 33) - 假设是 short (16-bit)
// 大端转小端：高位 index[32] 放在 b[1]，低位 index[33] 放在 b[0]
u16.b[1] = static_cast<unsigned char>(m_sRecv[32]);
u16.b[0] = static_cast<unsigned char>(m_sRecv[33]);
m_fTPTemperature = u16.s16 / 100.0f; // 直接使用 s16 即可自动处理正负
uc28 = m_sRecv[28];
uc29 = m_sRecv[29];
m_fPB = (uc28 * 256 + uc29) / 10;
// 2. 解析 PB (Index 30, 31)
u16.b[1] = static_cast<unsigned char>(m_sRecv[30]);
u16.b[0] = static_cast<unsigned char>(m_sRecv[31]);
// 注意：你原代码里这里和下面都赋值给了 m_fPB，是否其中一个是别的变量？
float fPB_1 = u16.s16 / 10.0f;
uc16 = m_sRecv[16];
uc17 = m_sRecv[17];
uc18 = m_sRecv[18];
uc19 = m_sRecv[19];
m_ulCO2 = uc16*256*256*256 + uc17*256*256 + uc18*256 + uc19;
// 3. 解析 PB (Index 28, 29)
u16.b[1] = static_cast<unsigned char>(m_sRecv[28]);
u16.b[0] = static_cast<unsigned char>(m_sRecv[29]);
m_fPB = u16.s16 / 10.0f;
uc12 = m_sRecv[12];
uc13 = m_sRecv[13];
uc14 = m_sRecv[14];
uc15 = m_sRecv[15];
m_ulH2O = uc12 * 256 * 256 * 256 + uc13 * 256 * 256 + uc14 * 256 + uc15;
// 4. 解析 CO2 (Index 16-19) - 32位
u32.b[3] = static_cast<unsigned char>(m_sRecv[16]);
u32.b[2] = static_cast<unsigned char>(m_sRecv[17]);
u32.b[1] = static_cast<unsigned char>(m_sRecv[18]);
u32.b[0] = static_cast<unsigned char>(m_sRecv[19]);
m_ulCO2 = u32.s32; // 如果 CO2 是正数，s32 和 u32 一样；如果有负数，s32 会正确解释补码
return 0;
}
// 5. 解析 H2O (Index 12-15) - 32位
u32.b[3] = static_cast<unsigned char>(m_sRecv[12]);
u32.b[2] = static_cast<unsigned char>(m_sRecv[13]);
u32.b[1] = static_cast<unsigned char>(m_sRecv[14]);
u32.b[0] = static_cast<unsigned char>(m_sRecv[15]);
m_ulH2O = u32.s32;
return 0;
}
// int IrisSensor_Gas_P0::ParseMeasuredData_Chk()
// {
// if (m_sRecv.size()!=0x1f+4)
// {
// qDebug() << "Err:Sensor_Gas ParseData Failed,Incorrect Data Length.Exit Code:1";
// return 1;
// }
// else
// {
// unsigned char uc12, uc13, uc14, uc15, uc16,uc17,uc18,uc19,uc28,uc29,uc30,uc31,uc32, uc33;
// char aaaa[34];
// memcpy(aaaa,m_sRecv.c_str(),m_sRecv.size());
//
// uc32 = m_sRecv[32];
// uc33 = m_sRecv[33];
// m_fTPTemperature = (uc32 * 256 + uc33) / 100;
//
// uc30 = m_sRecv[30];
// uc31 = m_sRecv[31];
// m_fPB = (uc30 * 256 + uc31) / 10;
//
// uc28 = m_sRecv[28];
// uc29 = m_sRecv[29];
// m_fPB = (uc28 * 256 + uc29) / 10;
//
// uc16 = m_sRecv[16];
// uc17 = m_sRecv[17];
// uc18 = m_sRecv[18];
// uc19 = m_sRecv[19];
// m_ulCO2 = uc16*256*256*256 + uc17*256*256 + uc18*256 + uc19;
//
// uc12 = m_sRecv[12];
// uc13 = m_sRecv[13];
// uc14 = m_sRecv[14];
// uc15 = m_sRecv[15];
// m_ulH2O = uc12 * 256 * 256 * 256 + uc13 * 256 * 256 + uc14 * 256 + uc15;
//
//
// return 0;
// }
//
// return 0;
// }
int IrisSensor_Gas_P0::Initialize(std::string ucPortNumber)
{
QString qstrPortName = QString::fromStdString(ucPortNumber);
@ -167,7 +231,7 @@ int IrisSensor_Gas_P0::GetVersion()
return 0;
}// 02 01 09 F4
int IrisSensor_Gas_P0::GetMeasuredData(unsigned long &ulCO2, unsigned long &ulH2O, float &fTPTemperature, float &fPP, float &fPB)
int IrisSensor_Gas_P0::GetMeasuredData( double &ulCO2, double &ulH2O, float &fTPTemperature, float &fPP, float &fPB)
{
QByteArray qbSend;
qbSend.append(0x02);
@ -184,11 +248,13 @@ int IrisSensor_Gas_P0::GetMeasuredData(unsigned long &ulCO2, unsigned long &ulH2
ParseMeasuredData_Chk();
ulCO2 = m_ulCO2*1.0;
ulH2O = m_ulH2O*1.0;
ulCO2 = m_ulCO2*1.0/10;
ulH2O = m_ulH2O*1.0/10;
fTPTemperature = m_fTPTemperature;
fPP = m_fPP;
fPB = m_fPB;
ulCO2=ulCO2<0?0:ulCO2;
ulH2O=ulH2O<0?0:ulH2O;
return 0;
}
@ -275,7 +341,7 @@ int IrisSensor_Gas_P0::ResetCalibration(char cChannel)
qbSend.append(ucChksum);
SendData_Chk(qbSend.toStdString());
return 0;
}