|
@@ -2750,12 +2750,12 @@ namespace MOKA_Factory_Tools
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
- if (receive2Data[2] == CMDID[1] + 1)
|
|
|
+ if (receive2Data[2] == CMDID[0] + 1)
|
|
|
{// 否则FE则表示长度;
|
|
|
dataIndex = 3;
|
|
|
dataLen = 0xFE;
|
|
|
}
|
|
|
- else if (receive2Data[4] != CMDID[1] + 1)
|
|
|
+ else
|
|
|
{// 如果FE是大于255标记;
|
|
|
Log.WriteErrorLog("FE may be is a mark");
|
|
|
return false;
|
|
@@ -2809,7 +2809,7 @@ namespace MOKA_Factory_Tools
|
|
|
reallyLength += len;
|
|
|
if (tryCount-- == 0)
|
|
|
break;
|
|
|
- Thread.Sleep(10);
|
|
|
+ Thread.Sleep(20);
|
|
|
}
|
|
|
|
|
|
if (reallyLength < 6)
|
|
@@ -2819,7 +2819,7 @@ namespace MOKA_Factory_Tools
|
|
|
|
|
|
if (receive2Data[4] == 0xFC && receive2Data[5] == CMDID[1] + 1)
|
|
|
{
|
|
|
- dataIndex = 6;
|
|
|
+ dataIndex = 5;
|
|
|
dataLen = (int)((receive2Data[2] << 8) | receive2Data[3]);
|
|
|
}
|
|
|
else
|
|
@@ -2828,7 +2828,7 @@ namespace MOKA_Factory_Tools
|
|
|
return false;
|
|
|
}
|
|
|
}
|
|
|
- else if (receive2Data[4] == CMDID[1] + 1)
|
|
|
+ else if (receive2Data[4] == CMDID[0] + 1)
|
|
|
{
|
|
|
dataIndex = 5;
|
|
|
dataLen = (int)((receive2Data[2] << 8) | receive2Data[3]);
|
|
@@ -2838,7 +2838,7 @@ namespace MOKA_Factory_Tools
|
|
|
return false;
|
|
|
}
|
|
|
|
|
|
- tryCount = 5;
|
|
|
+ tryCount = 10;
|
|
|
while (reallyLength < dataLen)
|
|
|
{
|
|
|
if (tryCount-- == 0)
|
|
@@ -2894,7 +2894,7 @@ namespace MOKA_Factory_Tools
|
|
|
|
|
|
if (receive2Data[2] == 0xFC && receive2Data[3] == CMDID[1] + 1)
|
|
|
{
|
|
|
- dataIndex = 4;
|
|
|
+ dataIndex = 3;
|
|
|
dataLen = receive2Data[1];
|
|
|
}
|
|
|
else
|
|
@@ -2903,7 +2903,7 @@ namespace MOKA_Factory_Tools
|
|
|
return false;
|
|
|
}
|
|
|
}
|
|
|
- else if (receive2Data[2] == CMDID[1] + 1)
|
|
|
+ else if (receive2Data[2] == CMDID[0] + 1)
|
|
|
{
|
|
|
dataIndex = 3;
|
|
|
dataLen = receive2Data[1];
|