Skip to content

孙克 / ACSingleStore

转到一个项目
切换导航栏
切换导航栏固定状态
Commit 4d3f3c12 由 几米阳光
选项

添加日志开关

1 个父辈 37feaee7
内嵌 并排
正在显示 2 个修改的文件 包含 22 行增加 和 36 行删除
source/DeviceLibrary/PanasonicServo/ACServerManager.cs
...@@ -13,6 +13,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -13,6 +13,7 @@ namespace OnlineStore.DeviceLibrary
/// </summary> /// </summary>
public partial class ACServerManager public partial class ACServerManager
{ {
private static bool IsShowMsg = false;
private static int SleepMSendons = 100; private static int SleepMSendons = 100;
public static bool OpenPort(string portName) public static bool OpenPort(string portName)
{ {
...@@ -236,13 +237,6 @@ namespace OnlineStore.DeviceLibrary ...@@ -236,13 +237,6 @@ namespace OnlineStore.DeviceLibrary
public static void HomeMove(string portName, int slvAddr, int speed) public static void HomeMove(string portName, int slvAddr, int speed)
{ {
//byte[] date = ACCMDManager.GetWriteData(slvAddr, ACCMDManager.CMD_WriteRegisters, "4637", string.Format("{0:X2}", Math.Abs(speed)), 1);
//SendData(portName, date);
//Thread.Sleep(SleepMSendons);
//date = ACCMDManager.GetWriteData(slvAddr, ACCMDManager.CMD_WriteRegisters, "4638", string.Format("{0:X2}", Math.Abs(speed / 2)), 1);
//SendData(portName, date);
//Thread.Sleep(SleepMSendons);
//默认负方向原点返回 //默认负方向原点返回
byte[] data = ACCMDManager.GetWriteData(slvAddr, ACCMDManager.CMD_WriteRegisters, ACCMDManager.BlockNo, ACCMDManager.Block_HomeMove1, 2); byte[] data = ACCMDManager.GetWriteData(slvAddr, ACCMDManager.CMD_WriteRegisters, ACCMDManager.BlockNo, ACCMDManager.Block_HomeMove1, 2);
SendData(portName, data); SendData(portName, data);
......
source/DeviceLibrary/PanasonicServo/ACServerManager_Partial.cs
...@@ -33,7 +33,6 @@ namespace OnlineStore.DeviceLibrary ...@@ -33,7 +33,6 @@ namespace OnlineStore.DeviceLibrary
//运动 //运动
byte[] data = ACCMDManager.GetWriteData(slvAddr, ACCMDManager.CMD_WriteRegisters, ACCMDManager.BlockNo, index.ToString(), 2); byte[] data = ACCMDManager.GetWriteData(slvAddr, ACCMDManager.CMD_WriteRegisters, ACCMDManager.BlockNo, index.ToString(), 2);
SendData(portName, data); SendData(portName, data);
Thread.Sleep(100); Thread.Sleep(100);
CloseSTB(portName,slvAddr); CloseSTB(portName,slvAddr);
Thread.Sleep(100); Thread.Sleep(100);
...@@ -63,9 +62,10 @@ namespace OnlineStore.DeviceLibrary ...@@ -63,9 +62,10 @@ namespace OnlineStore.DeviceLibrary
{ {
strSend += string.Format("{0:X2} ", bits[i]); strSend += string.Format("{0:X2} ", bits[i]);
} }
if (IsShowMsg)
//Console.WriteLine("收到数据：" + strSend + "\r\n"); {
LogUtil.debug(DateTime.Now.ToLongTimeString() + " 收到数据：" + strSend + "\r\n"); LogUtil.info(DateTime.Now.ToLongTimeString() + " 收到数据：" + strSend + "\r\n");
}
string str = ""; string str = "";
string strFromat = "{0:X2}"; string strFromat = "{0:X2}";
byte slvAddr = bits[0]; byte slvAddr = bits[0];
...@@ -199,10 +199,10 @@ namespace OnlineStore.DeviceLibrary ...@@ -199,10 +199,10 @@ namespace OnlineStore.DeviceLibrary
{ {
return; return;
} }
//Console.WriteLine(DateTime.Now.ToLongTimeString() + " 写入数据：" + strSend); if (IsShowMsg)
LogUtil.debug(DateTime.Now.ToLongTimeString() + " 写入数据：" + strSend + "\r\n"); {
// this.richTextBox1.AppendText("写入数据：" + strSend + "\r\n"); LogUtil.info(DateTime.Now.ToLongTimeString() + " 写入数据：" + strSend + "\r\n");
}
AcSerialBean bean = GetSerialBean(portName); AcSerialBean bean = GetSerialBean(portName);
if (bean == null) if (bean == null)
{ {
...@@ -237,10 +237,10 @@ namespace OnlineStore.DeviceLibrary ...@@ -237,10 +237,10 @@ namespace OnlineStore.DeviceLibrary
{ {
return returnData; return returnData;
} }
//Console.WriteLine(DateTime.Now.ToLongTimeString() + " 写入数据：" + strSend); if (IsShowMsg)
LogUtil.debug(DateTime.Now.ToLongTimeString() + " 写入数据：" + strSend + "\r\n"); {
// this.richTextBox1.AppendText("写入数据：" + strSend + "\r\n"); LogUtil.info(DateTime.Now.ToLongTimeString() + " 写入数据：" + strSend + "\r\n");
}
AcSerialBean bean = GetSerialBean(portName); AcSerialBean bean = GetSerialBean(portName);
if (bean == null) if (bean == null)
{ {
...@@ -372,9 +372,10 @@ namespace OnlineStore.DeviceLibrary ...@@ -372,9 +372,10 @@ namespace OnlineStore.DeviceLibrary
{ {
strSend += string.Format("{0:X2} ", reviceData[i]); strSend += string.Format("{0:X2} ", reviceData[i]);
} }
if (IsShowMsg)
//Console.WriteLine("收到数据：" + strSend + "\r\n"); {
LogUtil.debug(DateTime.Now.ToLongTimeString() + " 收到数据：" + strSend + "\r\n"); LogUtil.info(DateTime.Now.ToLongTimeString() + " 收到数据：" + strSend + "\r\n");
}
string strFromat = "{0:X2}"; string strFromat = "{0:X2}";
byte slvAddrR = reviceData[0]; byte slvAddrR = reviceData[0];
...@@ -418,8 +419,10 @@ namespace OnlineStore.DeviceLibrary ...@@ -418,8 +419,10 @@ namespace OnlineStore.DeviceLibrary
strSend += string.Format("{0:X2} ", reviceData[i]); strSend += string.Format("{0:X2} ", reviceData[i]);
} }
//Console.WriteLine("收到数据：" + strSend + "\r\n"); if (IsShowMsg)
LogUtil.debug(DateTime.Now.ToLongTimeString() + " 收到数据：" + strSend + "\r\n"); {
LogUtil.info(DateTime.Now.ToLongTimeString() + " 收到数据：" + strSend + "\r\n");
}
string strFromat = "{0:X2}"; string strFromat = "{0:X2}";
byte slvAddrR = reviceData[0]; byte slvAddrR = reviceData[0];
...@@ -442,18 +445,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -442,18 +445,7 @@ namespace OnlineStore.DeviceLibrary
byte[] reviceData = SendCommand(portName, dataArray, 100, 6); byte[] reviceData = SendCommand(portName, dataArray, 100, 6);
return GetCoilData(portName, reviceData, PreReadCoilAddr); return GetCoilData(portName, reviceData, PreReadCoilAddr);
} }
//public static int GetServerOnStatus(string portName, int slvAddr)
//{
// if (!serialBeanMap.ContainsKey(portName))
// {
// return -1;
// }
// PreReadCoilAddr = ACCMDManager.ServerOn_Addr;
// byte[] dataArray = ACCMDManager.GetWriteData(slvAddr, ACCMDManager.CMD_ReadCoil, PreReadCoilAddr, "0000", 1);
// //SendData(portName,dataArray);
// byte[] reviceData = SendCommand(portName, dataArray, 100, 6);
// return GetCoilData(portName, reviceData, PreReadCoilAddr);
//}
public static int GetBusyStatus(string portName, int slvAddr) public static int GetBusyStatus(string portName, int slvAddr)
{ {
PreReadCoilAddr = ACCMDManager.BUSYStatus; PreReadCoilAddr = ACCMDManager.BUSYStatus;
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!