Commit 403a62e9 authored by wangjunqiang's avatar wangjunqiang

测试修复0 salve bug

parent 8508b00e
...@@ -136,33 +136,21 @@ namespace GcDevicePc.Common ...@@ -136,33 +136,21 @@ namespace GcDevicePc.Common
} }
//分析仪状态 //分析仪状态
if (address >= 0 && address < 20) if (address >= 1 && address < 20)
{ {
switch (address) switch (address)
{ {
case 0: //进度数目
{
if ((ushort)SharedSpace.Data.typesint == 2 || (ushort)SharedSpace.Data.typesint == 3)
{
value = globaldata.m_hmibuffer.gcinfo.batruncount;
}
else
{
value = 0;
}
}
break;
case 1: //进度 case 1: //进度
{ {
if ((ushort) SharedSpace.Data.typesint == 2 || (ushort) SharedSpace.Data.typesint == 3) if ((ushort) SharedSpace.Data.typesint == 2 || (ushort) SharedSpace.Data.typesint == 3)
{ {
value = (ushort)(SharedSpace.MControl.dateend/SharedSpace.MControl.zhouqi); value = (ushort)((globaldata.m_hmibuffer.gcinfo.batruncount *1.0f)/
(ushort)(SharedSpace.MControl.dateend/SharedSpace.MControl.zhouqi)*1000);
} }
else else
{ {
value = 0; value = 0;
} }
} }
break; break;
case 2: // 0-正在采样(默认) 1-手动 2-定时 3-校准成功 4-校准失败 5-校准成功(正在采样) 6-校准失败(正在采样) case 2: // 0-正在采样(默认) 1-手动 2-定时 3-校准成功 4-校准失败 5-校准成功(正在采样) 6-校准失败(正在采样)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment