Skip to content

孙克 / ACSingleStore

转到一个项目
切换导航栏
切换导航栏固定状态
Commit 09f2f46e 由 LN
选项

增加设备照明IO

1 个父辈 124cbd6f
全部展开
内嵌 并排
正在显示 9 个修改的文件 包含 45 行增加 和 17 行删除
source/ACSingleStore/FrmIOStatus.cs
...@@ -315,5 +315,17 @@ namespace OnlineStore.ACSingleStore ...@@ -315,5 +315,17 @@ namespace OnlineStore.ACSingleStore
{ {
IOManager.IOMove(IO_Type.Camera_Led, IO_VALUE.LOW); IOManager.IOMove(IO_Type.Camera_Led, IO_VALUE.LOW);
} }
private void btnDevideLed_Click(object sender, EventArgs e)
{
IOManager.IOMove(IO_Type.Device_Led, IO_VALUE.HIGH);
}
private void btnCDLed_Click(object sender, EventArgs e)
{
IOManager.IOMove(IO_Type.Device_Led, IO_VALUE.LOW);
}
} }
} }
source/ACSingleStore/FrmStoreBox.cs
...@@ -159,8 +159,8 @@ namespace OnlineStore.ACSingleStore ...@@ -159,8 +159,8 @@ namespace OnlineStore.ACSingleStore
{ {
groupHistory.Visible = false; groupHistory.Visible = false;
} }
this.tabControl1.TabPages.Remove(tabPage3); // this.tabControl1.TabPages.Remove(tabPage3);
groupCode.Visible = false; // groupCode.Visible = false;
} }
private string WaitStart = ResourceCulture.GetString("等待启动"); private string WaitStart = ResourceCulture.GetString("等待启动");
private string dooropen = ResourceCulture.GetString("前门未关"); private string dooropen = ResourceCulture.GetString("前门未关");
...@@ -1190,5 +1190,16 @@ namespace OnlineStore.ACSingleStore ...@@ -1190,5 +1190,16 @@ namespace OnlineStore.ACSingleStore
StoreManager.UpdateBoxConfig(store.Config); StoreManager.UpdateBoxConfig(store.Config);
} }
} }
private void btnOpenDLed_Click(object sender, EventArgs e)
{
IOManager.IOMove(IO_Type.Device_Led, IO_VALUE.HIGH);
}
private void btnCloseDLed_Click(object sender, EventArgs e)
{
IOManager.IOMove(IO_Type.Device_Led, IO_VALUE.LOW);
}
} }
} }
source/ACSingleStore/resource/language.resource
...@@ -23,9 +23,9 @@ FrmStoreBox_btnClearL_Text,清理日志,Clean log, ...@@ -23,9 +23,9 @@ FrmStoreBox_btnClearL_Text,清理日志,Clean log,
FrmStoreBox_btnLogDebug_Text,开启DEBUG,Open Debug, FrmStoreBox_btnLogDebug_Text,开启DEBUG,Open Debug,
FrmStoreBox_tabControl1_Text,FrmStoreBox_tabControl1_Text,FrmStoreBox_tabControl1_Text, FrmStoreBox_tabControl1_Text,FrmStoreBox_tabControl1_Text,FrmStoreBox_tabControl1_Text,
FrmStoreBox_tabPage3_Text,操作日志,Operation Log, FrmStoreBox_tabPage3_Text,操作日志,Operation Log,
FrmStoreBox_btnCloseLed_Text,关闭照明,Close light, FrmStoreBox_btnCloseLed_Text,关闭相机照明,Close Camera light,
FrmStoreBox_btnClearLog_Text,清理日志,Clean log, FrmStoreBox_btnClearLog_Text,清理日志,Clean log,
FrmStoreBox_btnOpenLed_Text,打开照明,Open light, FrmStoreBox_btnOpenLed_Text,打开相机照明,Open Camera light,
FrmStoreBox_btnCloseDoor_Text,关闭仓门,Close door, FrmStoreBox_btnCloseDoor_Text,关闭仓门,Close door,
FrmStoreBox_btnOpenDoor_Text,打开仓门,Open door, FrmStoreBox_btnOpenDoor_Text,打开仓门,Open door,
FrmStoreBox_tabPage1_Text,伺服调试,Servo debug, FrmStoreBox_tabPage1_Text,伺服调试,Servo debug,
...@@ -130,9 +130,9 @@ FrmIOStatus_label7_Text,3:,3:, ...@@ -130,9 +130,9 @@ FrmIOStatus_label7_Text,3:,3:,
FrmIOStatus_label4_Text,2:,2:, FrmIOStatus_label4_Text,2:,2:,
FrmIOStatus_label1_Text,1:,1:, FrmIOStatus_label1_Text,1:,1:,
FrmIOStatus_groupBox1_Text,DO写入,DO write, FrmIOStatus_groupBox1_Text,DO写入,DO write,
FrmIOStatus_btnCloseLed_Text,关闭照明,Close light, FrmIOStatus_btnCloseLed_Text,关闭相机照明,Close Camera light,
FrmIOStatus_label3_Text,选择DO:,Select DO:, FrmIOStatus_label3_Text,选择DO:,Select DO:,
FrmIOStatus_btnOpenLed_Text,打开照明,Open light, FrmIOStatus_btnOpenLed_Text,打开相机照明,Open Camera light,
FrmIOStatus_label2_Text,SlaveId,SlaveId, FrmIOStatus_label2_Text,SlaveId,SlaveId,
FrmIOStatus_btnCloseAxisBreak_Text,关闭刹车,Close brake, FrmIOStatus_btnCloseAxisBreak_Text,关闭刹车,Close brake,
FrmIOStatus_label17_Text,设备IP:,IP:, FrmIOStatus_label17_Text,设备IP:,IP:,
...@@ -250,6 +250,7 @@ Y07,轴2刹车电源ON,Brake power of axis2 ON, ...@@ -250,6 +250,7 @@ Y07,轴2刹车电源ON,Brake power of axis2 ON,
Y08,进料口门上升SOL,Portal ascent SOL, Y08,进料口门上升SOL,Portal ascent SOL,
Y09,进料口门下降SOL,Portal descent SOL, Y09,进料口门下降SOL,Portal descent SOL,
Y10,相机照明开,Camera light ON, Y10,相机照明开,Camera light ON,
Y10,设备照明开,Device light ON,
是否确定退出？,是否确定退出？,Are you sure you want to quit?, 是否确定退出？,是否确定退出？,Are you sure you want to quit?,
提示,提示,Remind, 提示,提示,Remind,
点动速度,点动速度,Inching speed, 点动速度,点动速度,Inching speed,
......
source/DeviceLibrary/StoreConfig/AC/StoreConfig.csv
...@@ -29,7 +29,7 @@ DO,轴2刹车电源ON,Axis_Brake,6,192.168.200.21,0,轴2刹车电源ON,Y07,Y07,0, ...@@ -29,7 +29,7 @@ DO,轴2刹车电源ON,Axis_Brake,6,192.168.200.21,0,轴2刹车电源ON,Y07,Y07,0,
DO,进料口门上升SOL,Door_Up,7,192.168.200.21,0,进料口门上升SOL,Y08,Y08,0, DO,进料口门上升SOL,Door_Up,7,192.168.200.21,0,进料口门上升SOL,Y08,Y08,0,
DO,进料口门下降SOL,Door_Down,8,192.168.200.21,0,进料口门下降SOL,Y09,Y09,0, DO,进料口门下降SOL,Door_Down,8,192.168.200.21,0,进料口门下降SOL,Y09,Y09,0,
DO,相机照明开,Camera_Led,9,192.168.200.21,0,相机照明开,Y10,Y10,0, DO,相机照明开,Camera_Led,9,192.168.200.21,0,相机照明开,Y10,Y10,0,
,,,10,192.168.200.21,0,,Y11,Y11,0, DO,设备照明开,Device_Led,10,192.168.200.21,0,设备照明开,Y11,Y11,0,
,,,11,192.168.200.21,0,,Y12,Y12,0, ,,,11,192.168.200.21,0,,Y12,Y12,0,
,,,12,192.168.200.21,0,,Y13,Y13,0, ,,,12,192.168.200.21,0,,Y13,Y13,0,
,,,13,192.168.200.21,0,,Y14,Y14,0, ,,,13,192.168.200.21,0,,Y14,Y14,0,
...@@ -117,7 +117,7 @@ PRO,每次吹气的时间（分钟）,BlowAir_Time,10,,,,,,, ...@@ -117,7 +117,7 @@ PRO,每次吹气的时间（分钟）,BlowAir_Time,10,,,,,,,
PRO,两次吹气间隔（分钟）,BlowAir_Interval,10,,,,,,, PRO,两次吹气间隔（分钟）,BlowAir_Interval,10,,,,,,,
PRO,温湿度端口号,Humiture_Port,COM1,,,,,,, PRO,温湿度端口号,Humiture_Port,COM1,,,,,,,
,,,,,,,,, , ,,,,,,,,, ,
PRO,模拟量IO模块的IP地址,AIDevice_IP,192.168.200.12,,,,,,, PRO,模拟量IO模块的IP地址,AIDevice_IP,192.168.200.22,,,,,,,
PRO,模拟信号1默认高度,AIDI1_DefaultPosition,2920,,,,,,, PRO,模拟信号1默认高度,AIDI1_DefaultPosition,2920,,,,,,,
PRO,模拟信号2默认高度,AIDI2_DefaultPosition,2960,,,,,,, PRO,模拟信号2默认高度,AIDI2_DefaultPosition,2960,,,,,,,
PRO,模拟信号3默认高度,AIDI3_DefaultPosition,2500,,,,,,, PRO,模拟信号3默认高度,AIDI3_DefaultPosition,2500,,,,,,,
......
source/DeviceLibrary/acSingleStore/AC_SA_BoxBean.cs
...@@ -921,14 +921,14 @@ namespace OnlineStore.DeviceLibrary ...@@ -921,14 +921,14 @@ namespace OnlineStore.DeviceLibrary
doorIsOpen = true; doorIsOpen = true;
} }
if (doorIsOpen) //if (doorIsOpen)
{ //{
IOManager.IOMove(IO_Type.Camera_Led, IO_VALUE.HIGH); // IOManager.IOMove(IO_Type.Device_Led, IO_VALUE.HIGH);
} //}
else //else
{ //{
IOManager.IOMove(IO_Type.Camera_Led, IO_VALUE.LOW); // IOManager.IOMove(IO_Type.Device_Led, IO_VALUE.LOW);
} //}
} }
catch (Exception ex) catch (Exception ex)
......
source/LoadCVSLibrary/storeConfig/config/IO_Type.cs
...@@ -112,7 +112,11 @@ namespace OnlineStore.LoadCSVLibrary ...@@ -112,7 +112,11 @@ namespace OnlineStore.LoadCSVLibrary
/// <summary> /// <summary>
/// DO 相机照明开 Camera_Led Y10 /// DO 相机照明开 Camera_Led Y10
/// </summary> /// </summary>
public static string Camera_Led = "Camera_Led"; public static string Camera_Led = "Camera_Led";
/// <summary>
/// DO 设备照明开 Device_Led Y11
/// </summary>
public static string Device_Led = "Device_Led";
} }
public enum IO_VALUE public enum IO_VALUE
{ {
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!