Просмотр исходного кода

修改了FC字段的data取值范围

chenjiangqun 2 лет назад
Родитель
Сommit
2ebd4e2b8f
1 измененных файлов с 4 добавлено и 4 удалено
  1. 4 4
      FactoryTool_CShare/IO/SerialCMD.cs

+ 4 - 4
FactoryTool_CShare/IO/SerialCMD.cs

@@ -2929,7 +2929,7 @@ namespace MOKA_Factory_Tools
                             }
                                 
                             // 获取数据部分;
-                            int skipLen = receive2Data[4] == 0xFC ? 6 : 5;
+                            int skipLen = 5;
                             data = receive2Data.Skip(skipLen).Take(reallyLength - skipLen - 2).ToArray();
                         }
                         else
@@ -2943,13 +2943,13 @@ namespace MOKA_Factory_Tools
                                     packetLen = (int)((receive2Data[2] << 8) | receive2Data[3]);
                                     if (receive2Data[4] == 0xFC && (receive2Data[5] == CMDID[1] + 1) && packetLen == reallyLength)
                                     {// 假设FE表示的是使用2个字节存储长度的标记;                             
-                                        data = receive2Data.Skip(6).Take(packetLen - 8).ToArray();
+                                        data = receive2Data.Skip(5).Take(packetLen - 8).ToArray();
                                     }
                                     else
                                     {// 假设FE直接表示的是长度;
                                         if (receive2Data[2] == 0xFC && (receive2Data[3] == CMDID[1] + 1) && reallyLength == 0xFE)
                                         {
-                                            data = receive2Data.Skip(4).Take(packetLen - 6).ToArray();
+                                            data = receive2Data.Skip(3).Take(packetLen - 6).ToArray();
                                         }
                                         else
                                         {
@@ -2966,7 +2966,7 @@ namespace MOKA_Factory_Tools
                                         return false;
                                     }
                                     packetLen = receive2Data[1];
-                                    data = receive2Data.Skip(4).Take(packetLen - 6).ToArray();
+                                    data = receive2Data.Skip(3).Take(packetLen - 6).ToArray();
                                 }
                             }
                             else //没有FC