修改等值覆冰厚度等计算

N938
XI.CHEN 6 months ago
parent dc4b2fbeed
commit e943c79efc

@ -3623,9 +3623,9 @@ int CPhoneDevice::GetIceData(IDevice::ICE_INFO *iceInfo, IDevice::ICE_TAIL *iceT
Data_DEF airt; Data_DEF airt;
//等值覆冰厚度, 综合悬挂载荷, 不均衡张力差 置0 //等值覆冰厚度, 综合悬挂载荷, 不均衡张力差 置0
iceInfo->equal_icethickness = 0; iceInfo->equal_icethickness = 0xff;
iceInfo->tension = 0; iceInfo->tension = 0xff;
iceInfo->tension_difference = 0; iceInfo->tension_difference = 0xff;
bool status = 1; bool status = 1;
int pullno = 0; int pullno = 0;
@ -3650,6 +3650,8 @@ int CPhoneDevice::GetIceData(IDevice::ICE_INFO *iceInfo, IDevice::ICE_TAIL *iceT
status = 0; status = 0;
}else }else
{ {
if(iceInfo->tension == 0xff)
iceInfo->tension =0;
iceInfo->tension = iceInfo->tension + iceInfo->t_sensor_data[pullno].original_tension; iceInfo->tension = iceInfo->tension + iceInfo->t_sensor_data[pullno].original_tension;
} }
} }
@ -3696,8 +3698,12 @@ int CPhoneDevice::GetIceData(IDevice::ICE_INFO *iceInfo, IDevice::ICE_TAIL *iceT
angleno++; angleno++;
} }
} }
iceInfo->tension = iceInfo->tension * 0.913632; if(iceInfo->tension != 0xff)
iceInfo->tension_difference = iceInfo->tension * 0.13213; {
iceInfo->equal_icethickness = 0;
iceInfo->tension = iceInfo->tension * 0.913632;
iceInfo->tension_difference = iceInfo->tension * 0.13213;
}
{ {
std::lock_guard<std::mutex> lock(m_dataLocker); std::lock_guard<std::mutex> lock(m_dataLocker);

Loading…
Cancel
Save