chore: commit all remaining changes
This commit is contained in:
backuppc
92
HMI/Project/ViewForm/fAuto.Designer.cs
generated
92
HMI/Project/ViewForm/fAuto.Designer.cs
generated
@@ -32,63 +32,65 @@ namespace Project.ViewForm
|
||||
/// </summary>
|
||||
private void InitializeComponent()
|
||||
{
|
||||
components = new System.ComponentModel.Container();
|
||||
timer1 = new System.Windows.Forms.Timer(components);
|
||||
ctlAuto1 = new CtlAuto();
|
||||
panel1 = new Panel();
|
||||
SuspendLayout();
|
||||
this.components = new System.ComponentModel.Container();
|
||||
this.timer1 = new System.Windows.Forms.Timer(this.components);
|
||||
this.ctlAuto1 = new Project.CtlAuto();
|
||||
this.panel1 = new System.Windows.Forms.Panel();
|
||||
this.SuspendLayout();
|
||||
//
|
||||
// timer1
|
||||
//
|
||||
timer1.Interval = 200;
|
||||
this.timer1.Interval = 200;
|
||||
this.timer1.Tick += new System.EventHandler(this.timer1_Tick);
|
||||
//
|
||||
// ctlAuto1
|
||||
//
|
||||
ctlAuto1.BackColor = Color.FromArgb(32, 32, 32);
|
||||
ctlAuto1.BorderColor = Color.Transparent;
|
||||
ctlAuto1.Font = new Font("맑은 고딕", 20F, FontStyle.Regular, GraphicsUnit.Point, 129);
|
||||
ctlAuto1.Font_BMS_Level = new Font("Bahnschrift Condensed", 250F, FontStyle.Bold, GraphicsUnit.Point, 0);
|
||||
ctlAuto1.Font_BMS_Volt = new Font("Bahnschrift Condensed", 50.25F, FontStyle.Bold);
|
||||
ctlAuto1.Font_MAIN_BMSLevel = new Font("Arial Narrow", 150F, FontStyle.Bold);
|
||||
ctlAuto1.ForeColor = Color.White;
|
||||
ctlAuto1.ItemGap = 0;
|
||||
ctlAuto1.Items = null;
|
||||
ctlAuto1.Location = new Point(835, 338);
|
||||
ctlAuto1.MinimumSize = new Size(100, 30);
|
||||
ctlAuto1.Name = "ctlAuto1";
|
||||
ctlAuto1.ProgressMax = 100F;
|
||||
ctlAuto1.ProgressVal = 50F;
|
||||
ctlAuto1.Scean = CtlAuto.eScean.Normal;
|
||||
ctlAuto1.Size = new Size(179, 241);
|
||||
ctlAuto1.StatusMessage = "상태메세지 입니다";
|
||||
ctlAuto1.StopMessage = "";
|
||||
ctlAuto1.StopTime = new DateTime(0L);
|
||||
ctlAuto1.TabIndex = 20;
|
||||
ctlAuto1.Text = "ctlAuto1";
|
||||
this.ctlAuto1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(32)))), ((int)(((byte)(32)))), ((int)(((byte)(32)))));
|
||||
this.ctlAuto1.BorderColor = System.Drawing.Color.Transparent;
|
||||
this.ctlAuto1.Font = new System.Drawing.Font("맑은 고딕", 20F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
|
||||
this.ctlAuto1.Font_BMS_Level = new System.Drawing.Font("Bahnschrift Condensed", 250F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
||||
this.ctlAuto1.Font_BMS_Volt = new System.Drawing.Font("Bahnschrift Condensed", 50.25F, System.Drawing.FontStyle.Bold);
|
||||
this.ctlAuto1.Font_MAIN_BMSLevel = new System.Drawing.Font("Microsoft Sans Serif", 150F, System.Drawing.FontStyle.Bold);
|
||||
this.ctlAuto1.ForeColor = System.Drawing.Color.White;
|
||||
this.ctlAuto1.ItemGap = 0;
|
||||
this.ctlAuto1.Items = null;
|
||||
this.ctlAuto1.Location = new System.Drawing.Point(835, 338);
|
||||
this.ctlAuto1.MinimumSize = new System.Drawing.Size(100, 30);
|
||||
this.ctlAuto1.Name = "ctlAuto1";
|
||||
this.ctlAuto1.ProgressMax = 100F;
|
||||
this.ctlAuto1.ProgressVal = 50F;
|
||||
this.ctlAuto1.Scean = Project.CtlAuto.eScean.Normal;
|
||||
this.ctlAuto1.Size = new System.Drawing.Size(179, 241);
|
||||
this.ctlAuto1.StatusMessage = "상태메세지 입니다";
|
||||
this.ctlAuto1.StopMessage = "";
|
||||
this.ctlAuto1.StopTime = new System.DateTime(((long)(0)));
|
||||
this.ctlAuto1.TabIndex = 20;
|
||||
this.ctlAuto1.Text = "ctlAuto1";
|
||||
//
|
||||
// panel1
|
||||
//
|
||||
panel1.Dock = DockStyle.Fill;
|
||||
panel1.Font = new Font("Tahoma", 8F, FontStyle.Bold);
|
||||
panel1.Location = new Point(0, 0);
|
||||
panel1.Name = "panel1";
|
||||
panel1.Size = new Size(1014, 579);
|
||||
panel1.TabIndex = 21;
|
||||
this.panel1.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||
this.panel1.Font = new System.Drawing.Font("Tahoma", 8F, System.Drawing.FontStyle.Bold);
|
||||
this.panel1.Location = new System.Drawing.Point(0, 0);
|
||||
this.panel1.Name = "panel1";
|
||||
this.panel1.Size = new System.Drawing.Size(1014, 579);
|
||||
this.panel1.TabIndex = 21;
|
||||
//
|
||||
// fAuto
|
||||
//
|
||||
AutoScaleMode = AutoScaleMode.None;
|
||||
BackColor = Color.FromArgb(15, 15, 15);
|
||||
ClientSize = new Size(1014, 579);
|
||||
Controls.Add(panel1);
|
||||
Controls.Add(ctlAuto1);
|
||||
DoubleBuffered = true;
|
||||
FormBorderStyle = FormBorderStyle.None;
|
||||
Name = "fAuto";
|
||||
Text = "fAuto";
|
||||
Load += fAuto_Load;
|
||||
VisibleChanged += fAuto_VisibleChanged;
|
||||
ResumeLayout(false);
|
||||
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
|
||||
this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(15)))), ((int)(((byte)(15)))), ((int)(((byte)(15)))));
|
||||
this.ClientSize = new System.Drawing.Size(1014, 579);
|
||||
this.Controls.Add(this.panel1);
|
||||
this.Controls.Add(this.ctlAuto1);
|
||||
this.DoubleBuffered = true;
|
||||
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
|
||||
this.Name = "fAuto";
|
||||
this.Text = "fAuto";
|
||||
this.Load += new System.EventHandler(this.fAuto_Load_1);
|
||||
this.VisibleChanged += new System.EventHandler(this.fAuto_VisibleChanged);
|
||||
this.ResumeLayout(false);
|
||||
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
@@ -141,7 +141,7 @@ namespace Project.ViewForm
|
||||
|
||||
PUB.AGV.DataReceive += AGV_DataReceive;
|
||||
|
||||
this.timer1.Start();
|
||||
|
||||
}
|
||||
private void AGV_DataReceive(object sender, arDev.Narumi.DataEventArgs e)
|
||||
{
|
||||
@@ -194,34 +194,7 @@ namespace Project.ViewForm
|
||||
|
||||
private void timer1_Tick_1(object sender, EventArgs e)
|
||||
{
|
||||
//if (this.Visible == false) return;
|
||||
//if (tmrun == true) return;
|
||||
//tmrun = true;
|
||||
|
||||
//this.ctlAuto1.OnUpdateMode = true;
|
||||
|
||||
//if (this.ctlAuto1.Scean == CtlAuto.eScean.Progress)
|
||||
//{
|
||||
// ctlAuto1.ProgressVal = PUB.Result.SMSG_ProgressValue;
|
||||
// ctlAuto1.ProgressMax = PUB.Result.SMSG_ProgressMax;
|
||||
// ctlAuto1.StatusMessage = VAR.STR?.Get(eVarString.StatusMessage) ?? string.Empty;
|
||||
//}
|
||||
//this.ctlAuto1.StopMessage = string.Empty;
|
||||
|
||||
//if (PUB.sm.Step == StateMachine.eSMStep.RUN)
|
||||
//{
|
||||
// this.ctlAuto1.runStep = PUB.sm.RunStep;
|
||||
//}
|
||||
//else
|
||||
//{
|
||||
// this.ctlAuto1.runStep = ERunStep.READY;
|
||||
//}
|
||||
//this.ctlAuto1.OnUpdateMode = false;
|
||||
//this.ctlAuto1.Invalidate();
|
||||
|
||||
//PUB.mapctl.PredictNextAction();
|
||||
|
||||
//tmrun = false;
|
||||
|
||||
}
|
||||
|
||||
private void HandleRunModeClick(MapNode targetNode)
|
||||
@@ -267,5 +240,56 @@ namespace Project.ViewForm
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
private void timer1_Tick(object sender, EventArgs e)
|
||||
{
|
||||
|
||||
if (this.Visible == false) return;
|
||||
if (tmrun == true) return;
|
||||
if (PUB.sm.Step < eSMStep.IDLE) return;
|
||||
if (PUB._mapCanvas == null) return;
|
||||
tmrun = true;
|
||||
|
||||
|
||||
var errmsg = string.Empty;
|
||||
if(PUB.AGV.IsOpen==false)
|
||||
{
|
||||
errmsg = "AGV컨트롤러 연결실패";
|
||||
}
|
||||
else if(PUB.XBE.IsOpen==false )
|
||||
{
|
||||
errmsg = "XBEE 연결실패";
|
||||
}
|
||||
else if (PUB.XBE.senderrcnt > 5)
|
||||
{
|
||||
errmsg = "XBEE 통신불가";
|
||||
}
|
||||
else if(PUB.AGV.error.Value > 0)
|
||||
{
|
||||
errmsg = PUB.AGV.error.ToString();
|
||||
}
|
||||
else if(PUB.AGV.system1.stop_by_front_detect)
|
||||
{
|
||||
errmsg = "전방 물체감지로 인해 정지";
|
||||
}
|
||||
else if (PUB.BMS.IsOpen == false)
|
||||
{
|
||||
errmsg = "BMS 연결실패";
|
||||
}
|
||||
else if(VAR.BOOL[eVarBool.FLAG_AUTORUN]==false)
|
||||
{
|
||||
errmsg = "자동모드가 아닙니다";
|
||||
}
|
||||
|
||||
PUB._mapCanvas.SetAlertMessage(errmsg);
|
||||
|
||||
|
||||
tmrun = false;
|
||||
}
|
||||
|
||||
private void fAuto_Load_1(object sender, EventArgs e)
|
||||
{
|
||||
this.timer1.Start();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user