This commit is contained in:
atvstdla
2025-09-26 18:15:59 +09:00
parent 54c64a06bd
commit 16da4a5ffa
65 changed files with 5700 additions and 3514 deletions

View File

@@ -19,6 +19,16 @@ namespace Project
//로그가 너무 많이 쌓이니 해제한다
//Pub.log.AddE("Reader RES : " + resp);
}
else if (e.RawData.StartsWith("OK,BLOAD"))
{
var str = e.RawData.Replace("\r", "").Replace("\n", "");
PUB.log.AddI($"[{dev.Tag}] {str}");
}
else if (e.RawData.StartsWith("OK,BSAVE"))
{
var str = e.RawData.Replace("\r", "").Replace("\n", "");
PUB.log.AddI($"[{dev.Tag}] {str}");
}
else if (e.RawData.StartsWith("OK"))
{
//OK회신
@@ -110,8 +120,8 @@ namespace Project
private string KeyenceBarcodeDataF = string.Empty;
private string KeyenceBarcodeDataR = string.Empty;
/// <summary>
/// 키엔스로부터 받은 데이터를 분석한다.
/// </summary>
@@ -144,7 +154,37 @@ namespace Project
var RegX = new System.Text.RegularExpressions.Regex(Pattern);
foreach (var resp in frames)
{
if (RegX.IsMatch(resp.Trim()) == false)
var bcddata = resp.Trim().Split(',');
if(resp.Equals("0:ERROR"))
{
PUB.log.AddE($"[{Source}] {resp}");
continue;
}
else if (bcddata.Length > 2 && bcddata[1] == "BLOAD")
{
if(bcddata[0] =="ER")
{
PUB.log.AddE($"[{Source}]Bacode Memory Read Error({resp})");
}
else
{
PUB.log.AddI($"[{Source}]Bacode Memory Read Complete({resp})");
}
continue;
}
else if (bcddata.Length > 2 && bcddata[1] == "BSAVE")
{
if (bcddata[0] == "ER")
{
PUB.log.AddE($"[{Source}]Bacode Memory Read Error({resp})");
}
else
{
PUB.log.AddI($"[{Source}]Bacode Memory Read Complete({resp})");
}
continue;
}
else if (RegX.IsMatch(resp.Trim()) == false)
{
//에러처리 221018
if (resp.StartsWith("0:ERROR")) continue;
@@ -163,7 +203,7 @@ namespace Project
var MatchList = RegX.Matches(resp.Trim());
var buf = MatchList[0].Groups;
var angle = 0;
var sym = buf[1].Value; //symbol
var vData = buf[2].Value.Trim(); //data
@@ -229,7 +269,7 @@ namespace Project
{
theta = angbcd.Angle;
}
var theta_rad = -theta * Math.PI / 180.0;
var PX = (int)(Math.Cos(theta_rad) * (vertextCP.X - ReelCP.X) - Math.Sin(theta_rad) * (vertextCP.Y - ReelCP.Y)) + ReelCP.X;
var PY = (int)(Math.Sin(theta_rad) * (vertextCP.X - ReelCP.X) + Math.Cos(theta_rad) * (vertextCP.Y - ReelCP.Y)) + ReelCP.Y;
@@ -281,7 +321,7 @@ namespace Project
else PUB.log.AddE($"[X]BCD RESERV[NEW:{sym}] " + Source + " " + vData);
itemC.VisionData.UpdateBarcodePositionData();
itemC.VisionData.BarcodeDirty = true;
itemC.VisionData.BarcodeTouched = true;
}
else
{
@@ -305,7 +345,7 @@ namespace Project
PUB.log.Add($"[UPD]BCD RESERV:{sym}] " + Source + " " + vData);
itemC.VisionData.barcodelist[valuekey] = newitem;
itemC.VisionData.UpdateBarcodePositionData();
itemC.VisionData.BarcodeDirty = true;
itemC.VisionData.BarcodeTouched = true;
}
}
}