Commit 5c320d1a LN

代码整合

1 个父辈 6d14c4fc
......@@ -33,6 +33,11 @@ namespace SmartShelf.Common
/// <summary>
/// 料架灯类型,0=单色灯料架,1=三色灯料架
/// </summary>
public static string DeviceLedType = "DeviceLedType";
public static string DeviceLedType = "DeviceLedType";
public static string Status_Green_Lights = "Status_Green_Lights";
public static string Status_Red_Lights = "Status_Red_Lights";
public static string Status_Yellow_Lights = "Status_Yellow_Lights";
}
}
......@@ -45,7 +45,7 @@ namespace SmartShelf.DeviceLibrary
public override void AllLightOn(int dmx = -1)
{
AllLightOn(Light.StoreLight(1));
AllLightOn(Light.DefaultLight(dmx, 1));
}
public override void AllLightOn(Light light)
......
......@@ -21,6 +21,9 @@
<add key ="DIMS" value="300"/>
<add key ="DOMS" value ="300"/>
<add key ="BoxCount" value ="2"/>
<add key ="Status_Green_Lights" value ="192.168.1.151:129,130,131,132,133,134,135,136,137,138"/>
<add key ="Status_Yellow_Lights" value ="192.168.1.151:140,141,142,143,144,145,146,147,148,149"/>
<add key ="Status_Red_Lights" value ="192.168.1.151:150,151,152,153,154,155,156,157,158,159,160"/>
</appSettings>
<log4net>
<appender name="RollingLogFileAppender" type="log4net.Appender.RollingFileAppender">
......
......@@ -227,17 +227,17 @@ namespace SmartShelf
private void btnOpenSLed_Click(object sender, EventArgs e)
{
LEDManager.OpenSGreenLed();
LEDManager.OpenStatusLights("green");
}
private void btnCloseSLed_Click(object sender, EventArgs e)
{
LEDManager.CloseSLed();
LEDManager.CloseStatusLights();
}
private void button5_Click(object sender, EventArgs e)
{
LEDManager.OpenSYellowLed();
LEDManager.OpenStatusLights("yellow");
}
}
}
支持 Markdown 格式
你添加了 0 到此讨论。请谨慎行事。
Finish editing this message first!