Commit cf87f6b3 LN

io dll 修改

1 个父辈 3f432715
...@@ -578,8 +578,8 @@ namespace OnlineStore.DeviceLibrary ...@@ -578,8 +578,8 @@ namespace OnlineStore.DeviceLibrary
#endregion #endregion
public bool CanStarInOut() public bool CanStarInOut()
{ {
if (isInSuddenDown || if (isInSuddenDown ||
......
...@@ -259,14 +259,14 @@ namespace OnlineStore.DeviceLibrary ...@@ -259,14 +259,14 @@ namespace OnlineStore.DeviceLibrary
{ {
return "时间等待:【" + TimeMSeconds + "】毫秒"; return "时间等待:【" + TimeMSeconds + "】毫秒";
} }
else if (WaitType == 4) //else if (WaitType == 4)
{ //{
return "电钢目标位置:【" + TargetPosition + "】 "; // return "电钢目标位置:【" + TargetPosition + "】 ";
} //}
else if (WaitType == 5) //else if (WaitType == 5)
{ //{
return "硕科电机目标位置:【" + TargetPosition + "】 "; // return "硕科电机目标位置:【" + TargetPosition + "】 ";
} //}
else if (WaitType == 6) else if (WaitType == 6)
{ {
return "轴【" + AxisInfo.DisplayStr + "】ORG信号:【" + IoValue + "】 "; return "轴【" + AxisInfo.DisplayStr + "】ORG信号:【" + IoValue + "】 ";
......
...@@ -65,14 +65,7 @@ ...@@ -65,14 +65,7 @@
<level value="Info" /> <level value="Info" />
<appender-ref ref="AIOBOX" /> <appender-ref ref="AIOBOX" />
</logger> </logger>
<root>
<level value="INFO" />
<appender-ref ref="RollingLogFileAppender" />
</root>
<root>
<level value="Info" />
<appender-ref ref="RollingLogFileAppender" />
</root>
</log4net> </log4net>
<startup> <startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /> <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
......
支持 Markdown 格式
你添加了 0 到此讨论。请谨慎行事。
Finish editing this message first!