This commit is contained in:
backuppc
2025-11-12 17:37:03 +09:00
parent 1c12beb3e7
commit 028e9ab35f
6 changed files with 66 additions and 9 deletions

View File

@@ -46,6 +46,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AGVSimulator", "AGVLogic\AG
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Test_Port", "TestProject\Test_Port\Test_Port.csproj", "{CCFA2CE7-A539-4ADC-B803-F759284C3463}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Test_Port", "TestProject\Test_Port\Test_Port.csproj", "{CCFA2CE7-A539-4ADC-B803-F759284C3463}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Test_ACS", "TestProject\Test_ACS\Test_ACS.csproj", "{A1B2C3D4-E5F6-4A5B-8C9D-0E1F2A3B4C5D}"
EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU Debug|Any CPU = Debug|Any CPU
@@ -224,6 +226,18 @@ Global
{CCFA2CE7-A539-4ADC-B803-F759284C3463}.Release|x64.Build.0 = Release|Any CPU {CCFA2CE7-A539-4ADC-B803-F759284C3463}.Release|x64.Build.0 = Release|Any CPU
{CCFA2CE7-A539-4ADC-B803-F759284C3463}.Release|x86.ActiveCfg = Release|Any CPU {CCFA2CE7-A539-4ADC-B803-F759284C3463}.Release|x86.ActiveCfg = Release|Any CPU
{CCFA2CE7-A539-4ADC-B803-F759284C3463}.Release|x86.Build.0 = Release|Any CPU {CCFA2CE7-A539-4ADC-B803-F759284C3463}.Release|x86.Build.0 = Release|Any CPU
{A1B2C3D4-E5F6-4A5B-8C9D-0E1F2A3B4C5D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A1B2C3D4-E5F6-4A5B-8C9D-0E1F2A3B4C5D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A1B2C3D4-E5F6-4A5B-8C9D-0E1F2A3B4C5D}.Debug|x64.ActiveCfg = Debug|Any CPU
{A1B2C3D4-E5F6-4A5B-8C9D-0E1F2A3B4C5D}.Debug|x64.Build.0 = Debug|Any CPU
{A1B2C3D4-E5F6-4A5B-8C9D-0E1F2A3B4C5D}.Debug|x86.ActiveCfg = Debug|Any CPU
{A1B2C3D4-E5F6-4A5B-8C9D-0E1F2A3B4C5D}.Debug|x86.Build.0 = Debug|Any CPU
{A1B2C3D4-E5F6-4A5B-8C9D-0E1F2A3B4C5D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A1B2C3D4-E5F6-4A5B-8C9D-0E1F2A3B4C5D}.Release|Any CPU.Build.0 = Release|Any CPU
{A1B2C3D4-E5F6-4A5B-8C9D-0E1F2A3B4C5D}.Release|x64.ActiveCfg = Release|Any CPU
{A1B2C3D4-E5F6-4A5B-8C9D-0E1F2A3B4C5D}.Release|x64.Build.0 = Release|Any CPU
{A1B2C3D4-E5F6-4A5B-8C9D-0E1F2A3B4C5D}.Release|x86.ActiveCfg = Release|Any CPU
{A1B2C3D4-E5F6-4A5B-8C9D-0E1F2A3B4C5D}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE
@@ -240,6 +254,7 @@ Global
{A1B2C3D4-E5F6-7890-ABCD-EF1234567890} = {E5C75D32-5AD6-44DD-8F27-E32023206EBB} {A1B2C3D4-E5F6-7890-ABCD-EF1234567890} = {E5C75D32-5AD6-44DD-8F27-E32023206EBB}
{B2C3D4E5-0000-0000-0000-000000000000} = {E5C75D32-5AD6-44DD-8F27-E32023206EBB} {B2C3D4E5-0000-0000-0000-000000000000} = {E5C75D32-5AD6-44DD-8F27-E32023206EBB}
{CCFA2CE7-A539-4ADC-B803-F759284C3463} = {7AF32085-E7A6-4D06-BA6E-C6B1EBAEA99A} {CCFA2CE7-A539-4ADC-B803-F759284C3463} = {7AF32085-E7A6-4D06-BA6E-C6B1EBAEA99A}
{A1B2C3D4-E5F6-4A5B-8C9D-0E1F2A3B4C5D} = {7AF32085-E7A6-4D06-BA6E-C6B1EBAEA99A}
EndGlobalSection EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {B5B1FD72-356F-4840-83E8-B070AC21C8D9} SolutionGuid = {B5B1FD72-356F-4840-83E8-B070AC21C8D9}

