chore: commit all remaining changes

This commit is contained in:
backuppc
2026-02-04 15:26:22 +09:00
parent b388b1917d
commit ec2af6ac1f
17 changed files with 414 additions and 242 deletions

View File

@@ -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();
}
}
}