CPL/banboshi_V1
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

版本-v1.2.4 上传公共服务器

Browse Source
This commit is contained in:
CPL 2024-03-13 11:12:05 +08:00
parent 2d525bb984
commit 813f41017e
3 changed files with 38 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
.tgitconfig Normal file
View File

3
halftoneproject-master/AssistClient/Device/IOCardDev.cs
View File

@ -244,6 +244,7 @@ namespace AssistClient.Device
//errorCode = instantDiCtrl.ReadBit(startPort, bit, out data); //errorCode = instantDiCtrl.ReadBit(startPort, bit, out data);
if (BioFailed(result)) if (BioFailed(result))
{ {
INEvent?.Invoke(999, 0xff);
//throw new Exception(); //throw new Exception();
continue; continue;
} }
@ -255,7 +256,7 @@ namespace AssistClient.Device
INEvent?.Invoke(i, DIData[i]); INEvent?.Invoke(i, DIData[i]);
} }
} }
Thread.Sleep(10); Thread.Sleep(100);
} while (IsInit); } while (IsInit);
} }

36
halftoneproject-master/AssistClient/FrmMain.cs
View File

@ -1584,23 +1584,59 @@ namespace AssistClient
{ {
AddTextEvent("中断命令", $"{portIndex}-HEX:{Convert.ToString(data, 16)}"); AddTextEvent("中断命令", $"{portIndex}-HEX:{Convert.ToString(data, 16)}");
if (compareIOInput(CMDName.启动按钮) && this.tsbtnStart.Enabled) if (compareIOInput(CMDName.启动按钮) && this.tsbtnStart.Enabled)
{
AddTextEvent("中断命令", $"启动-按钮");
startCommand(); startCommand();
AddTextEvent("中断命令", $"启动-完成");
}
else if (compareIOInput(CMDName.暂停按钮) && this.tsbtnPause.Enabled) else if (compareIOInput(CMDName.暂停按钮) && this.tsbtnPause.Enabled)
{
AddTextEvent("中断命令", $"暂停-按钮");
warning(WarningEnum.Low, false); warning(WarningEnum.Low, false);
AddTextEvent("中断命令", $"暂停-完成");
}
else if (compareIOInput(CMDName.完成下料) && this.tsbtnGoDownPT.Enabled) else if (compareIOInput(CMDName.完成下料) && this.tsbtnGoDownPT.Enabled)
{
AddTextEvent("中断命令", $"完成-按钮");
gotoDownPT(); gotoDownPT();
AddTextEvent("中断命令", $"完成-完成");
}
else if (compareIOInput(CMDName.下光源按钮)) else if (compareIOInput(CMDName.下光源按钮))
{
AddTextEvent("中断命令", $"下光源-按钮");
openLowerLight(); openLowerLight();
AddTextEvent("中断命令", $"下光源-完成");
}
else if (compareIOInput(CMDName.上一张图) && currentState == CurrentStateEnum.打标中 && currDefectIndex > 0) else if (compareIOInput(CMDName.上一张图) && currentState == CurrentStateEnum.打标中 && currDefectIndex > 0)
{
AddTextEvent("中断命令", $"上一张图-按钮");
gotoPrePic(); gotoPrePic();
AddTextEvent("中断命令", $"上一张图-完成");
}
else if (compareIOInput(CMDName.下一张图) && currentState == CurrentStateEnum.打标中 && currDefectIndex < defectList.Count - 1) else if (compareIOInput(CMDName.下一张图) && currentState == CurrentStateEnum.打标中 && currDefectIndex < defectList.Count - 1)
{
AddTextEvent("中断命令", $"下一张图-按钮");
gotoNextPic(); gotoNextPic();
AddTextEvent("中断命令", $"下一张图-完成");
}
else if (compareIOInput(CMDName.上一缺陷) && currentState == CurrentStateEnum.打标中 && currDefectIndex > 0) else if (compareIOInput(CMDName.上一缺陷) && currentState == CurrentStateEnum.打标中 && currDefectIndex > 0)
{
AddTextEvent("中断命令", $"上一缺陷-按钮");
gotoDefctListIndex(--currDefectIndex, currDefectIndex + 1); gotoDefctListIndex(--currDefectIndex, currDefectIndex + 1);
AddTextEvent("中断命令", $"上一缺陷-完成");
}
else if (compareIOInput(CMDName.下一缺陷) && currentState == CurrentStateEnum.打标中 && currDefectIndex < defectList.Count - 1) else if (compareIOInput(CMDName.下一缺陷) && currentState == CurrentStateEnum.打标中 && currDefectIndex < defectList.Count - 1)
{
AddTextEvent("中断命令", $"下一缺陷-按钮");
gotoDefctListIndex(++currDefectIndex, currDefectIndex - 1); gotoDefctListIndex(++currDefectIndex, currDefectIndex - 1);
AddTextEvent("中断命令", $"下一缺陷-完成");
}
else if (compareIOInput(CMDName.复位按钮) && this.tsbtnReset.Enabled) else if (compareIOInput(CMDName.复位按钮) && this.tsbtnReset.Enabled)
{
AddTextEvent("中断命令", $"复位-按钮");
resetCommand(); resetCommand();
AddTextEvent("中断命令", $"复位-完成");
}
// //
if (devContainer.state && warningLevel == WarningEnum.Normal if (devContainer.state && warningLevel == WarningEnum.Normal