View File

@@ -93,10 +93,9 @@ namespace Project
[Browsable(false), Category("Commnunication Setting"), DisplayName("RFID PortName"), Editor(typeof(MyUITypeEditor), typeof(UITypeEditor))] [Browsable(false), Category("Commnunication Setting"), DisplayName("RFID PortName"), Editor(typeof(MyUITypeEditor), typeof(UITypeEditor))]
public string Port_AGV { get; set; } public string Port_AGV { get; set; }
[Category("Commnunication Setting"), DisplayName("Xbee ID"), Editor(typeof(MyUITypeEditor), typeof(UITypeEditor))] [Browsable(false), Category("Commnunication Setting"), DisplayName("Xbee ID"), Editor(typeof(MyUITypeEditor), typeof(UITypeEditor))]
public byte XBE_ID { get; set; } public byte XBE_ID { get; set; }
[Browsable(false), Category("Commnunication Setting"), DisplayName("BMS PortName"), Editor(typeof(MyUITypeEditor), typeof(UITypeEditor))] [Browsable(false), Category("Commnunication Setting"), DisplayName("BMS PortName"), Editor(typeof(MyUITypeEditor), typeof(UITypeEditor))]
public string Port_BAT { get; set; } public string Port_BAT { get; set; }
@@ -313,7 +312,7 @@ namespace Project
public override void AfterLoad() public override void AfterLoad()
{ {
if (StatusInterval < 10) StatusInterval = 300; //5분간격 if (StatusInterval < 10) StatusInterval = 300; //5분간격
if (XBE_ID < 1) XBE_ID = 0xFF; //0은 acs 이므로 쓰지못하게한다.
if (SAD == 0) SAD = 999; if (SAD == 0) SAD = 999;
if (TAGF1A == 0) if (TAGF1A == 0)
{ {

View File

@@ -202,6 +202,8 @@
this.bt1 = new arCtl.arLabel(); this.bt1 = new arCtl.arLabel();
this.bt0 = new arCtl.arLabel(); this.bt0 = new arCtl.arLabel();
this.btSave = new arCtl.arLabel(); this.btSave = new arCtl.arLabel();
this.label7 = new System.Windows.Forms.Label();
this.vcXBID = new AGVControl.ValueSelect();
this.tabControl1.SuspendLayout(); this.tabControl1.SuspendLayout();
this.tabPage6.SuspendLayout(); this.tabPage6.SuspendLayout();
this.panel1.SuspendLayout(); this.panel1.SuspendLayout();
@@ -428,6 +430,8 @@
// tabPage1 // tabPage1
// //
this.tabPage1.BackColor = System.Drawing.Color.Navy; this.tabPage1.BackColor = System.Drawing.Color.Navy;
this.tabPage1.Controls.Add(this.label7);
this.tabPage1.Controls.Add(this.vcXBID);
this.tabPage1.Controls.Add(this.tbagvchannel); this.tabPage1.Controls.Add(this.tbagvchannel);
this.tabPage1.Controls.Add(this.tbagvpanid); this.tabPage1.Controls.Add(this.tbagvpanid);
this.tabPage1.Controls.Add(this.tbagvaddr); this.tabPage1.Controls.Add(this.tbagvaddr);
@@ -3329,6 +3333,41 @@
this.btSave.TextVisible = true; this.btSave.TextVisible = true;
this.btSave.Click += new System.EventHandler(this.btSave_Click); this.btSave.Click += new System.EventHandler(this.btSave_Click);
// //
// label7
//
this.label7.AutoSize = true;
this.label7.Font = new System.Drawing.Font("궁서체", 18F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
this.label7.ForeColor = System.Drawing.Color.WhiteSmoke;
this.label7.Location = new System.Drawing.Point(162, 524);
this.label7.Name = "label7";
this.label7.Size = new System.Drawing.Size(101, 24);
this.label7.TabIndex = 79;
this.label7.Text = "Xbee ID";
this.label7.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// vcXBID
//
this.vcXBID.BackColorButton = System.Drawing.Color.White;
this.vcXBID.ButtonWidth = "30";
this.vcXBID.ColorBorder = System.Drawing.Color.White;
this.vcXBID.DecimalPosition = ((ushort)(0));
this.vcXBID.Font = new System.Drawing.Font("맑은 고딕", 26.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
this.vcXBID.FontSideButton = new System.Drawing.Font("Consolas", 15F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.vcXBID.ForeColor = System.Drawing.Color.White;
this.vcXBID.ForeColorButton = System.Drawing.Color.Black;
this.vcXBID.Location = new System.Drawing.Point(269, 509);
this.vcXBID.MaxValue = 9999D;
this.vcXBID.MinValue = 0D;
this.vcXBID.Name = "vcXBID";
this.vcXBID.NullDisplay = "--";
this.vcXBID.SideButtonClickValue = 1D;
this.vcXBID.Size = new System.Drawing.Size(164, 54);
this.vcXBID.TabIndex = 78;
this.vcXBID.Tag = "SDH";
this.vcXBID.Text = "30";
this.vcXBID.Value = 30D;
this.vcXBID.ButtonClick += new System.EventHandler<AGVControl.ValueSelect.ButtonClickEventArgs>(this.vcChargeLow_ButtonClick);
//
// fSetup // fSetup
// //
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
@@ -3547,5 +3586,7 @@
private System.Windows.Forms.Label label58; private System.Windows.Forms.Label label58;
private System.Windows.Forms.ComboBox cmbChargerPos; private System.Windows.Forms.ComboBox cmbChargerPos;
private System.Windows.Forms.CheckBox chkClearPos; private System.Windows.Forms.CheckBox chkClearPos;
private System.Windows.Forms.Label label7;
private AGVControl.ValueSelect vcXBID;
} }
} }

View File

@@ -76,6 +76,7 @@ namespace Project
vcSSK.Value = PUB.setting.SSK; vcSSK.Value = PUB.setting.SSK;
vcSTT.Value = PUB.setting.STT; vcSTT.Value = PUB.setting.STT;
vcSAD.Value = PUB.setting.SAD; vcSAD.Value = PUB.setting.SAD;
vcXBID.Value = PUB.setting.XBE_ID;
tbagvaddr.Text = PUB.setting.AGV_ADDRESS; tbagvaddr.Text = PUB.setting.AGV_ADDRESS;
tbagvpanid.Text = PUB.setting.AGV_PANID; tbagvpanid.Text = PUB.setting.AGV_PANID;
@@ -260,6 +261,7 @@ namespace Project
PUB.setting.SSK = (int)vcSSK.Value; PUB.setting.SSK = (int)vcSSK.Value;
PUB.setting.STT = (int)vcSTT.Value; PUB.setting.STT = (int)vcSTT.Value;
PUB.setting.SAD = (int)vcSAD.Value; PUB.setting.SAD = (int)vcSAD.Value;
PUB.setting.XBE_ID = (byte)vcXBID.Value;
//속도 저/중/고 //속도 저/중/고
PUB.setting.SPD_L = (int)vcSpeedL.Value; PUB.setting.SPD_L = (int)vcSpeedL.Value;

Submodule Cs_HMI/SubProject/EnigProtocol updated: e8cae2c4ee...6c8ed6d2f2

View File

@@ -11,11 +11,11 @@ NARMI 71 (AGV) : P46A6,C17,DH:0,DL:FFFF,MY31
충전기04 : P46A6,C17,DH:0,DL:FFFF,MY41 충전기04 : P46A6,C17,DH:0,DL:FFFF,MY41
충전기71 : P46A6,C17,DH:0,DL:FFFF,MY46 충전기71 : P46A6,C17,DH:0,DL:FFFF,MY46
ACS : P46A6,C17,DH:0,DL:FFFF,MY10 ACS : P46A5,C17,DH:0,DL:FFFF,MY10
BUFFER : P46A6,C17,DH:0,DL:FFFF,MY60~65 BUFFER : P46A5,C17,DH:0,DL:FFFF,MY60~65
AGV1 : P46A6,C17,DH:0,DL:FFFF,MY50 AGV1 : P46A5,C17,DH:0,DL:FFFF,MY50
AGV2 : P46A6,C17,DH:0,DL:FFFF,MY51 AGV2 : P46A5,C17,DH:0,DL:FFFF,MY51
DOOR : P46A6,C17,DH:0,DL:FFFF,MY30 DOOR : P46A5,C17,DH:0,DL:FFFF,MY30