sync 전용 화면 만들기 전 백업.

This commit is contained in:
backuppc
2025-12-10 10:35:19 +09:00
parent 2236e3b1ba
commit 3695ab0044
9 changed files with 132 additions and 104 deletions

View File

@@ -99,7 +99,7 @@
<GenerateSerializationAssemblies>Auto</GenerateSerializationAssemblies>
</PropertyGroup>
<ItemGroup>
<Reference Include="arCommUtil, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<Reference Include="arCommUtil, Version=25.11.25.2000, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\DLL\arCommUtil.dll</HintPath>
</Reference>
@@ -195,6 +195,12 @@
<Compile Include="Dialog\fCounter.Designer.cs">
<DependentUpon>fCounter.cs</DependentUpon>
</Compile>
<Compile Include="Dialog\fQuestionBox.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="Dialog\fQuestionBox.Designer.cs">
<DependentUpon>fQuestionBox.cs</DependentUpon>
</Compile>
<Compile Include="Dialog\fStateMachineDebug.cs">
<SubType>Form</SubType>
</Compile>

View File

@@ -39,6 +39,7 @@ namespace Project
InitializeComponent();
VAR.Init(128);
PUB.initCore();
UTIL.MessgeBoxLegacyMode = false;
this.KeyDown += (s1, e1) =>
{
if (e1.KeyCode == Keys.Escape) this.Close();
@@ -416,6 +417,11 @@ namespace Project
void func_sw_start(bool Prompt = false)
{
if(PUB.sm.Step == eSMStep.SYNC)
{
UTIL.MsgE("초기화 중에는 사용할 수 없습니다\n초기화가 완료 된 후 시도하세요");
return;
}
if (VAR.BOOL[eVarBool.FLAG_AUTORUN] == false) //자동상태가 아니라면
{
PUB.AGV.AGVErrorReset();
@@ -423,16 +429,12 @@ namespace Project
{
if (UTIL.MsgQ("AGV상태를 자동으로 전환 할까요?") != DialogResult.Yes) return;
}
//충전상태확인
if (PUB.CheckManualChargeMode() == false) return;
PUB.popup.needClose = true;
PUB.sm.bPause = false;
PUB.sm.SetNewStep(eSMStep.RUN);
if (PUB.Result.CurrentPos == ePosition.NONE || PUB.Result.TargetPos == ePosition.NONE)
{
PUB.sm.SetNewRunStep(ERunStep.GOHOME);
}
PUB.Speak(Lang.);
}
else

View File

@@ -39,6 +39,7 @@
this.btAutoCharge = new arCtl.arLabel();
this.btSpeaker = new arCtl.arLabel();
this.tabPage1 = new System.Windows.Forms.TabPage();
this.button8 = new System.Windows.Forms.Button();
this.vcGDS = new AGVControl.ValueSelect();
this.label7 = new System.Windows.Forms.Label();
this.vcXBID = new AGVControl.ValueSelect();
@@ -205,7 +206,6 @@
this.bt1 = new arCtl.arLabel();
this.bt0 = new arCtl.arLabel();
this.btSave = new arCtl.arLabel();
this.button8 = new System.Windows.Forms.Button();
this.tabControl1.SuspendLayout();
this.tabPage6.SuspendLayout();
this.panel1.SuspendLayout();
@@ -485,6 +485,19 @@
this.tabPage1.TabIndex = 0;
this.tabPage1.Text = "AGV";
//
// button8
//
this.button8.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.button8.Font = new System.Drawing.Font("궁서체", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
this.button8.Location = new System.Drawing.Point(480, 509);
this.button8.Name = "button8";
this.button8.Size = new System.Drawing.Size(147, 54);
this.button8.TabIndex = 82;
this.button8.Tag = "SCH";
this.button8.Text = "TurnGDS";
this.button8.UseVisualStyleBackColor = true;
this.button8.Click += new System.EventHandler(this.button8_Click);
//
// vcGDS
//
this.vcGDS.BackColorButton = System.Drawing.Color.White;
@@ -506,6 +519,7 @@
this.vcGDS.Tag = "SDH";
this.vcGDS.Text = "1000";
this.vcGDS.Value = 1000D;
this.vcGDS.ButtonClick += new System.EventHandler<AGVControl.ValueSelect.ButtonClickEventArgs>(this.vcChargeLow_ButtonClick);
//
// label7
//
@@ -3394,19 +3408,6 @@
this.btSave.TextVisible = true;
this.btSave.Click += new System.EventHandler(this.btSave_Click);
//
// button8
//
this.button8.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.button8.Font = new System.Drawing.Font("궁서체", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
this.button8.Location = new System.Drawing.Point(480, 509);
this.button8.Name = "button8";
this.button8.Size = new System.Drawing.Size(147, 54);
this.button8.TabIndex = 82;
this.button8.Tag = "SCH";
this.button8.Text = "TurnGDS";
this.button8.UseVisualStyleBackColor = true;
this.button8.Click += new System.EventHandler(this.button8_Click);
//
// fSetup
//
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;

View File

@@ -679,7 +679,9 @@ namespace Project
private void button8_Click(object sender, EventArgs e)
{
var value = (ushort)vcGDS.Value;
PUB.AGV.TurnGDSCenterScope(value);
var rlt = PUB.AGV.TurnGDSCenterScope(value);
if (rlt == false) UTIL.MsgE("Error");
else UTIL.MsgI("OK");
}
}
}