|
@@ -436,6 +436,11 @@ namespace ConsoleApp2
|
|
|
{
|
|
|
CmdCode[18 + i] = (byte)MAC_Info[i];
|
|
|
}
|
|
|
+ MAC_Info = arrText[rowNum + 4].ToString().Split(',')[1];
|
|
|
+ for (ushort i = 0; i < ((MAC_Info.Length > 8) ? 8 : MAC_Info.Length); i++)
|
|
|
+ {
|
|
|
+ CmdCode[26 + i] = (byte)MAC_Info[i];
|
|
|
+ }
|
|
|
file.WriteLine(CmdCode_To_CmdSave(CmdCode));
|
|
|
break;
|
|
|
}
|
|
@@ -721,6 +726,12 @@ namespace ConsoleApp2
|
|
|
{
|
|
|
CmdCode[18 + i] = (byte)MAC_Info[i];
|
|
|
}
|
|
|
+ MAC_Info = arrText[rowNum + 4].ToString().Split(',')[1];
|
|
|
+ for (ushort i = 0; i < ((MAC_Info.Length > 8) ? 8 : MAC_Info.Length); i++)
|
|
|
+ {
|
|
|
+ CmdCode[26 + i] = (byte)MAC_Info[i];
|
|
|
+ }
|
|
|
+
|
|
|
//写入文件
|
|
|
file.WriteLine(CmdCode_To_CmdSave(CmdCode));
|
|
|
break;
|
|
@@ -1038,53 +1049,53 @@ namespace ConsoleApp2
|
|
|
//转矩曲线a
|
|
|
Data32 = Convert.ToInt32(arrText[rowNum + (4 * i + 1)].ToString().Split(',')[1]);
|
|
|
CmdCode[14] = (byte)(Data32 & 0xFF);
|
|
|
- CmdCode[15] = (byte)(uDataTemp >> 8);
|
|
|
- CmdCode[16] = (byte)(uDataTemp >> 16);
|
|
|
- CmdCode[17] = (byte)(uDataTemp >> 24);
|
|
|
+ CmdCode[15] = (byte)(Data32 >> 8);
|
|
|
+ CmdCode[16] = (byte)(Data32 >> 16);
|
|
|
+ CmdCode[17] = (byte)(Data32 >> 24);
|
|
|
//转矩曲线b
|
|
|
Data32 = Convert.ToInt32(arrText[rowNum + (4 * i + 2)].ToString().Split(',')[1]);
|
|
|
CmdCode[18] = (byte)(Data32 & 0xFF);
|
|
|
- CmdCode[19] = (byte)(uDataTemp >> 8);
|
|
|
- CmdCode[20] = (byte)(uDataTemp >> 16);
|
|
|
- CmdCode[21] = (byte)(uDataTemp >> 24);
|
|
|
+ CmdCode[19] = (byte)(Data32 >> 8);
|
|
|
+ CmdCode[20] = (byte)(Data32 >> 16);
|
|
|
+ CmdCode[21] = (byte)(Data32 >> 24);
|
|
|
//转矩曲线c
|
|
|
Data32 = Convert.ToInt32(arrText[rowNum + (4 * i + 3)].ToString().Split(',')[1]);
|
|
|
CmdCode[22] = (byte)(Data32 & 0xFF);
|
|
|
- CmdCode[23] = (byte)(uDataTemp >> 8);
|
|
|
- CmdCode[24] = (byte)(uDataTemp >> 16);
|
|
|
- CmdCode[25] = (byte)(uDataTemp >> 24);
|
|
|
+ CmdCode[23] = (byte)(Data32 >> 8);
|
|
|
+ CmdCode[24] = (byte)(Data32 >> 16);
|
|
|
+ CmdCode[25] = (byte)(Data32 >> 24);
|
|
|
//转矩曲线d
|
|
|
Data32 = Convert.ToInt32(arrText[rowNum + (4 * i + 4)].ToString().Split(',')[1]);
|
|
|
CmdCode[26] = (byte)(Data32 & 0xFF);
|
|
|
- CmdCode[27] = (byte)(uDataTemp >> 8);
|
|
|
- CmdCode[28] = (byte)(uDataTemp >> 16);
|
|
|
- CmdCode[29] = (byte)(uDataTemp >> 24);
|
|
|
+ CmdCode[27] = (byte)(Data32 >> 8);
|
|
|
+ CmdCode[28] = (byte)(Data32 >> 16);
|
|
|
+ CmdCode[29] = (byte)(Data32 >> 24);
|
|
|
if (i <= 5)
|
|
|
{
|
|
|
//踏频曲线a
|
|
|
Data32 = Convert.ToInt32(arrText[rowNum + (4 * i + 61)].ToString().Split(',')[1]);
|
|
|
CmdCode[30] = (byte)(Data32 & 0xFF);
|
|
|
- CmdCode[31] = (byte)(uDataTemp >> 8);
|
|
|
- CmdCode[32] = (byte)(uDataTemp >> 16);
|
|
|
- CmdCode[33] = (byte)(uDataTemp >> 24);
|
|
|
+ CmdCode[31] = (byte)(Data32 >> 8);
|
|
|
+ CmdCode[32] = (byte)(Data32 >> 16);
|
|
|
+ CmdCode[33] = (byte)(Data32 >> 24);
|
|
|
//踏频曲线b
|
|
|
Data32 = Convert.ToInt32(arrText[rowNum + (4 * i + 62)].ToString().Split(',')[1]);
|
|
|
CmdCode[34] = (byte)(Data32 & 0xFF);
|
|
|
- CmdCode[35] = (byte)(uDataTemp >> 8);
|
|
|
- CmdCode[36] = (byte)(uDataTemp >> 16);
|
|
|
- CmdCode[37] = (byte)(uDataTemp >> 24);
|
|
|
+ CmdCode[35] = (byte)(Data32 >> 8);
|
|
|
+ CmdCode[36] = (byte)(Data32 >> 16);
|
|
|
+ CmdCode[37] = (byte)(Data32 >> 24);
|
|
|
//踏频曲线c
|
|
|
Data32 = Convert.ToInt32(arrText[rowNum + (4 * i + 63)].ToString().Split(',')[1]);
|
|
|
CmdCode[38] = (byte)(Data32 & 0xFF);
|
|
|
- CmdCode[39] = (byte)(uDataTemp >> 8);
|
|
|
- CmdCode[40] = (byte)(uDataTemp >> 16);
|
|
|
- CmdCode[41] = (byte)(uDataTemp >> 24);
|
|
|
+ CmdCode[39] = (byte)(Data32 >> 8);
|
|
|
+ CmdCode[40] = (byte)(Data32 >> 16);
|
|
|
+ CmdCode[41] = (byte)(Data32 >> 24);
|
|
|
//踏频曲线d
|
|
|
Data32 = Convert.ToInt32(arrText[rowNum + (4 * i + 64)].ToString().Split(',')[1]);
|
|
|
CmdCode[42] = (byte)(Data32 & 0xFF);
|
|
|
- CmdCode[43] = (byte)(uDataTemp >> 8);
|
|
|
- CmdCode[44] = (byte)(uDataTemp >> 16);
|
|
|
- CmdCode[45] = (byte)(uDataTemp >> 24);
|
|
|
+ CmdCode[43] = (byte)(Data32 >> 8);
|
|
|
+ CmdCode[44] = (byte)(Data32 >> 16);
|
|
|
+ CmdCode[45] = (byte)(Data32 >> 24);
|
|
|
}
|
|
|
//写入文件
|
|
|
file.WriteLine("[曲线" + i.ToString() + "]");
|