diff --git a/app/src/main/cpp/PhoneDevice.cpp b/app/src/main/cpp/PhoneDevice.cpp index 3a122ac9..5d03c8cc 100644 --- a/app/src/main/cpp/PhoneDevice.cpp +++ b/app/src/main/cpp/PhoneDevice.cpp @@ -3623,9 +3623,9 @@ int CPhoneDevice::GetIceData(IDevice::ICE_INFO *iceInfo, IDevice::ICE_TAIL *iceT Data_DEF airt; //等值覆冰厚度, 综合悬挂载荷, 不均衡张力差 置0 - iceInfo->equal_icethickness = 0; - iceInfo->tension = 0; - iceInfo->tension_difference = 0; + iceInfo->equal_icethickness = 0xff; + iceInfo->tension = 0xff; + iceInfo->tension_difference = 0xff; bool status = 1; int pullno = 0; @@ -3650,6 +3650,8 @@ int CPhoneDevice::GetIceData(IDevice::ICE_INFO *iceInfo, IDevice::ICE_TAIL *iceT status = 0; }else { + if(iceInfo->tension == 0xff) + iceInfo->tension =0; 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++; } } - iceInfo->tension = iceInfo->tension * 0.913632; - iceInfo->tension_difference = iceInfo->tension * 0.13213; + if(iceInfo->tension != 0xff) + { + iceInfo->equal_icethickness = 0; + iceInfo->tension = iceInfo->tension * 0.913632; + iceInfo->tension_difference = iceInfo->tension * 0.13213; + } { std::lock_guard lock(m_dataLocker);