diff --git a/INT99DC_7C/Controls/ControlEquipmentTest.cs b/INT99DC_7C/Controls/ControlEquipmentTest.cs index 4088050..80f418b 100644 --- a/INT99DC_7C/Controls/ControlEquipmentTest.cs +++ b/INT99DC_7C/Controls/ControlEquipmentTest.cs @@ -214,6 +214,10 @@ namespace INT99DC_7C.Controls this.labelCH3Mode.Text = "OPT1"; else if (item.Serial3Mode == 2) this.labelCH3Mode.Text = "OPT2"; + else if (item.Serial3Mode == 3) + this.labelCH3Mode.Text = "Modbus"; + else if (item.Serial3Mode == 4) + this.labelCH3Mode.Text = "OPT3"; else this.labelCH3Mode.Text = "None"; } diff --git a/INT99DC_7C/Forms/FormCommunication.cs b/INT99DC_7C/Forms/FormCommunication.cs index 74b8276..8e8ea83 100644 --- a/INT99DC_7C/Forms/FormCommunication.cs +++ b/INT99DC_7C/Forms/FormCommunication.cs @@ -658,6 +658,8 @@ namespace INT99DC_7C.Forms beforeMode = "OPT2"; else if (this.ParentForm.SystemConfig.Serial3Mode == 3) beforeMode = "Modbus"; + else if (this.ParentForm.SystemConfig.Serial3Mode == 4) + beforeMode = "OPT3"; else beforeMode = "None"; @@ -697,6 +699,8 @@ namespace INT99DC_7C.Forms afterMode = "OPT2"; else if (this.ParentForm.SystemConfig.Serial3Mode == 3) afterMode = "Modbus"; + else if (this.ParentForm.SystemConfig.Serial3Mode == 4) + beforeMode = "OPT3"; else afterMode = "None"; diff --git a/INT99DC_7C/Forms/FormMain.Designer.cs b/INT99DC_7C/Forms/FormMain.Designer.cs index 5bd552e..1b0c59e 100644 --- a/INT99DC_7C/Forms/FormMain.Designer.cs +++ b/INT99DC_7C/Forms/FormMain.Designer.cs @@ -130,7 +130,6 @@ // smartThread // this.smartThread.Priority = System.Threading.ThreadPriority.Normal; - this.smartThread.WorkerReportsProgress = false; this.smartThread.UIThreadFunction += new SmartX.SmartThread.UIThreadHandler(this.smartThread_UIThreadFunction); // // smartTimerLogout diff --git a/INT99DC_7C/Forms/FormTimeSetting.Designer.cs b/INT99DC_7C/Forms/FormTimeSetting.Designer.cs index 2ee90bf..b22ea02 100644 --- a/INT99DC_7C/Forms/FormTimeSetting.Designer.cs +++ b/INT99DC_7C/Forms/FormTimeSetting.Designer.cs @@ -233,7 +233,6 @@ this.upDownMonth.TabIndex = 9; this.upDownMonth.TextColor = System.Drawing.SystemColors.Highlight; this.upDownMonth.TextHAlign = SmartX.SmartUpDown.TextHorAlign.Right; - this.upDownMonth.TextLabelBoundaryLine = false; this.upDownMonth.TextLabelHeight = 30; this.upDownMonth.TextLabelWidth = 100; this.upDownMonth.TextLocation = new System.Drawing.Point(-5, 100); @@ -306,7 +305,6 @@ this.upDownDate.TabIndex = 10; this.upDownDate.TextColor = System.Drawing.SystemColors.Highlight; this.upDownDate.TextHAlign = SmartX.SmartUpDown.TextHorAlign.Right; - this.upDownDate.TextLabelBoundaryLine = false; this.upDownDate.TextLabelHeight = 30; this.upDownDate.TextLabelWidth = 100; this.upDownDate.TextLocation = new System.Drawing.Point(-5, 100); @@ -379,7 +377,6 @@ this.upDownHour.TabIndex = 11; this.upDownHour.TextColor = System.Drawing.SystemColors.Highlight; this.upDownHour.TextHAlign = SmartX.SmartUpDown.TextHorAlign.Right; - this.upDownHour.TextLabelBoundaryLine = false; this.upDownHour.TextLabelHeight = 30; this.upDownHour.TextLabelWidth = 100; this.upDownHour.TextLocation = new System.Drawing.Point(-5, 100); @@ -452,7 +449,6 @@ this.upDownMinute.TabIndex = 12; this.upDownMinute.TextColor = System.Drawing.SystemColors.Highlight; this.upDownMinute.TextHAlign = SmartX.SmartUpDown.TextHorAlign.Right; - this.upDownMinute.TextLabelBoundaryLine = false; this.upDownMinute.TextLabelHeight = 30; this.upDownMinute.TextLabelWidth = 100; this.upDownMinute.TextLocation = new System.Drawing.Point(-5, 100); @@ -621,7 +617,6 @@ this.upDownYear.TabIndex = 7; this.upDownYear.TextColor = System.Drawing.SystemColors.Highlight; this.upDownYear.TextHAlign = SmartX.SmartUpDown.TextHorAlign.Right; - this.upDownYear.TextLabelBoundaryLine = false; this.upDownYear.TextLabelHeight = 30; this.upDownYear.TextLabelWidth = 170; this.upDownYear.TextLocation = new System.Drawing.Point(-15, 100);