SJ84
/
INT99DC_7C
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: SJ84:d2a83abc3e2509d640643977ff60bef03d53ad90
Branches Tags
SJ84:main
SJ84:V4.2.0
SJ84:V4.1.0
SJ84:V4.0.0
..
compare: SJ84:fa03592b7f09b51ad7b410965e45dcc36fc49323
Branches Tags
SJ84:main
SJ84:V4.2.0
SJ84:V4.1.0
SJ84:V4.0.0

No commits in common. "d2a83abc3e2509d640643977ff60bef03d53ad90" and "fa03592b7f09b51ad7b410965e45dcc36fc49323" have entirely different histories.
d2a83abc3e ... fa03592b7f

4 changed files with 6 additions and 8 deletions
Show Stats Expand all files Collapse all files

4
INT99DC_7C/Controls/ControlEquipmentTest.cs
View File

@ -214,10 +214,6 @@ 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";
}

4
INT99DC_7C/Forms/FormCommunication.cs
View File

@ -658,8 +658,6 @@ 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";
@ -699,8 +697,6 @@ 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";

1
INT99DC_7C/Forms/FormMain.Designer.cs generated
View File

@ -130,6 +130,7 @@
// smartThread
//
this.smartThread.Priority = System.Threading.ThreadPriority.Normal;
this.smartThread.WorkerReportsProgress = false;
this.smartThread.UIThreadFunction += new SmartX.SmartThread.UIThreadHandler(this.smartThread_UIThreadFunction);
//
// smartTimerLogout

5
INT99DC_7C/Forms/FormTimeSetting.Designer.cs generated
View File

@ -233,6 +233,7 @@
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);
@ -305,6 +306,7 @@
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);
@ -377,6 +379,7 @@
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);
@ -449,6 +452,7 @@
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);
@ -617,6 +621,7 @@
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);