diff --git a/.gitignore b/.gitignore index 2423610..a19bcf2 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,5 @@ ITC81DB/obj/Debug/ITC81DB.csproj.FileListAbsolute.txt ITC81DB_ImageDll/ITC81DB_ImageDll/obj/Debug/ITC81DB_ImageDll.csproj.FileListAbsolute.txt ITC81DB/obj/Release/build.force ITC81DB_ImageDll/ITC81DB_ImageDll/obj/ +ITC81DB_0H/bin/Release/UpdateFiles.zip +ITC81DB_0H/bin/Release/UpdateFiles_V105.zip diff --git a/ITC81DB_0H/Controls/CenterEquipment/ControlCenterEquipFunctionSetting.cs b/ITC81DB_0H/Controls/CenterEquipment/ControlCenterEquipFunctionSetting.cs index 4ea8446..1d31839 100644 --- a/ITC81DB_0H/Controls/CenterEquipment/ControlCenterEquipFunctionSetting.cs +++ b/ITC81DB_0H/Controls/CenterEquipment/ControlCenterEquipFunctionSetting.cs @@ -75,49 +75,41 @@ namespace ITC81DB_0H.Controls this.comboBoxPIN6.SelectedIndexChanged -= new EventHandler(this.comboBoxPIN6_SelectedIndexChanged); this.comboBoxPIN6.Items.Clear(); this.comboBoxPIN6.Items.Add("None"); - this.comboBoxPIN6.Items.Add("External Operating"); - this.comboBoxPIN6.Items.Add("Air Check"); - this.comboBoxPIN6.Items.Add("Door Check"); - this.comboBoxPIN6.Items.Add("Discharge Check"); + this.comboBoxPIN6.Items.Add("NG"); + this.comboBoxPIN6.Items.Add("START"); + this.comboBoxPIN6.Items.Add("STOP"); this.comboBoxPIN6.SelectedIndexChanged += new EventHandler(this.comboBoxPIN6_SelectedIndexChanged); this.comboBoxPIN5.SelectedIndexChanged -= new EventHandler(this.comboBoxPIN5_SelectedIndexChanged); this.comboBoxPIN5.Items.Clear(); this.comboBoxPIN5.Items.Add("None"); - this.comboBoxPIN5.Items.Add("External Operating"); - this.comboBoxPIN5.Items.Add("Air Check"); - this.comboBoxPIN5.Items.Add("Door Check"); - this.comboBoxPIN5.Items.Add("Discharge Check"); + this.comboBoxPIN5.Items.Add("NG"); + this.comboBoxPIN5.Items.Add("START"); + this.comboBoxPIN5.Items.Add("STOP"); this.comboBoxPIN5.SelectedIndexChanged += new EventHandler(this.comboBoxPIN5_SelectedIndexChanged); this.comboBoxPIN4.SelectedIndexChanged -= new EventHandler(this.comboBoxPIN4_SelectedIndexChanged); this.comboBoxPIN4.Items.Clear(); this.comboBoxPIN4.Items.Add("None"); + this.comboBoxPIN4.Items.Add("NG"); this.comboBoxPIN4.Items.Add("START"); - this.comboBoxPIN4.Items.Add("External Operating"); - this.comboBoxPIN4.Items.Add("Air Check"); - this.comboBoxPIN4.Items.Add("Door Check"); - this.comboBoxPIN4.Items.Add("Discharge Check"); + this.comboBoxPIN4.Items.Add("STOP"); this.comboBoxPIN4.SelectedIndexChanged += new EventHandler(this.comboBoxPIN4_SelectedIndexChanged); this.comboBoxPIN3.SelectedIndexChanged -= new EventHandler(this.comboBoxPIN3_SelectedIndexChanged); this.comboBoxPIN3.Items.Clear(); this.comboBoxPIN3.Items.Add("None"); + this.comboBoxPIN3.Items.Add("NG"); + this.comboBoxPIN3.Items.Add("START"); this.comboBoxPIN3.Items.Add("STOP"); - this.comboBoxPIN3.Items.Add("External Operating"); - this.comboBoxPIN3.Items.Add("Air Check"); - this.comboBoxPIN3.Items.Add("Door Check"); - this.comboBoxPIN3.Items.Add("Discharge Check"); this.comboBoxPIN3.SelectedIndexChanged += new EventHandler(this.comboBoxPIN3_SelectedIndexChanged); this.comboBoxPIN2.SelectedIndexChanged -= new EventHandler(this.comboBoxPIN2_SelectedIndexChanged); this.comboBoxPIN2.Items.Clear(); this.comboBoxPIN2.Items.Add("None"); this.comboBoxPIN2.Items.Add("NG"); - this.comboBoxPIN2.Items.Add("External Operating"); - this.comboBoxPIN2.Items.Add("Air Check"); - this.comboBoxPIN2.Items.Add("Door Check"); - this.comboBoxPIN2.Items.Add("Discharge Check"); + this.comboBoxPIN2.Items.Add("START"); + this.comboBoxPIN2.Items.Add("STOP"); this.comboBoxPIN2.SelectedIndexChanged += new EventHandler(this.comboBoxPIN2_SelectedIndexChanged); this.buttonLogin.DownImage = new Bitmap(images.GetImage(Class1.ButtonImages.engON)); @@ -150,49 +142,41 @@ namespace ITC81DB_0H.Controls this.comboBoxPIN6.SelectedIndexChanged -= new EventHandler(this.comboBoxPIN6_SelectedIndexChanged); this.comboBoxPIN6.Items.Clear(); this.comboBoxPIN6.Items.Add("不使用"); - this.comboBoxPIN6.Items.Add("外部运转"); - this.comboBoxPIN6.Items.Add("气压确认"); - this.comboBoxPIN6.Items.Add("门已打开"); - this.comboBoxPIN6.Items.Add("排出确认"); + this.comboBoxPIN6.Items.Add("NG"); + this.comboBoxPIN6.Items.Add("开启"); + this.comboBoxPIN6.Items.Add("停止"); this.comboBoxPIN6.SelectedIndexChanged += new EventHandler(this.comboBoxPIN6_SelectedIndexChanged); this.comboBoxPIN5.SelectedIndexChanged -= new EventHandler(this.comboBoxPIN5_SelectedIndexChanged); this.comboBoxPIN5.Items.Clear(); this.comboBoxPIN5.Items.Add("不使用"); - this.comboBoxPIN5.Items.Add("外部运转"); - this.comboBoxPIN5.Items.Add("气压确认"); - this.comboBoxPIN5.Items.Add("门已打开"); - this.comboBoxPIN5.Items.Add("排出确认"); + this.comboBoxPIN5.Items.Add("NG"); + this.comboBoxPIN5.Items.Add("开启"); + this.comboBoxPIN5.Items.Add("停止"); this.comboBoxPIN5.SelectedIndexChanged += new EventHandler(this.comboBoxPIN5_SelectedIndexChanged); this.comboBoxPIN4.SelectedIndexChanged -= new EventHandler(this.comboBoxPIN4_SelectedIndexChanged); this.comboBoxPIN4.Items.Clear(); this.comboBoxPIN4.Items.Add("不使用"); + this.comboBoxPIN4.Items.Add("NG"); this.comboBoxPIN4.Items.Add("开启"); - this.comboBoxPIN4.Items.Add("外部运转"); - this.comboBoxPIN4.Items.Add("气压确认"); - this.comboBoxPIN4.Items.Add("门已打开"); - this.comboBoxPIN4.Items.Add("排出确认"); + this.comboBoxPIN4.Items.Add("停止"); this.comboBoxPIN4.SelectedIndexChanged += new EventHandler(this.comboBoxPIN4_SelectedIndexChanged); this.comboBoxPIN3.SelectedIndexChanged -= new EventHandler(this.comboBoxPIN3_SelectedIndexChanged); this.comboBoxPIN3.Items.Clear(); this.comboBoxPIN3.Items.Add("不使用"); + this.comboBoxPIN3.Items.Add("NG"); + this.comboBoxPIN3.Items.Add("开启"); this.comboBoxPIN3.Items.Add("停止"); - this.comboBoxPIN3.Items.Add("外部运转"); - this.comboBoxPIN3.Items.Add("气压确认"); - this.comboBoxPIN3.Items.Add("门已打开"); - this.comboBoxPIN3.Items.Add("排出确认"); this.comboBoxPIN3.SelectedIndexChanged += new EventHandler(this.comboBoxPIN3_SelectedIndexChanged); this.comboBoxPIN2.SelectedIndexChanged -= new EventHandler(this.comboBoxPIN2_SelectedIndexChanged); this.comboBoxPIN2.Items.Clear(); this.comboBoxPIN2.Items.Add("不使用"); this.comboBoxPIN2.Items.Add("NG"); - this.comboBoxPIN2.Items.Add("外部运转"); - this.comboBoxPIN2.Items.Add("气压确认"); - this.comboBoxPIN2.Items.Add("门已打开"); - this.comboBoxPIN2.Items.Add("排出确认"); + this.comboBoxPIN2.Items.Add("开启"); + this.comboBoxPIN2.Items.Add("停止"); this.comboBoxPIN2.SelectedIndexChanged += new EventHandler(this.comboBoxPIN2_SelectedIndexChanged); this.buttonLogin.DownImage = new Bitmap(images.GetImage(Class1.ButtonImages.chnON)); @@ -231,49 +215,41 @@ namespace ITC81DB_0H.Controls this.comboBoxPIN6.SelectedIndexChanged -= new EventHandler(this.comboBoxPIN6_SelectedIndexChanged); this.comboBoxPIN6.Items.Clear(); this.comboBoxPIN6.Items.Add("Нет"); - this.comboBoxPIN6.Items.Add("Внешнее управление"); - this.comboBoxPIN6.Items.Add("Проверка давления"); - this.comboBoxPIN6.Items.Add("Проверка закрытия дверцы"); - this.comboBoxPIN6.Items.Add("Проверка разрядки"); + this.comboBoxPIN6.Items.Add("Другие неисправности"); + this.comboBoxPIN6.Items.Add("Старт"); + this.comboBoxPIN6.Items.Add("Стоп"); this.comboBoxPIN6.SelectedIndexChanged += new EventHandler(this.comboBoxPIN6_SelectedIndexChanged); this.comboBoxPIN5.SelectedIndexChanged -= new EventHandler(this.comboBoxPIN5_SelectedIndexChanged); this.comboBoxPIN5.Items.Clear(); this.comboBoxPIN5.Items.Add("Нет"); - this.comboBoxPIN5.Items.Add("Внешнее управление"); - this.comboBoxPIN5.Items.Add("Проверка давления"); - this.comboBoxPIN5.Items.Add("Проверка закрытия дверцы"); - this.comboBoxPIN5.Items.Add("Проверка разрядки"); + this.comboBoxPIN5.Items.Add("Другие неисправности"); + this.comboBoxPIN5.Items.Add("Старт"); + this.comboBoxPIN5.Items.Add("Стоп"); this.comboBoxPIN5.SelectedIndexChanged += new EventHandler(this.comboBoxPIN5_SelectedIndexChanged); this.comboBoxPIN4.SelectedIndexChanged -= new EventHandler(this.comboBoxPIN4_SelectedIndexChanged); this.comboBoxPIN4.Items.Clear(); this.comboBoxPIN4.Items.Add("Нет"); + this.comboBoxPIN4.Items.Add("Другие неисправности"); this.comboBoxPIN4.Items.Add("Старт"); - this.comboBoxPIN4.Items.Add("Внешнее управление"); - this.comboBoxPIN4.Items.Add("Проверка давления"); - this.comboBoxPIN4.Items.Add("Проверка закрытия дверцы"); - this.comboBoxPIN4.Items.Add("Проверка разрядки"); + this.comboBoxPIN4.Items.Add("Стоп"); this.comboBoxPIN4.SelectedIndexChanged += new EventHandler(this.comboBoxPIN4_SelectedIndexChanged); this.comboBoxPIN3.SelectedIndexChanged -= new EventHandler(this.comboBoxPIN3_SelectedIndexChanged); this.comboBoxPIN3.Items.Clear(); this.comboBoxPIN3.Items.Add("Нет"); + this.comboBoxPIN3.Items.Add("Другие неисправности"); + this.comboBoxPIN3.Items.Add("Старт"); this.comboBoxPIN3.Items.Add("Стоп"); - this.comboBoxPIN3.Items.Add("Внешнее управление"); - this.comboBoxPIN3.Items.Add("Проверка давления"); - this.comboBoxPIN3.Items.Add("Проверка закрытия дверцы"); - this.comboBoxPIN3.Items.Add("Проверка разрядки"); this.comboBoxPIN3.SelectedIndexChanged += new EventHandler(this.comboBoxPIN3_SelectedIndexChanged); this.comboBoxPIN2.SelectedIndexChanged -= new EventHandler(this.comboBoxPIN2_SelectedIndexChanged); this.comboBoxPIN2.Items.Clear(); this.comboBoxPIN2.Items.Add("Нет"); this.comboBoxPIN2.Items.Add("Другие неисправности"); - this.comboBoxPIN2.Items.Add("Внешнее управление"); - this.comboBoxPIN2.Items.Add("Проверка давления"); - this.comboBoxPIN2.Items.Add("Проверка закрытия дверцы"); - this.comboBoxPIN2.Items.Add("Проверка разрядки"); + this.comboBoxPIN2.Items.Add("Старт"); + this.comboBoxPIN2.Items.Add("Стоп"); this.comboBoxPIN2.SelectedIndexChanged += new EventHandler(this.comboBoxPIN2_SelectedIndexChanged); this.buttonLogin.DownImage = new Bitmap(images.GetImage(Class1.ButtonImages.rusON)); @@ -306,49 +282,41 @@ namespace ITC81DB_0H.Controls this.comboBoxPIN6.SelectedIndexChanged -= new EventHandler(this.comboBoxPIN6_SelectedIndexChanged); this.comboBoxPIN6.Items.Clear(); this.comboBoxPIN6.Items.Add("Keiner"); - this.comboBoxPIN6.Items.Add("Externer Betrieb"); - this.comboBoxPIN6.Items.Add("Luft Prüfen"); - this.comboBoxPIN6.Items.Add("Tür Prüfen"); - this.comboBoxPIN6.Items.Add("Entladung Prüfen"); + this.comboBoxPIN6.Items.Add("NG"); + this.comboBoxPIN6.Items.Add("START"); + this.comboBoxPIN6.Items.Add("STOPP"); this.comboBoxPIN6.SelectedIndexChanged += new EventHandler(this.comboBoxPIN6_SelectedIndexChanged); this.comboBoxPIN5.SelectedIndexChanged -= new EventHandler(this.comboBoxPIN5_SelectedIndexChanged); this.comboBoxPIN5.Items.Clear(); this.comboBoxPIN5.Items.Add("Keiner"); - this.comboBoxPIN5.Items.Add("Externer Betrieb"); - this.comboBoxPIN5.Items.Add("Luft Prüfen"); - this.comboBoxPIN5.Items.Add("Tür Prüfen"); - this.comboBoxPIN5.Items.Add("Entladung Prüfen"); + this.comboBoxPIN5.Items.Add("NG"); + this.comboBoxPIN5.Items.Add("START"); + this.comboBoxPIN5.Items.Add("STOPP"); this.comboBoxPIN5.SelectedIndexChanged += new EventHandler(this.comboBoxPIN5_SelectedIndexChanged); this.comboBoxPIN4.SelectedIndexChanged -= new EventHandler(this.comboBoxPIN4_SelectedIndexChanged); this.comboBoxPIN4.Items.Clear(); this.comboBoxPIN4.Items.Add("Keiner"); + this.comboBoxPIN4.Items.Add("NG"); this.comboBoxPIN4.Items.Add("START"); - this.comboBoxPIN4.Items.Add("Externer Betrieb"); - this.comboBoxPIN4.Items.Add("Luft Prüfen"); - this.comboBoxPIN4.Items.Add("Tür Prüfen"); - this.comboBoxPIN4.Items.Add("Entladung Prüfen"); + this.comboBoxPIN4.Items.Add("STOPP"); this.comboBoxPIN4.SelectedIndexChanged += new EventHandler(this.comboBoxPIN4_SelectedIndexChanged); this.comboBoxPIN3.SelectedIndexChanged -= new EventHandler(this.comboBoxPIN3_SelectedIndexChanged); this.comboBoxPIN3.Items.Clear(); this.comboBoxPIN3.Items.Add("Keiner"); + this.comboBoxPIN3.Items.Add("NG"); + this.comboBoxPIN3.Items.Add("START"); this.comboBoxPIN3.Items.Add("STOPP"); - this.comboBoxPIN3.Items.Add("Externer Betrieb"); - this.comboBoxPIN3.Items.Add("Luft Prüfen"); - this.comboBoxPIN3.Items.Add("Tür Prüfen"); - this.comboBoxPIN3.Items.Add("Entladung Prüfen"); this.comboBoxPIN3.SelectedIndexChanged += new EventHandler(this.comboBoxPIN3_SelectedIndexChanged); this.comboBoxPIN2.SelectedIndexChanged -= new EventHandler(this.comboBoxPIN2_SelectedIndexChanged); this.comboBoxPIN2.Items.Clear(); this.comboBoxPIN2.Items.Add("Keiner"); this.comboBoxPIN2.Items.Add("NG"); - this.comboBoxPIN2.Items.Add("Externer Betrieb"); - this.comboBoxPIN2.Items.Add("Luft Prüfen"); - this.comboBoxPIN2.Items.Add("Tür Prüfen"); - this.comboBoxPIN2.Items.Add("Entladung Prüfen"); + this.comboBoxPIN2.Items.Add("START"); + this.comboBoxPIN2.Items.Add("STOPP"); this.comboBoxPIN2.SelectedIndexChanged += new EventHandler(this.comboBoxPIN2_SelectedIndexChanged); this.buttonLogin.DownImage = new Bitmap(images.GetImage(Class1.ButtonImages.gerON)); @@ -381,49 +349,41 @@ namespace ITC81DB_0H.Controls this.comboBoxPIN6.SelectedIndexChanged -= new EventHandler(this.comboBoxPIN6_SelectedIndexChanged); this.comboBoxPIN6.Items.Clear(); this.comboBoxPIN6.Items.Add("사용안함"); - this.comboBoxPIN6.Items.Add("외부운전"); - this.comboBoxPIN6.Items.Add("공압확인"); - this.comboBoxPIN6.Items.Add("문열림감지"); - this.comboBoxPIN6.Items.Add("배출확인"); + this.comboBoxPIN6.Items.Add("NG"); + this.comboBoxPIN6.Items.Add("START"); + this.comboBoxPIN6.Items.Add("STOP"); this.comboBoxPIN6.SelectedIndexChanged += new EventHandler(this.comboBoxPIN6_SelectedIndexChanged); this.comboBoxPIN5.SelectedIndexChanged -= new EventHandler(this.comboBoxPIN5_SelectedIndexChanged); this.comboBoxPIN5.Items.Clear(); this.comboBoxPIN5.Items.Add("사용안함"); - this.comboBoxPIN5.Items.Add("외부운전"); - this.comboBoxPIN5.Items.Add("공압확인"); - this.comboBoxPIN5.Items.Add("문열림감지"); - this.comboBoxPIN5.Items.Add("배출확인"); + this.comboBoxPIN5.Items.Add("NG"); + this.comboBoxPIN5.Items.Add("START"); + this.comboBoxPIN5.Items.Add("STOP"); this.comboBoxPIN5.SelectedIndexChanged += new EventHandler(this.comboBoxPIN5_SelectedIndexChanged); this.comboBoxPIN4.SelectedIndexChanged -= new EventHandler(this.comboBoxPIN4_SelectedIndexChanged); this.comboBoxPIN4.Items.Clear(); this.comboBoxPIN4.Items.Add("사용안함"); + this.comboBoxPIN4.Items.Add("NG"); this.comboBoxPIN4.Items.Add("START"); - this.comboBoxPIN4.Items.Add("외부운전"); - this.comboBoxPIN4.Items.Add("공압확인"); - this.comboBoxPIN4.Items.Add("문열림감지"); - this.comboBoxPIN4.Items.Add("배출확인"); + this.comboBoxPIN4.Items.Add("STOP"); this.comboBoxPIN4.SelectedIndexChanged += new EventHandler(this.comboBoxPIN4_SelectedIndexChanged); this.comboBoxPIN3.SelectedIndexChanged -= new EventHandler(this.comboBoxPIN3_SelectedIndexChanged); this.comboBoxPIN3.Items.Clear(); this.comboBoxPIN3.Items.Add("사용안함"); + this.comboBoxPIN3.Items.Add("NG"); + this.comboBoxPIN3.Items.Add("START"); this.comboBoxPIN3.Items.Add("STOP"); - this.comboBoxPIN3.Items.Add("외부운전"); - this.comboBoxPIN3.Items.Add("공압확인"); - this.comboBoxPIN3.Items.Add("문열림감지"); - this.comboBoxPIN3.Items.Add("배출확인"); this.comboBoxPIN3.SelectedIndexChanged += new EventHandler(this.comboBoxPIN3_SelectedIndexChanged); this.comboBoxPIN2.SelectedIndexChanged -= new EventHandler(this.comboBoxPIN2_SelectedIndexChanged); this.comboBoxPIN2.Items.Clear(); this.comboBoxPIN2.Items.Add("사용안함"); this.comboBoxPIN2.Items.Add("NG"); - this.comboBoxPIN2.Items.Add("외부운전"); - this.comboBoxPIN2.Items.Add("공압확인"); - this.comboBoxPIN2.Items.Add("문열림감지"); - this.comboBoxPIN2.Items.Add("배출확인"); + this.comboBoxPIN2.Items.Add("START"); + this.comboBoxPIN2.Items.Add("STOP"); this.comboBoxPIN2.SelectedIndexChanged += new EventHandler(this.comboBoxPIN2_SelectedIndexChanged); this.buttonLogin.DownImage = new Bitmap(images.GetImage(Class1.ButtonImages.engON)); @@ -777,11 +737,6 @@ namespace ITC81DB_0H.Controls value = Helper.StringZeroFillDigits4("3"); this.ParentForm.ParentForm.CurrentSystemParameter1.PI6 = 3; } - else if (this.comboBoxPIN6.SelectedIndex == 4) - { - value = Helper.StringZeroFillDigits4("4"); - this.ParentForm.ParentForm.CurrentSystemParameter1.PI6 = 4; - } else { value = Helper.StringZeroFillDigits4("0"); @@ -810,11 +765,6 @@ namespace ITC81DB_0H.Controls value = Helper.StringZeroFillDigits4("3"); this.ParentForm.ParentForm.CurrentSystemParameter1.PI5 = 3; } - else if (this.comboBoxPIN5.SelectedIndex == 4) - { - value = Helper.StringZeroFillDigits4("4"); - this.ParentForm.ParentForm.CurrentSystemParameter1.PI5 = 4; - } else { value = Helper.StringZeroFillDigits4("0"); @@ -843,16 +793,6 @@ namespace ITC81DB_0H.Controls value = Helper.StringZeroFillDigits4("3"); this.ParentForm.ParentForm.CurrentSystemParameter1.PI4 = 3; } - else if (this.comboBoxPIN4.SelectedIndex == 4) - { - value = Helper.StringZeroFillDigits4("4"); - this.ParentForm.ParentForm.CurrentSystemParameter1.PI4 = 4; - } - else if (this.comboBoxPIN4.SelectedIndex == 5) - { - value = Helper.StringZeroFillDigits4("5"); - this.ParentForm.ParentForm.CurrentSystemParameter1.PI4 = 5; - } else { value = Helper.StringZeroFillDigits4("0"); @@ -881,16 +821,6 @@ namespace ITC81DB_0H.Controls value = Helper.StringZeroFillDigits4("3"); this.ParentForm.ParentForm.CurrentSystemParameter1.PI3 = 3; } - else if (this.comboBoxPIN3.SelectedIndex == 4) - { - value = Helper.StringZeroFillDigits4("4"); - this.ParentForm.ParentForm.CurrentSystemParameter1.PI3 = 4; - } - else if (this.comboBoxPIN3.SelectedIndex == 5) - { - value = Helper.StringZeroFillDigits4("5"); - this.ParentForm.ParentForm.CurrentSystemParameter1.PI3 = 5; - } else { value = Helper.StringZeroFillDigits4("0"); @@ -919,16 +849,6 @@ namespace ITC81DB_0H.Controls value = Helper.StringZeroFillDigits4("3"); this.ParentForm.ParentForm.CurrentSystemParameter1.PI2 = 3; } - else if (this.comboBoxPIN2.SelectedIndex == 4) - { - value = Helper.StringZeroFillDigits4("4"); - this.ParentForm.ParentForm.CurrentSystemParameter1.PI2 = 4; - } - else if (this.comboBoxPIN2.SelectedIndex == 5) - { - value = Helper.StringZeroFillDigits4("5"); - this.ParentForm.ParentForm.CurrentSystemParameter1.PI2 = 5; - } else { value = Helper.StringZeroFillDigits4("0"); diff --git a/ITC81DB_0H/Controls/CenterInformation/ControlCenterInforSystem.cs b/ITC81DB_0H/Controls/CenterInformation/ControlCenterInforSystem.cs index bbf9940..8a8b121 100644 --- a/ITC81DB_0H/Controls/CenterInformation/ControlCenterInforSystem.cs +++ b/ITC81DB_0H/Controls/CenterInformation/ControlCenterInforSystem.cs @@ -66,7 +66,7 @@ namespace ITC81DB_0H.Controls private void DefaultSetting() { this.labelSerialNo.Text = this.ParentForm.ParentForm.SystemConfig1.SerialNumber; - this.labelDisplayVer.Text = "1.0.5"; + this.labelDisplayVer.Text = "1.0.6"; } public void UpdateMainBoardVersionDisplay(string version) diff --git a/ITC81DB_0H/Controls/CenterSystem/ControlCenterSystemCalibration.cs b/ITC81DB_0H/Controls/CenterSystem/ControlCenterSystemCalibration.cs index 8c51220..6276788 100644 --- a/ITC81DB_0H/Controls/CenterSystem/ControlCenterSystemCalibration.cs +++ b/ITC81DB_0H/Controls/CenterSystem/ControlCenterSystemCalibration.cs @@ -227,14 +227,23 @@ namespace ITC81DB_0H.Controls this.CalibrationButtonEnable(true, false, false); this.CalibrationPictureBoxVisible(true, false, false); break; - case DataStore.WeightStatus.CalStandby: + case DataStore.WeightStatus.CalWait: // 분동중량 표시 this.IsCalibrationFinish = false; - if(this.ParentForm.ParentForm.SystemConfig1.DecimalPlaces == 1) + if (this.ParentForm.ParentForm.SystemConfig1.DecimalPlaces == 1) this.labelWeight.Text = "-500.0"; else this.labelWeight.Text = "-500.00"; this.labelWeight.ForeColor = this.NormalColor; + break; + case DataStore.WeightStatus.CalStandby: + //// 분동중량 표시 + //this.IsCalibrationFinish = false; + //if(this.ParentForm.ParentForm.SystemConfig1.DecimalPlaces == 1) + // this.labelWeight.Text = "-500.0"; + //else + // this.labelWeight.Text = "-500.00"; + //this.labelWeight.ForeColor = this.NormalColor; this.listBoxHelp.ClearAll(); if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.English) { diff --git a/ITC81DB_0H/DataStore.cs b/ITC81DB_0H/DataStore.cs index a63f712..d54dbe2 100644 --- a/ITC81DB_0H/DataStore.cs +++ b/ITC81DB_0H/DataStore.cs @@ -182,6 +182,7 @@ namespace ITC81DB_0H WeightZero, CalNomal, CalBalans, + CalWait, CalStandby, CalFinish, CalError, @@ -3018,8 +3019,8 @@ namespace ITC81DB_0H this.InitialDrive = "0"; this.PI2 = 1; - this.PI3 = 1; - this.PI4 = 1; + this.PI3 = 3; + this.PI4 = 2; this.PI5 = 0; this.PI6 = 0; this.PI7 = 0; diff --git a/ITC81DB_0H/Helper.cs b/ITC81DB_0H/Helper.cs index f8a92a2..429de4d 100644 --- a/ITC81DB_0H/Helper.cs +++ b/ITC81DB_0H/Helper.cs @@ -154,6 +154,8 @@ namespace ITC81DB_0H return DataStore.WeightStatus.WeightZero; else if (value == "cn") return DataStore.WeightStatus.CalNomal; + else if (value == "cw") + return DataStore.WeightStatus.CalWait; else if (value == "cB") return DataStore.WeightStatus.CalBalans; else if (value == "cb") diff --git a/ITC81DB_0H/Version.txt b/ITC81DB_0H/Version.txt index fac80b9..18844bd 100644 --- a/ITC81DB_0H/Version.txt +++ b/ITC81DB_0H/Version.txt @@ -12,6 +12,17 @@ ⺻ м 跮 */ +@ Ver 1.0.7 by CJY + - 2020.12.09 + - Ver 1.0.6 Modify + - ܺԷ ׸ NG, START, STOP + +@ Ver 1.0.6 by CJY + - 2020.12.02 + - Ver 1.0.5 Modify + - ߷ ->"ø ٸ"->"е~ + ܰ ϳ ߰ + @ Ver 1.0.5 by CJY - 2020.11.27 - Ver 1.0.4 Modify diff --git a/ITC81DB_0H/bin/Release/ITC81DB_0H.exe b/ITC81DB_0H/bin/Release/ITC81DB_0H.exe index d6b30cd..55744f9 100644 Binary files a/ITC81DB_0H/bin/Release/ITC81DB_0H.exe and b/ITC81DB_0H/bin/Release/ITC81DB_0H.exe differ diff --git a/ITC81DB_0H/obj/Release/ITC81DB_0H.exe b/ITC81DB_0H/obj/Release/ITC81DB_0H.exe index d6b30cd..55744f9 100644 Binary files a/ITC81DB_0H/obj/Release/ITC81DB_0H.exe and b/ITC81DB_0H/obj/Release/ITC81DB_0H.exe differ