..
This commit is contained in:
@@ -9,6 +9,7 @@ using System.Threading.Tasks;
|
||||
using System.Windows.Forms;
|
||||
using static Project.StateMachine;
|
||||
using COMM;
|
||||
using AR;
|
||||
|
||||
namespace Project.ViewForm
|
||||
{
|
||||
@@ -28,7 +29,7 @@ namespace Project.ViewForm
|
||||
private void fAuto_Load(object sender, EventArgs e)
|
||||
{
|
||||
ctlAuto1.dev_agv = PUB.AGV;
|
||||
ctlAuto1.dev_plc = PUB.PLC;
|
||||
// ctlAuto1.dev_plc = PUB.PLC;
|
||||
ctlAuto1.dev_bms = PUB.BMS;
|
||||
ctlAuto1.dev_xbe = PUB.XBE;
|
||||
this.timer1.Start();
|
||||
@@ -40,7 +41,7 @@ namespace Project.ViewForm
|
||||
{
|
||||
PUB.log.Add("ui reset click");
|
||||
PUB.AGV.AGVErrorReset();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void Sm_StepChanged(object sender, StepChangeEventArgs e)
|
||||
@@ -52,7 +53,7 @@ namespace Project.ViewForm
|
||||
}
|
||||
|
||||
private void FAuto_FormClosed(object sender, FormClosedEventArgs e)
|
||||
{
|
||||
{
|
||||
timer1.Stop();
|
||||
PUB.sm.StepChanged -= Sm_StepChanged;
|
||||
this.ctlAuto1.ButtonClick -= CtlAuto1_ButtonClick;
|
||||
@@ -67,21 +68,13 @@ namespace Project.ViewForm
|
||||
|
||||
this.ctlAuto1.OnUpdateMode = true;
|
||||
|
||||
//lbBatteryLevel.Text = $"{PUB.BMS.Current_Level}%";
|
||||
//lbBatteryLevel.ProgressValue = PUB.BMS.Current_Level;
|
||||
|
||||
if(this.ctlAuto1.Scean == CtlAuto.eScean.Progress)
|
||||
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;
|
||||
}
|
||||
|
||||
//if(Pub.Result.StopMessagePLC.StartsWith()
|
||||
if (PUB.PLC.GetValueI(arDev.FakePLC.DIName.PINI_EMG) == true)
|
||||
this.ctlAuto1.StopMessage = PUB.Result.StopMessagePLC;
|
||||
else
|
||||
this.ctlAuto1.StopMessage = string.Empty;
|
||||
this.ctlAuto1.StopMessage = string.Empty;
|
||||
|
||||
if (PUB.sm.Step == StateMachine.eSMStep.RUN)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user