Skip to content

刘韬 / 1069_MIMO_PlUS

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

中英文调整，灯闪烁调整

1 个父辈 89d5e6a8
内嵌 并排
正在显示 4 个修改的文件 包含 11 行增加 和 11 行删除
DeviceLibrary/theMachine/MainMachine _LedRGBProcess.cs
...@@ -48,7 +48,7 @@ namespace DeviceLibrary ...@@ -48,7 +48,7 @@ namespace DeviceLibrary
{ {
LogUtil.info("LED灯初始化成功"); LogUtil.info("LED灯初始化成功");
rgbLedInitOk = true; rgbLedInitOk = true;
ledRgbTimer = new System.Threading.Timer(new TimerCallback(RgbLedProcess), null, 0, 500); ledRgbTimer = new System.Threading.Timer(new TimerCallback(RgbLedProcess), null, 0, 1000);
GC.KeepAlive(ledRgbTimer); GC.KeepAlive(ledRgbTimer);
msg = ""; msg = "";
return true; return true;
...@@ -66,7 +66,7 @@ namespace DeviceLibrary ...@@ -66,7 +66,7 @@ namespace DeviceLibrary
lastS = ""; lastS = "";
} }
public void ShowColor(Color color, string lastState) public void ShowColor(Color color, string lastState)
{ {
try try
{ {
if (rGB_Controller == null || (!rgbLedInitOk)) if (rGB_Controller == null || (!rgbLedInitOk))
...@@ -206,7 +206,7 @@ namespace DeviceLibrary ...@@ -206,7 +206,7 @@ namespace DeviceLibrary
if (IOValue(IO_Type.SuddenStop_BTN).Equals(IO_VALUE.LOW) || isInSuddenDown) if (IOValue(IO_Type.SuddenStop_BTN).Equals(IO_VALUE.LOW) || isInSuddenDown)
{ {
//红色: 急停, //红色: 急停,
ShowColor(Color.Red, "suddenStop"); ShowBlink(Color.Red, "suddenStop");
} }
else if (runStatus == RunStatus.Stop) else if (runStatus == RunStatus.Stop)
{ {
...@@ -254,7 +254,7 @@ namespace DeviceLibrary ...@@ -254,7 +254,7 @@ namespace DeviceLibrary
else if (hasAlarm) else if (hasAlarm)
{ {
//紫色: 异常, //紫色: 异常,
ShowColor(Color.Red, "hasAlarm"); ShowBlink(Color.Red, "hasAlarm");
} //温度超限 } //温度超限
//else if (IsTHoutRange()) //else if (IsTHoutRange())
...@@ -274,7 +274,7 @@ namespace DeviceLibrary ...@@ -274,7 +274,7 @@ namespace DeviceLibrary
{ {
//待机 蓝绿 //待机 蓝绿
//ShowColor(Color.FromArgb(0, 255, 64), "waiting"); //ShowColor(Color.FromArgb(0, 255, 64), "waiting");
ShowColor(Color.Green, "waiting"); ShowBlink(Color.Green, "waiting");
} }
} }
} }
......
DeviceLibrary/theMachine/MainMachine.cs
...@@ -572,7 +572,7 @@ namespace DeviceLibrary ...@@ -572,7 +572,7 @@ namespace DeviceLibrary
if (h.Value) if (h.Value)
{ {
Msg.add(crc.GetString(L.x29_higt_has_reel, "系统启动检测到有无信息料盘,等待取走单料口料盘"), MsgLevel.alarm); Msg.add(crc.GetString(L.x29_higt_has_reel, "系统启动检测到有无信息料盘,等待取走单料口料盘"), MsgLevel.alarm);
ShowColor(Color.White, "waitTask"); //ShowColor(Color.White, "waitTask");
if (Setting_Init.CamTestReel_Ability) if (Setting_Init.CamTestReel_Ability)
{ {
//ResetMoveInfo.NextMoveStep(MoveStep.H14_HomeReset); //ResetMoveInfo.NextMoveStep(MoveStep.H14_HomeReset);
......
DeviceLibrary/theMachine/MainMachine_Clamp.cs
...@@ -300,7 +300,7 @@ namespace DeviceLibrary ...@@ -300,7 +300,7 @@ namespace DeviceLibrary
if (h.Value) if (h.Value)
{ {
Msg.add(crc.GetString(L.please_take_ngdoor_reel, "等待取走单料口料盘"), MsgLevel.warning); Msg.add(crc.GetString(L.please_take_ngdoor_reel, "等待取走单料口料盘"), MsgLevel.warning);
ShowColor(Color.White, "waitTask"); //ShowColor(Color.White, "waitTask");
if (Setting_Init.CamTestReel_Ability) if (Setting_Init.CamTestReel_Ability)
{ {
//ClampMoveInfo.LastSetpTime = DateTime.Now; //ClampMoveInfo.LastSetpTime = DateTime.Now;
...@@ -468,7 +468,7 @@ namespace DeviceLibrary ...@@ -468,7 +468,7 @@ namespace DeviceLibrary
public void ScanCode() public void ScanCode()
{ {
ClampMoveInfo.log("开始扫码"); ClampMoveInfo.log("开始扫码");
ShowColor(Color.Blue, "scanCode"); //ShowColor(Color.Blue, "scanCode");
//RightMoveInfo.OneWaitCanEndStep = true; //RightMoveInfo.OneWaitCanEndStep = true;
//RightMoveInfo.WaitList.Add(WaitResultInfo.WaitScanCode()); //RightMoveInfo.WaitList.Add(WaitResultInfo.WaitScanCode());
//RightMoveInfo.WaitList.Add(WaitResultInfo.WaitTime(1000)); //RightMoveInfo.WaitList.Add(WaitResultInfo.WaitTime(1000));
......
TheMachineNView/resources/en-US.lngres
...@@ -427,11 +427,11 @@ save_success 保存成功 Save success ...@@ -427,11 +427,11 @@ save_success 保存成功 Save success
save_failed 保存失败 Save failed save_failed 保存失败 Save failed
sensor_alarm 红外传感器偏差过大，需要检查后复位 Infrared sensor deviation is too large, need to check and then reset sensor_alarm 红外传感器偏差过大，需要检查后复位 Infrared sensor deviation is too large, need to check and then reset
comInitError {0}初始化失败 {0}Initialization failure comInitError {0}初始化失败 {0}Initialization failure
comDataError 串口{0}数据错误{1} Serial port {0} data error {1} comDataError 串口{0}数据错误{1} Serial port {0} data error {1}
comOpenFail 串口{0}打开失败 Serial port {0} open failed comOpenFail 串口{0}打开失败 Serial port {0} open failed
shengbosensor 声波传感器 Acoustic Sensors shengbosensor 声波传感器 Acoustic Sensors
yalisensor 压力传感器 Pressure sensors yalisensor 压力传感器 Pressure sensors
shengboError 声波感应器误差过大，请检查后重新复位 Acoustic sensor error is too large, please check and reset shengboError 声波感应器误差过大，请检查后重新复位 Acoustic sensor error is too large, please check and reset
Form1_tabc_tabP1_pnl_btn_stop_Text 停止 Stop Form1_tabc_tabP1_pnl_btn_stop_Text 停止 Stop
Form1_menuStrip1_Text menuStrip1 menuStrip1 Form1_menuStrip1_Text menuStrip1 menuStrip1
...@@ -450,7 +450,7 @@ FlipDoor_R_Axis 右翻转托盘 Right Flip Tray ...@@ -450,7 +450,7 @@ FlipDoor_R_Axis 右翻转托盘 Right Flip Tray
StringDoor_Axis 料串口折叠门 String Folding Door StringDoor_Axis 料串口折叠门 String Folding Door
FrmPositionTool_groupBox6_groupBox1_ioStatusControl1_label1_Text 检测信号 Detection Signal FrmPositionTool_groupBox6_groupBox1_ioStatusControl1_label1_Text 检测信号 Detection Signal
Res0001 设备未启动 Device Not Started Res0001 设备未启动 Device Not Started
stringDoorSafety 料串门光栅被遮挡 The grating of the string door is obstructed. stringDoorSafety 料串门光栅被遮挡 The grating of the string door is obstructed
Form1_tabc_tab_setting__SettingControl_tp_label5_Text 设置最大压力： Set maximum pressure: Form1_tabc_tab_setting__SettingControl_tp_label5_Text 设置最大压力： Set maximum pressure:
Form1_tabc_tab_setting__SettingControl_tp_label3_Text 历史最大压力值： Historical maximum pressure value: Form1_tabc_tab_setting__SettingControl_tp_label3_Text 历史最大压力值： Historical maximum pressure value:
Form1_tabc_tab_setting__SettingControl_tp_label1_Text 压力传感器当前值： Current value of pressure sensor: Form1_tabc_tab_setting__SettingControl_tp_label1_Text 压力传感器当前值： Current value of pressure sensor:
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!