From 4adfd9671250a5c698ae1bc7b817f1060e2d907d Mon Sep 17 00:00:00 2001
From: 천호석 <hosuk1418@naver.com>
Date: 화, 18 10월 2022 09:30:31 +0900
Subject: [PATCH] Power meter HandShakingOn 기능 추가.
---
SHARP_CLAS_UI/500.Equipment/Equipment.cs | 9 +++++++--
SHARP_CLAS_UI/100.Screen/Form_Maintenance_Laser.cs | 7 ++++++-
SHARP_CLAS_UI/100.Screen/Form_Maintenance_Laser.Designer.cs | 14 ++++++++++++++
SHARP_CLAS_UI/500.Equipment/400.Module/400.Power_Meter/Power_Meter.cs | 14 ++++++++++++++
4 files changed, 41 insertions(+), 3 deletions(-)
diff --git a/SHARP_CLAS_UI/100.Screen/Form_Maintenance_Laser.Designer.cs b/SHARP_CLAS_UI/100.Screen/Form_Maintenance_Laser.Designer.cs
index 6a2133f..5163b71 100644
--- a/SHARP_CLAS_UI/100.Screen/Form_Maintenance_Laser.Designer.cs
+++ b/SHARP_CLAS_UI/100.Screen/Form_Maintenance_Laser.Designer.cs
@@ -118,6 +118,7 @@
this.label19 = new System.Windows.Forms.Label();
this.lb_Power_Meter_Init = new System.Windows.Forms.Label();
this.label1 = new System.Windows.Forms.Label();
+ this.btn_HandShakeOn = new System.Windows.Forms.Button();
this.pnl_Laser_Connection.SuspendLayout();
this.pnl_PulseGenerator.SuspendLayout();
this.pnl_Main.SuspendLayout();
@@ -671,6 +672,7 @@
// pnl_Scanner
//
this.pnl_Scanner.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+ this.pnl_Scanner.Controls.Add(this.btn_HandShakeOn);
this.pnl_Scanner.Controls.Add(this.lb_Laser_Status);
this.pnl_Scanner.Controls.Add(this.btn_Laser_Off);
this.pnl_Scanner.Controls.Add(this.label13);
@@ -1123,6 +1125,17 @@
this.label1.Text = "�뼚 Manual power measurement flow";
this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
+ // btn_HandShakeOn
+ //
+ this.btn_HandShakeOn.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+ this.btn_HandShakeOn.Location = new System.Drawing.Point(716, 245);
+ this.btn_HandShakeOn.Name = "btn_HandShakeOn";
+ this.btn_HandShakeOn.Size = new System.Drawing.Size(140, 40);
+ this.btn_HandShakeOn.TabIndex = 46;
+ this.btn_HandShakeOn.Text = "HandShakeOn";
+ this.btn_HandShakeOn.UseVisualStyleBackColor = true;
+ this.btn_HandShakeOn.Click += new System.EventHandler(this.btn_HandShakeOn_Click);
+ //
// Form_Maintenance_Laser
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
@@ -1237,5 +1250,6 @@
private System.Windows.Forms.Label lb_Position_Move;
private System.Windows.Forms.Label lb_Laser_Status;
private System.Windows.Forms.Button btn_Laser_Off;
+ private System.Windows.Forms.Button btn_HandShakeOn;
}
}
\ No newline at end of file
diff --git a/SHARP_CLAS_UI/100.Screen/Form_Maintenance_Laser.cs b/SHARP_CLAS_UI/100.Screen/Form_Maintenance_Laser.cs
index cb4e772..870d2d9 100644
--- a/SHARP_CLAS_UI/100.Screen/Form_Maintenance_Laser.cs
+++ b/SHARP_CLAS_UI/100.Screen/Form_Maintenance_Laser.cs
@@ -523,5 +523,10 @@
{
_Parent._equip.scanner.Set_Laser_Off();
}
+
+ private void btn_HandShakeOn_Click(object sender, EventArgs e)
+ {
+ _Parent._equip.power_meter.HandShakingOn();
+ }
}
-}
+}
\ No newline at end of file
diff --git a/SHARP_CLAS_UI/500.Equipment/400.Module/400.Power_Meter/Power_Meter.cs b/SHARP_CLAS_UI/500.Equipment/400.Module/400.Power_Meter/Power_Meter.cs
index ade604f..068fd7d 100644
--- a/SHARP_CLAS_UI/500.Equipment/400.Module/400.Power_Meter/Power_Meter.cs
+++ b/SHARP_CLAS_UI/500.Equipment/400.Module/400.Power_Meter/Power_Meter.cs
@@ -42,6 +42,20 @@
return str_data;
}
+ public bool HandShakingOn()
+ {
+ string result = SendWaitData("Command:SYSTem:COMMunicate:HANDshaking ON");
+
+ if (result.Contains("OK"))
+ {
+ return true;
+ }
+ else
+ {
+ return false;
+ }
+ }
+
public double Read_Power()
{
try
diff --git a/SHARP_CLAS_UI/500.Equipment/Equipment.cs b/SHARP_CLAS_UI/500.Equipment/Equipment.cs
index d7af1b8..5cf1253 100644
--- a/SHARP_CLAS_UI/500.Equipment/Equipment.cs
+++ b/SHARP_CLAS_UI/500.Equipment/Equipment.cs
@@ -578,7 +578,7 @@
power_meter = new Power_Meter(this, "COM3");
power_meter.Open();
-
+ power_meter.HandShakingOn();
Create_Exception_logger();
Create_Panel_Info_logger();
Create_Tact_Time_logger();
@@ -978,7 +978,12 @@
if (!Align_vision.isConnected) Alarm_Manager.Instance.Occurred(En_Alarm_List.AL_0510_ALIGN_VISION_DISCONNECT);
if (!Aoi_vision.isConnected) Alarm_Manager.Instance.Occurred(En_Alarm_List.AL_0511_AOI_VISION_DISCONNECT);
- if (!power_meter.isOpen && !Alarm_Manager.Instance.Occured_List.Exists(X => X.Code == En_Alarm_List.AL_0930_POWER_METER_DISCONNECTED)) { Alarm_Manager.Instance.Occurred(En_Alarm_List.AL_0930_POWER_METER_DISCONNECTED); power_meter.Open(); }
+ if (!power_meter.isOpen && !Alarm_Manager.Instance.Occured_List.Exists(X => X.Code == En_Alarm_List.AL_0930_POWER_METER_DISCONNECTED))
+ {
+ Alarm_Manager.Instance.Occurred(En_Alarm_List.AL_0930_POWER_METER_DISCONNECTED);
+ power_meter.Open();
+ power_meter.HandShakingOn();
+ }
if (equip_mode == En_Equipment_Mode.Auto && dt.Second % 10 == 0 && (loader.Panel_Exist && before.Panel_Exist && process.Panel_Exist && after.Panel_Exist && unloader.Panel_Exist) && !units.Exists(x => x.sequenceChangedTime.Minute < 10))
{
--
Gitblit v1.9.3