diff --git a/INT69DB_2A/DataStore.cs b/INT69DB_2A/DataStore.cs index c94c5d4..1073408 100644 --- a/INT69DB_2A/DataStore.cs +++ b/INT69DB_2A/DataStore.cs @@ -491,10 +491,10 @@ namespace INT69DB_2A AutoZeroMode, EtcDoubleEntry, - EtcChattering, - EtcBuzzerRunTime, - EtcRelayRunTime, - EtcDecimalpoint, + Chattering, + BuzzerONTime, + RelayONTime, + Decimal, EtcBypass, MotorDirection, diff --git a/INT69DB_2A/Forms/FormConfiguration.cs b/INT69DB_2A/Forms/FormConfiguration.cs index 3314fdb..11acfb3 100644 --- a/INT69DB_2A/Forms/FormConfiguration.cs +++ b/INT69DB_2A/Forms/FormConfiguration.cs @@ -481,7 +481,7 @@ namespace INT69DB_2A.Forms this.ParentForm.TransferDataStream(CommunicationCommand.Write, CommunicationID.MainBoard, CommunicationAddress._6006_Chattering, value); if (this.ParentForm.SystemConfig.IsPart11 == true) - this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.EtcChattering, "", before, after); + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.Chattering, "", before, after); } } } @@ -511,7 +511,7 @@ namespace INT69DB_2A.Forms this.ParentForm.TransferDataStream(CommunicationCommand.Write, CommunicationID.MainBoard, CommunicationAddress._6001_BuzzerOnTime, value); if (this.ParentForm.SystemConfig.IsPart11 == true) - this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.EtcBuzzerRunTime, "", before, after); + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.BuzzerONTime, "", before, after); } } } @@ -541,7 +541,7 @@ namespace INT69DB_2A.Forms this.ParentForm.TransferDataStream(CommunicationCommand.Write, CommunicationID.MainBoard, CommunicationAddress._6002_RelayRunTime, value); if (this.ParentForm.SystemConfig.IsPart11 == true) - this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.EtcRelayRunTime, "", before, after); + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.RelayONTime, "", before, after); } } } @@ -576,7 +576,7 @@ namespace INT69DB_2A.Forms after = this.comboBoxDecimalPlaces.SelectedItem.ToString(); if (this.ParentForm.SystemConfig.IsPart11 == true) - this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.EtcDecimalpoint, "", before, after); + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.Decimal, "", before, after); } private void labelAlarmContinuousNG_Click(object sender, EventArgs e) diff --git a/INT69DB_2A/Forms/FormInformation.cs b/INT69DB_2A/Forms/FormInformation.cs index 431e917..d98964d 100644 --- a/INT69DB_2A/Forms/FormInformation.cs +++ b/INT69DB_2A/Forms/FormInformation.cs @@ -109,7 +109,7 @@ namespace INT69DB_2A.Forms } private void DefaultSetting() { - this.labelDisplayVer.Text = "6.1.1"; + this.labelDisplayVer.Text = "6.2.0"; this.labelUserMgerVer.Text = ""; this.labelAes128Ver.Text = ""; this.labelSerialNo.Text = this.ParentForm.SystemConfig.SerialNumber; diff --git a/INT69DB_2A/Forms/FormMotorSetting.Designer.cs b/INT69DB_2A/Forms/FormMotorSetting.Designer.cs index 5b668d2..022eb26 100644 --- a/INT69DB_2A/Forms/FormMotorSetting.Designer.cs +++ b/INT69DB_2A/Forms/FormMotorSetting.Designer.cs @@ -127,6 +127,7 @@ this.buttonCom1TestForward = new SmartX.SmartButton(); this.buttonCom1TestReverse = new SmartX.SmartButton(); this.panel1 = new System.Windows.Forms.Panel(); + this.radioButtonImpellerMotorAngle180180 = new SmartX.SmartRadioButton(); ((System.ComponentModel.ISupportInitialize)(this.smartForm1)).BeginInit(); this.groupBoxSelectImpeller.SuspendLayout(); this.groupBoxEach.SuspendLayout(); @@ -430,7 +431,7 @@ this.buttonEachForward.ColorKeySamplePosition = new System.Drawing.Point(0, 0); this.buttonEachForward.DisableImage = null; this.buttonEachForward.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonEachForward.DownImage"))); - this.buttonEachForward.Font = new System.Drawing.Font("New Gulim", 12F, System.Drawing.FontStyle.Bold); + this.buttonEachForward.Font = new System.Drawing.Font("새굴림", 12F, System.Drawing.FontStyle.Bold); this.buttonEachForward.GroupID = 0; this.buttonEachForward.InitVisible = true; this.buttonEachForward.Location = new System.Drawing.Point(27, 55); @@ -463,7 +464,7 @@ this.buttonEachReverse.ColorKeySamplePosition = new System.Drawing.Point(0, 0); this.buttonEachReverse.DisableImage = null; this.buttonEachReverse.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonEachReverse.DownImage"))); - this.buttonEachReverse.Font = new System.Drawing.Font("New Gulim", 12F, System.Drawing.FontStyle.Bold); + this.buttonEachReverse.Font = new System.Drawing.Font("새굴림", 12F, System.Drawing.FontStyle.Bold); this.buttonEachReverse.GroupID = 0; this.buttonEachReverse.InitVisible = true; this.buttonEachReverse.Location = new System.Drawing.Point(113, 55); @@ -496,7 +497,7 @@ this.buttonEachUnlock.ColorKeySamplePosition = new System.Drawing.Point(0, 0); this.buttonEachUnlock.DisableImage = null; this.buttonEachUnlock.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonEachUnlock.DownImage"))); - this.buttonEachUnlock.Font = new System.Drawing.Font("New Gulim", 12F, System.Drawing.FontStyle.Bold); + this.buttonEachUnlock.Font = new System.Drawing.Font("새굴림", 12F, System.Drawing.FontStyle.Bold); this.buttonEachUnlock.GroupID = 0; this.buttonEachUnlock.InitVisible = true; this.buttonEachUnlock.Location = new System.Drawing.Point(199, 55); @@ -529,7 +530,7 @@ this.buttonEachContinue.ColorKeySamplePosition = new System.Drawing.Point(0, 0); this.buttonEachContinue.DisableImage = null; this.buttonEachContinue.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonEachContinue.DownImage"))); - this.buttonEachContinue.Font = new System.Drawing.Font("New Gulim", 12F, System.Drawing.FontStyle.Bold); + this.buttonEachContinue.Font = new System.Drawing.Font("새굴림", 12F, System.Drawing.FontStyle.Bold); this.buttonEachContinue.GroupID = 0; this.buttonEachContinue.InitVisible = true; this.buttonEachContinue.Location = new System.Drawing.Point(285, 55); @@ -562,7 +563,7 @@ this.buttonAllContinue.ColorKeySamplePosition = new System.Drawing.Point(0, 0); this.buttonAllContinue.DisableImage = null; this.buttonAllContinue.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonAllContinue.DownImage"))); - this.buttonAllContinue.Font = new System.Drawing.Font("New Gulim", 12F, System.Drawing.FontStyle.Bold); + this.buttonAllContinue.Font = new System.Drawing.Font("새굴림", 12F, System.Drawing.FontStyle.Bold); this.buttonAllContinue.GroupID = 0; this.buttonAllContinue.InitVisible = true; this.buttonAllContinue.Location = new System.Drawing.Point(284, 55); @@ -595,7 +596,7 @@ this.buttonAllUnlock.ColorKeySamplePosition = new System.Drawing.Point(0, 0); this.buttonAllUnlock.DisableImage = null; this.buttonAllUnlock.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonAllUnlock.DownImage"))); - this.buttonAllUnlock.Font = new System.Drawing.Font("New Gulim", 12F, System.Drawing.FontStyle.Bold); + this.buttonAllUnlock.Font = new System.Drawing.Font("새굴림", 12F, System.Drawing.FontStyle.Bold); this.buttonAllUnlock.GroupID = 0; this.buttonAllUnlock.InitVisible = true; this.buttonAllUnlock.Location = new System.Drawing.Point(198, 55); @@ -628,7 +629,7 @@ this.buttonAllReverse.ColorKeySamplePosition = new System.Drawing.Point(0, 0); this.buttonAllReverse.DisableImage = null; this.buttonAllReverse.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonAllReverse.DownImage"))); - this.buttonAllReverse.Font = new System.Drawing.Font("New Gulim", 12F, System.Drawing.FontStyle.Bold); + this.buttonAllReverse.Font = new System.Drawing.Font("새굴림", 12F, System.Drawing.FontStyle.Bold); this.buttonAllReverse.GroupID = 0; this.buttonAllReverse.InitVisible = true; this.buttonAllReverse.Location = new System.Drawing.Point(112, 55); @@ -661,7 +662,7 @@ this.buttonAllForward.ColorKeySamplePosition = new System.Drawing.Point(0, 0); this.buttonAllForward.DisableImage = null; this.buttonAllForward.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonAllForward.DownImage"))); - this.buttonAllForward.Font = new System.Drawing.Font("New Gulim", 12F, System.Drawing.FontStyle.Bold); + this.buttonAllForward.Font = new System.Drawing.Font("새굴림", 12F, System.Drawing.FontStyle.Bold); this.buttonAllForward.GroupID = 0; this.buttonAllForward.InitVisible = true; this.buttonAllForward.Location = new System.Drawing.Point(26, 55); @@ -702,7 +703,7 @@ this.groupBoxSelectImpeller.Controls.Add(this.buttonLine4); this.groupBoxSelectImpeller.Controls.Add(this.buttonLine5); this.groupBoxSelectImpeller.Controls.Add(this.buttonLine6); - this.groupBoxSelectImpeller.Font = new System.Drawing.Font("New Gulim", 11F, System.Drawing.FontStyle.Bold); + this.groupBoxSelectImpeller.Font = new System.Drawing.Font("새굴림", 11F, System.Drawing.FontStyle.Bold); this.groupBoxSelectImpeller.FrameLineColor1 = System.Drawing.Color.FromArgb(((int)(((byte)(54)))), ((int)(((byte)(66)))), ((int)(((byte)(44))))); this.groupBoxSelectImpeller.FrameLineColor2 = System.Drawing.Color.Black; this.groupBoxSelectImpeller.FrameLineThickness = 1; @@ -859,7 +860,7 @@ this.groupBoxEach.Controls.Add(this.buttonEachReverse); this.groupBoxEach.Controls.Add(this.buttonEachUnlock); this.groupBoxEach.Controls.Add(this.buttonEachContinue); - this.groupBoxEach.Font = new System.Drawing.Font("New Gulim", 11F, System.Drawing.FontStyle.Bold); + this.groupBoxEach.Font = new System.Drawing.Font("새굴림", 11F, System.Drawing.FontStyle.Bold); this.groupBoxEach.FrameLineColor1 = System.Drawing.Color.FromArgb(((int)(((byte)(54)))), ((int)(((byte)(66)))), ((int)(((byte)(44))))); this.groupBoxEach.FrameLineColor2 = System.Drawing.Color.Black; this.groupBoxEach.FrameLineThickness = 1; @@ -882,7 +883,7 @@ this.smartLabel1.BackPictureBox2 = null; this.smartLabel1.BorderColor = System.Drawing.Color.Black; this.smartLabel1.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.smartLabel1.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Bold); + this.smartLabel1.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Bold); this.smartLabel1.ForeColor = System.Drawing.Color.DarkRed; this.smartLabel1.InitVisible = true; this.smartLabel1.LineSpacing = 0F; @@ -905,7 +906,7 @@ this.groupBoxAll.Controls.Add(this.buttonAllReverse); this.groupBoxAll.Controls.Add(this.buttonAllUnlock); this.groupBoxAll.Controls.Add(this.buttonAllContinue); - this.groupBoxAll.Font = new System.Drawing.Font("New Gulim", 11F, System.Drawing.FontStyle.Bold); + this.groupBoxAll.Font = new System.Drawing.Font("새굴림", 11F, System.Drawing.FontStyle.Bold); this.groupBoxAll.FrameLineColor1 = System.Drawing.Color.FromArgb(((int)(((byte)(54)))), ((int)(((byte)(66)))), ((int)(((byte)(44))))); this.groupBoxAll.FrameLineColor2 = System.Drawing.Color.Black; this.groupBoxAll.FrameLineThickness = 1; @@ -928,7 +929,7 @@ this.smartLabel8.BackPictureBox2 = null; this.smartLabel8.BorderColor = System.Drawing.Color.Black; this.smartLabel8.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.smartLabel8.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Bold); + this.smartLabel8.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Bold); this.smartLabel8.ForeColor = System.Drawing.Color.DarkRed; this.smartLabel8.InitVisible = true; this.smartLabel8.LineSpacing = 0F; @@ -948,7 +949,7 @@ this.labelTitle.BackPictureBox2 = null; this.labelTitle.BorderColor = System.Drawing.Color.Black; this.labelTitle.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelTitle.Font = new System.Drawing.Font("New Gulim", 23F, System.Drawing.FontStyle.Bold); + this.labelTitle.Font = new System.Drawing.Font("새굴림", 23F, System.Drawing.FontStyle.Bold); this.labelTitle.ForeColor = System.Drawing.Color.White; this.labelTitle.InitVisible = true; this.labelTitle.LineSpacing = 0F; @@ -1024,6 +1025,7 @@ // this.groupBoxAngle.BackPictureBox = this.smartForm1; this.groupBoxAngle.BackPictureBox1 = null; + this.groupBoxAngle.Controls.Add(this.radioButtonImpellerMotorAngle180180); this.groupBoxAngle.Controls.Add(this.radioButtonImpellerMotorAngle360); this.groupBoxAngle.Controls.Add(this.labelTitleStep2); this.groupBoxAngle.Controls.Add(this.labelTitleStep1); @@ -1037,7 +1039,7 @@ this.groupBoxAngle.Controls.Add(this.comboBoxTwoStepPassAngle); this.groupBoxAngle.Controls.Add(this.labelTitleNG); this.groupBoxAngle.Controls.Add(this.labelTitlePass); - this.groupBoxAngle.Font = new System.Drawing.Font("New Gulim", 11F, System.Drawing.FontStyle.Bold); + this.groupBoxAngle.Font = new System.Drawing.Font("새굴림", 11F, System.Drawing.FontStyle.Bold); this.groupBoxAngle.FrameLineColor1 = System.Drawing.Color.FromArgb(((int)(((byte)(54)))), ((int)(((byte)(66)))), ((int)(((byte)(44))))); this.groupBoxAngle.FrameLineColor2 = System.Drawing.Color.Black; this.groupBoxAngle.FrameLineThickness = 1; @@ -1059,12 +1061,12 @@ this.radioButtonImpellerMotorAngle360.BackPictureBox1 = null; this.radioButtonImpellerMotorAngle360.BackPictureBox2 = null; this.radioButtonImpellerMotorAngle360.Checked = false; - this.radioButtonImpellerMotorAngle360.Font = new System.Drawing.Font("New Gulim", 15F, System.Drawing.FontStyle.Bold); + this.radioButtonImpellerMotorAngle360.Font = new System.Drawing.Font("새굴림", 15F, System.Drawing.FontStyle.Bold); this.radioButtonImpellerMotorAngle360.GroupID = 0; this.radioButtonImpellerMotorAngle360.ImageCheckRadioButton = null; this.radioButtonImpellerMotorAngle360.ImageUnCheckRadioButton = null; this.radioButtonImpellerMotorAngle360.InitVisible = true; - this.radioButtonImpellerMotorAngle360.Location = new System.Drawing.Point(188, 69); + this.radioButtonImpellerMotorAngle360.Location = new System.Drawing.Point(312, 69); this.radioButtonImpellerMotorAngle360.Name = "radioButtonImpellerMotorAngle360"; this.radioButtonImpellerMotorAngle360.OutputOnly = false; this.radioButtonImpellerMotorAngle360.RadioBackColor = System.Drawing.Color.White; @@ -1127,7 +1129,7 @@ this.radioButtonImpellerMotorAngle60.BackPictureBox1 = null; this.radioButtonImpellerMotorAngle60.BackPictureBox2 = null; this.radioButtonImpellerMotorAngle60.Checked = false; - this.radioButtonImpellerMotorAngle60.Font = new System.Drawing.Font("New Gulim", 15F, System.Drawing.FontStyle.Bold); + this.radioButtonImpellerMotorAngle60.Font = new System.Drawing.Font("새굴림", 15F, System.Drawing.FontStyle.Bold); this.radioButtonImpellerMotorAngle60.GroupID = 0; this.radioButtonImpellerMotorAngle60.ImageCheckRadioButton = null; this.radioButtonImpellerMotorAngle60.ImageUnCheckRadioButton = null; @@ -1153,7 +1155,7 @@ this.radioButtonImpellerMotorAngle180.BackPictureBox1 = null; this.radioButtonImpellerMotorAngle180.BackPictureBox2 = null; this.radioButtonImpellerMotorAngle180.Checked = false; - this.radioButtonImpellerMotorAngle180.Font = new System.Drawing.Font("New Gulim", 15F, System.Drawing.FontStyle.Bold); + this.radioButtonImpellerMotorAngle180.Font = new System.Drawing.Font("새굴림", 15F, System.Drawing.FontStyle.Bold); this.radioButtonImpellerMotorAngle180.GroupID = 0; this.radioButtonImpellerMotorAngle180.ImageCheckRadioButton = null; this.radioButtonImpellerMotorAngle180.ImageUnCheckRadioButton = null; @@ -1179,7 +1181,7 @@ this.radioButtonImpellerMotorAngle120.BackPictureBox1 = null; this.radioButtonImpellerMotorAngle120.BackPictureBox2 = null; this.radioButtonImpellerMotorAngle120.Checked = false; - this.radioButtonImpellerMotorAngle120.Font = new System.Drawing.Font("New Gulim", 15F, System.Drawing.FontStyle.Bold); + this.radioButtonImpellerMotorAngle120.Font = new System.Drawing.Font("새굴림", 15F, System.Drawing.FontStyle.Bold); this.radioButtonImpellerMotorAngle120.GroupID = 0; this.radioButtonImpellerMotorAngle120.ImageCheckRadioButton = null; this.radioButtonImpellerMotorAngle120.ImageUnCheckRadioButton = null; @@ -1205,7 +1207,7 @@ this.radioButtonImpellerMotorAngle90.BackPictureBox1 = null; this.radioButtonImpellerMotorAngle90.BackPictureBox2 = null; this.radioButtonImpellerMotorAngle90.Checked = false; - this.radioButtonImpellerMotorAngle90.Font = new System.Drawing.Font("New Gulim", 15F, System.Drawing.FontStyle.Bold); + this.radioButtonImpellerMotorAngle90.Font = new System.Drawing.Font("새굴림", 15F, System.Drawing.FontStyle.Bold); this.radioButtonImpellerMotorAngle90.GroupID = 0; this.radioButtonImpellerMotorAngle90.ImageCheckRadioButton = null; this.radioButtonImpellerMotorAngle90.ImageUnCheckRadioButton = null; @@ -1372,7 +1374,7 @@ this.groupBoxDirection.Controls.Add(this.buttonDirectionLine4); this.groupBoxDirection.Controls.Add(this.buttonDirectionLine5); this.groupBoxDirection.Controls.Add(this.buttonDirectionLine6); - this.groupBoxDirection.Font = new System.Drawing.Font("New Gulim", 11F, System.Drawing.FontStyle.Bold); + this.groupBoxDirection.Font = new System.Drawing.Font("새굴림", 11F, System.Drawing.FontStyle.Bold); this.groupBoxDirection.FrameLineColor1 = System.Drawing.Color.FromArgb(((int)(((byte)(54)))), ((int)(((byte)(66)))), ((int)(((byte)(44))))); this.groupBoxDirection.FrameLineColor2 = System.Drawing.Color.Black; this.groupBoxDirection.FrameLineThickness = 1; @@ -1743,7 +1745,7 @@ this.groupBoxEachDownload.Controls.Add(this.label5); this.groupBoxEachDownload.Controls.Add(this.label6); this.groupBoxEachDownload.Controls.Add(this.progressBarExistingDownload); - this.groupBoxEachDownload.Font = new System.Drawing.Font("New Gulim", 11F, System.Drawing.FontStyle.Bold); + this.groupBoxEachDownload.Font = new System.Drawing.Font("새굴림", 11F, System.Drawing.FontStyle.Bold); this.groupBoxEachDownload.FrameLineColor1 = System.Drawing.Color.FromArgb(((int)(((byte)(54)))), ((int)(((byte)(66)))), ((int)(((byte)(44))))); this.groupBoxEachDownload.FrameLineColor2 = System.Drawing.Color.Black; this.groupBoxEachDownload.FrameLineThickness = 1; @@ -2270,7 +2272,7 @@ this.groupBoxInitialDownload.Controls.Add(this.labelStaticWarning2); this.groupBoxInitialDownload.Controls.Add(this.labelStaticWarning1); this.groupBoxInitialDownload.Controls.Add(this.progressBarDownload); - this.groupBoxInitialDownload.Font = new System.Drawing.Font("New Gulim", 11F, System.Drawing.FontStyle.Bold); + this.groupBoxInitialDownload.Font = new System.Drawing.Font("새굴림", 11F, System.Drawing.FontStyle.Bold); this.groupBoxInitialDownload.FrameLineColor1 = System.Drawing.Color.FromArgb(((int)(((byte)(54)))), ((int)(((byte)(66)))), ((int)(((byte)(44))))); this.groupBoxInitialDownload.FrameLineColor2 = System.Drawing.Color.Black; this.groupBoxInitialDownload.FrameLineThickness = 1; @@ -2296,7 +2298,7 @@ this.buttonDeviceIDChange.ColorKeySamplePosition = new System.Drawing.Point(0, 0); this.buttonDeviceIDChange.DisableImage = null; this.buttonDeviceIDChange.DownImage = null; - this.buttonDeviceIDChange.Font = new System.Drawing.Font("New Gulim", 11F, System.Drawing.FontStyle.Bold); + this.buttonDeviceIDChange.Font = new System.Drawing.Font("새굴림", 11F, System.Drawing.FontStyle.Bold); this.buttonDeviceIDChange.GroupID = 0; this.buttonDeviceIDChange.InitVisible = true; this.buttonDeviceIDChange.Location = new System.Drawing.Point(179, 35); @@ -2330,7 +2332,7 @@ this.buttonInitialDownload.ColorKeySamplePosition = new System.Drawing.Point(0, 0); this.buttonInitialDownload.DisableImage = null; this.buttonInitialDownload.DownImage = null; - this.buttonInitialDownload.Font = new System.Drawing.Font("New Gulim", 11F, System.Drawing.FontStyle.Bold); + this.buttonInitialDownload.Font = new System.Drawing.Font("새굴림", 11F, System.Drawing.FontStyle.Bold); this.buttonInitialDownload.GroupID = 0; this.buttonInitialDownload.InitVisible = true; this.buttonInitialDownload.Location = new System.Drawing.Point(22, 35); @@ -2427,7 +2429,7 @@ this.groupBoxMotorTest.Controls.Add(this.labelStaticWarning3); this.groupBoxMotorTest.Controls.Add(this.buttonCom1TestForward); this.groupBoxMotorTest.Controls.Add(this.buttonCom1TestReverse); - this.groupBoxMotorTest.Font = new System.Drawing.Font("New Gulim", 11F, System.Drawing.FontStyle.Bold); + this.groupBoxMotorTest.Font = new System.Drawing.Font("새굴림", 11F, System.Drawing.FontStyle.Bold); this.groupBoxMotorTest.FrameLineColor1 = System.Drawing.Color.FromArgb(((int)(((byte)(54)))), ((int)(((byte)(66)))), ((int)(((byte)(44))))); this.groupBoxMotorTest.FrameLineColor2 = System.Drawing.Color.Black; this.groupBoxMotorTest.FrameLineThickness = 1; @@ -2473,7 +2475,7 @@ this.buttonCom1TestForward.ColorKeySamplePosition = new System.Drawing.Point(0, 0); this.buttonCom1TestForward.DisableImage = null; this.buttonCom1TestForward.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonCom1TestForward.DownImage"))); - this.buttonCom1TestForward.Font = new System.Drawing.Font("New Gulim", 12F, System.Drawing.FontStyle.Bold); + this.buttonCom1TestForward.Font = new System.Drawing.Font("새굴림", 12F, System.Drawing.FontStyle.Bold); this.buttonCom1TestForward.GroupID = 0; this.buttonCom1TestForward.InitVisible = true; this.buttonCom1TestForward.Location = new System.Drawing.Point(106, 66); @@ -2506,7 +2508,7 @@ this.buttonCom1TestReverse.ColorKeySamplePosition = new System.Drawing.Point(0, 0); this.buttonCom1TestReverse.DisableImage = null; this.buttonCom1TestReverse.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonCom1TestReverse.DownImage"))); - this.buttonCom1TestReverse.Font = new System.Drawing.Font("New Gulim", 12F, System.Drawing.FontStyle.Bold); + this.buttonCom1TestReverse.Font = new System.Drawing.Font("새굴림", 12F, System.Drawing.FontStyle.Bold); this.buttonCom1TestReverse.GroupID = 0; this.buttonCom1TestReverse.InitVisible = true; this.buttonCom1TestReverse.Location = new System.Drawing.Point(192, 66); @@ -2540,6 +2542,32 @@ this.panel1.Size = new System.Drawing.Size(800, 348); this.panel1.Visible = false; // + // radioButtonImpellerMotorAngle180180 + // + this.radioButtonImpellerMotorAngle180180.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(246)))), ((int)(((byte)(228)))), ((int)(((byte)(180))))); + this.radioButtonImpellerMotorAngle180180.BackPictureBox = null; + this.radioButtonImpellerMotorAngle180180.BackPictureBox1 = null; + this.radioButtonImpellerMotorAngle180180.BackPictureBox2 = null; + this.radioButtonImpellerMotorAngle180180.Checked = false; + this.radioButtonImpellerMotorAngle180180.Font = new System.Drawing.Font("새굴림", 15F, System.Drawing.FontStyle.Bold); + this.radioButtonImpellerMotorAngle180180.GroupID = 0; + this.radioButtonImpellerMotorAngle180180.ImageCheckRadioButton = null; + this.radioButtonImpellerMotorAngle180180.ImageUnCheckRadioButton = null; + this.radioButtonImpellerMotorAngle180180.InitVisible = true; + this.radioButtonImpellerMotorAngle180180.Location = new System.Drawing.Point(187, 69); + this.radioButtonImpellerMotorAngle180180.Name = "radioButtonImpellerMotorAngle180180"; + this.radioButtonImpellerMotorAngle180180.OutputOnly = false; + this.radioButtonImpellerMotorAngle180180.RadioBackColor = System.Drawing.Color.White; + this.radioButtonImpellerMotorAngle180180.RadioCheckColor = System.Drawing.Color.Green; + this.radioButtonImpellerMotorAngle180180.RadioForeColor = System.Drawing.Color.Black; + this.radioButtonImpellerMotorAngle180180.RadioSymbolSize = 14; + this.radioButtonImpellerMotorAngle180180.Shadow = false; + this.radioButtonImpellerMotorAngle180180.Size = new System.Drawing.Size(119, 26); + this.radioButtonImpellerMotorAngle180180.TabIndex = 275; + this.radioButtonImpellerMotorAngle180180.Text = "180+180"; + this.radioButtonImpellerMotorAngle180180.TextVAlign = SmartX.SmartRadioButton.TextVerAlign.Middle; + this.radioButtonImpellerMotorAngle180180.Click += new System.EventHandler(this.radioButtonImpellerMotorAngle_Click); + // // FormMotorSetting // this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); @@ -2674,5 +2702,6 @@ private SmartX.SmartButton buttonCom1TestReverse; private System.Windows.Forms.Panel panel1; private SmartX.SmartRadioButton radioButtonImpellerMotorAngle360; + private SmartX.SmartRadioButton radioButtonImpellerMotorAngle180180; } } \ No newline at end of file diff --git a/INT69DB_2A/Forms/FormMotorSetting.cs b/INT69DB_2A/Forms/FormMotorSetting.cs index 445992c..50549b5 100644 --- a/INT69DB_2A/Forms/FormMotorSetting.cs +++ b/INT69DB_2A/Forms/FormMotorSetting.cs @@ -811,6 +811,12 @@ namespace INT69DB_2A.Forms case 12: tempString = "130"; break; + case 13: + tempString = "360"; + break; + case 14: + tempString = "360"; + break; default: break; } @@ -994,18 +1000,30 @@ namespace INT69DB_2A.Forms else if (this.ParentForm.SystemConfig.ImpellerMotorAnglePass == 3) this.radioButtonImpellerMotorAngle120.Checked = true; else if (this.ParentForm.SystemConfig.ImpellerMotorAnglePass == 13) + this.radioButtonImpellerMotorAngle180180.Checked = true; + else if (this.ParentForm.SystemConfig.ImpellerMotorAnglePass == 14) this.radioButtonImpellerMotorAngle360.Checked = true; else { - this.radioButtonImpellerMotorAngle180.Checked = true; + try + { + this.radioButtonImpellerMotorAngle180.Checked = true; - if (this.ParentForm.SystemConfig.ImpellerMotorAnglePass != 4) - this.comboBoxTwoStepPassAngle.SelectedIndex = this.ParentForm.SystemConfig.ImpellerMotorAnglePass - 5; + if (this.ParentForm.SystemConfig.ImpellerMotorAnglePass != 4) + this.comboBoxTwoStepPassAngle.SelectedIndex = this.ParentForm.SystemConfig.ImpellerMotorAnglePass - 5; - if (this.ParentForm.SystemConfig.ImpellerMotorAngleNG != 4) - this.comboBoxTwoStepNGAngle.SelectedIndex = this.ParentForm.SystemConfig.ImpellerMotorAngleNG - 5; + if (this.ParentForm.SystemConfig.ImpellerMotorAngleNG != 4) + this.comboBoxTwoStepNGAngle.SelectedIndex = this.ParentForm.SystemConfig.ImpellerMotorAngleNG - 5; - this.MotorAngleControlEnable(true); + this.MotorAngleControlEnable(true); + } + catch + { + this.comboBoxTwoStepPassAngle.SelectedIndex = 0; + this.comboBoxTwoStepNGAngle.SelectedIndex = 0; + + this.MotorAngleControlEnable(true); + } } } else @@ -2331,11 +2349,16 @@ namespace INT69DB_2A.Forms else this.ParentForm.SystemConfig.ImpellerMotorAngleNG = this.comboBoxTwoStepNGAngle.SelectedIndex + 5; } - else if (this.radioButtonImpellerMotorAngle360.Checked == true) + else if (this.radioButtonImpellerMotorAngle180180.Checked == true) { this.ParentForm.SystemConfig.ImpellerMotorAnglePass = 13; this.ParentForm.SystemConfig.ImpellerMotorAngleNG = 13; } + else if (this.radioButtonImpellerMotorAngle360.Checked == true) + { + this.ParentForm.SystemConfig.ImpellerMotorAnglePass = 14; + this.ParentForm.SystemConfig.ImpellerMotorAngleNG = 14; + } afterAnglePass = this.ReturnAngle(this.ParentForm.SystemConfig.ImpellerMotorAnglePass); afterAngleNG = this.ReturnAngle(this.ParentForm.SystemConfig.ImpellerMotorAngleNG); diff --git a/INT69DB_2A/Forms/FormProgramUpdate.Designer.cs b/INT69DB_2A/Forms/FormProgramUpdate.Designer.cs index 4fe4257..25fac5d 100644 --- a/INT69DB_2A/Forms/FormProgramUpdate.Designer.cs +++ b/INT69DB_2A/Forms/FormProgramUpdate.Designer.cs @@ -63,7 +63,7 @@ this.labelUpdateWait2.BackPictureBox2 = null; this.labelUpdateWait2.BorderColor = System.Drawing.Color.Black; this.labelUpdateWait2.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelUpdateWait2.Font = new System.Drawing.Font("New Gulim", 18F, System.Drawing.FontStyle.Bold); + this.labelUpdateWait2.Font = new System.Drawing.Font("새굴림", 18F, System.Drawing.FontStyle.Bold); this.labelUpdateWait2.ForeColor = System.Drawing.Color.Black; this.labelUpdateWait2.InitVisible = true; this.labelUpdateWait2.LineSpacing = 0F; @@ -85,7 +85,7 @@ this.labelUpdateRestart.BackPictureBox2 = null; this.labelUpdateRestart.BorderColor = System.Drawing.Color.Black; this.labelUpdateRestart.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelUpdateRestart.Font = new System.Drawing.Font("New Gulim", 18F, System.Drawing.FontStyle.Bold); + this.labelUpdateRestart.Font = new System.Drawing.Font("새굴림", 18F, System.Drawing.FontStyle.Bold); this.labelUpdateRestart.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); this.labelUpdateRestart.InitVisible = true; this.labelUpdateRestart.LineSpacing = 0F; @@ -107,7 +107,7 @@ this.labelUpdateWait.BackPictureBox2 = null; this.labelUpdateWait.BorderColor = System.Drawing.Color.Black; this.labelUpdateWait.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelUpdateWait.Font = new System.Drawing.Font("New Gulim", 18F, System.Drawing.FontStyle.Bold); + this.labelUpdateWait.Font = new System.Drawing.Font("새굴림", 18F, System.Drawing.FontStyle.Bold); this.labelUpdateWait.InitVisible = true; this.labelUpdateWait.LineSpacing = 0F; this.labelUpdateWait.Location = new System.Drawing.Point(108, 205); @@ -154,7 +154,7 @@ this.labelTitle.BackPictureBox2 = null; this.labelTitle.BorderColor = System.Drawing.Color.Black; this.labelTitle.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelTitle.Font = new System.Drawing.Font("New Gulim", 23F, System.Drawing.FontStyle.Bold); + this.labelTitle.Font = new System.Drawing.Font("새굴림", 23F, System.Drawing.FontStyle.Bold); this.labelTitle.ForeColor = System.Drawing.Color.White; this.labelTitle.InitVisible = true; this.labelTitle.LineSpacing = 0F; diff --git a/INT69DB_2A/INT69DB_2A.csproj b/INT69DB_2A/INT69DB_2A.csproj index c32a62e..7339e59 100644 --- a/INT69DB_2A/INT69DB_2A.csproj +++ b/INT69DB_2A/INT69DB_2A.csproj @@ -57,11 +57,11 @@ False - C:\Program Files (x86)\HNS\Embedded SmartX Component\V3.2.4_20210120\SmartX3.2.4_IEC1000_DOTNETCF3.5수동설치파일\SmartXCommon.dll + C:\Program Files (x86)\HNS\Embedded SmartX Component\V3.2.4_V3대 마지막버전\SmartX3.2.4_IEC1000_DOTNETCF3.5수동설치파일\SmartXCommon.dll False - C:\Program Files (x86)\HNS\Embedded SmartX Component\V3.2.4_20210120\SmartX3.2.4_IEC1000_DOTNETCF3.5수동설치파일\SmartX_IEC1000.dll + C:\Program Files (x86)\HNS\Embedded SmartX Component\V3.2.4_V3대 마지막버전\SmartX3.2.4_IEC1000_DOTNETCF3.5수동설치파일\SmartX_IEC1000.dll diff --git a/INT69DB_2A/Version.txt b/INT69DB_2A/Version.txt index f9e9005..42429d1 100644 --- a/INT69DB_2A/Version.txt +++ b/INT69DB_2A/Version.txt @@ -15,6 +15,12 @@ Ƽ 2~6 ƽ 跮 */ +@ Ver 6.2.0 by CJY + - 2025.01.08 + - Ver 6.1.1 Modify + - Framework : SmartX Framework V3.2.4(update: 2021.01.20) + - ͼ 180+180 ȸ ߰ + @ Ver 6.1.1 by LSJ - 2025.01.02 - Ver 6.1.0 Modify diff --git a/INT69DB_2A/bin/Release/SmartXCommon.dll b/INT69DB_2A/bin/Release/SmartXCommon.dll index 4bd057b..2b8fa9d 100644 Binary files a/INT69DB_2A/bin/Release/SmartXCommon.dll and b/INT69DB_2A/bin/Release/SmartXCommon.dll differ diff --git a/INT69DB_2A/bin/Release/SmartX_IEC1000.dll b/INT69DB_2A/bin/Release/SmartX_IEC1000.dll index 1b97ada..11e2c64 100644 Binary files a/INT69DB_2A/bin/Release/SmartX_IEC1000.dll and b/INT69DB_2A/bin/Release/SmartX_IEC1000.dll differ