Compare commits

..

No commits in common. '2e12a1ac84943d128719e34d4c66c8bc41e4a162' and 'a14c76c4eddc436b10683d23630387abd35e787f' have entirely different histories.

@ -2675,8 +2675,6 @@ void ShxyProtocolDataProcess(int devno)
switch (curserial->m_au8RecvBuf[j]) switch (curserial->m_au8RecvBuf[j])
{ {
case 1: /*温度*/ case 1: /*温度*/
if(devparam[devno].ProtocolIdx == WIND_PROTOCOL)
break;
if ((fvalue < -60) || (fvalue > 100)) if ((fvalue < -60) || (fvalue > 100))
{ {
frnb = (GeneratingRandomNumber() % 101 - 50) / 1000.0; frnb = (GeneratingRandomNumber() % 101 - 50) / 1000.0;
@ -2699,8 +2697,6 @@ void ShxyProtocolDataProcess(int devno)
} }
break; break;
case 2: /*气压*/ case 2: /*气压*/
if(devparam[devno].ProtocolIdx == WIND_PROTOCOL)
break;
if ((fvalue < 550) || (fvalue > 1060)) if ((fvalue < 550) || (fvalue > 1060))
{ {
frnb = (GeneratingRandomNumber() % 41 - 20) / 10000.0; frnb = (GeneratingRandomNumber() % 41 - 20) / 10000.0;
@ -2722,8 +2718,6 @@ void ShxyProtocolDataProcess(int devno)
} }
break; break;
case 3: /*湿度*/ case 3: /*湿度*/
if(devparam[devno].ProtocolIdx == WIND_PROTOCOL)
break;
if ((fvalue < 0) || (fvalue > 100)) if ((fvalue < 0) || (fvalue > 100))
{ {
frnb = (GeneratingRandomNumber() % 41 - 20) / 1000.0; frnb = (GeneratingRandomNumber() % 41 - 20) / 1000.0;

Loading…
Cancel
Save