- 중량조정 시작->"잠시만 기다리세요"->"분동~

단계 하나 추가
 - 외부입력 항목 통일 - NG, START, STOP
master
CJY 2020-12-09 17:29:14 +09:00
parent 21dfa3311e
commit a772767b0f
9 changed files with 90 additions and 145 deletions

2
.gitignore vendored
View File

@ -24,3 +24,5 @@ ITC81DB/obj/Debug/ITC81DB.csproj.FileListAbsolute.txt
ITC81DB_ImageDll/ITC81DB_ImageDll/obj/Debug/ITC81DB_ImageDll.csproj.FileListAbsolute.txt ITC81DB_ImageDll/ITC81DB_ImageDll/obj/Debug/ITC81DB_ImageDll.csproj.FileListAbsolute.txt
ITC81DB/obj/Release/build.force ITC81DB/obj/Release/build.force
ITC81DB_ImageDll/ITC81DB_ImageDll/obj/ ITC81DB_ImageDll/ITC81DB_ImageDll/obj/
ITC81DB_0H/bin/Release/UpdateFiles.zip
ITC81DB_0H/bin/Release/UpdateFiles_V105.zip

View File

@ -75,49 +75,41 @@ namespace ITC81DB_0H.Controls
this.comboBoxPIN6.SelectedIndexChanged -= new EventHandler(this.comboBoxPIN6_SelectedIndexChanged); this.comboBoxPIN6.SelectedIndexChanged -= new EventHandler(this.comboBoxPIN6_SelectedIndexChanged);
this.comboBoxPIN6.Items.Clear(); this.comboBoxPIN6.Items.Clear();
this.comboBoxPIN6.Items.Add("None"); this.comboBoxPIN6.Items.Add("None");
this.comboBoxPIN6.Items.Add("External Operating"); this.comboBoxPIN6.Items.Add("NG");
this.comboBoxPIN6.Items.Add("Air Check"); this.comboBoxPIN6.Items.Add("START");
this.comboBoxPIN6.Items.Add("Door Check"); this.comboBoxPIN6.Items.Add("STOP");
this.comboBoxPIN6.Items.Add("Discharge Check");
this.comboBoxPIN6.SelectedIndexChanged += new EventHandler(this.comboBoxPIN6_SelectedIndexChanged); this.comboBoxPIN6.SelectedIndexChanged += new EventHandler(this.comboBoxPIN6_SelectedIndexChanged);
this.comboBoxPIN5.SelectedIndexChanged -= new EventHandler(this.comboBoxPIN5_SelectedIndexChanged); this.comboBoxPIN5.SelectedIndexChanged -= new EventHandler(this.comboBoxPIN5_SelectedIndexChanged);
this.comboBoxPIN5.Items.Clear(); this.comboBoxPIN5.Items.Clear();
this.comboBoxPIN5.Items.Add("None"); this.comboBoxPIN5.Items.Add("None");
this.comboBoxPIN5.Items.Add("External Operating"); this.comboBoxPIN5.Items.Add("NG");
this.comboBoxPIN5.Items.Add("Air Check"); this.comboBoxPIN5.Items.Add("START");
this.comboBoxPIN5.Items.Add("Door Check"); this.comboBoxPIN5.Items.Add("STOP");
this.comboBoxPIN5.Items.Add("Discharge Check");
this.comboBoxPIN5.SelectedIndexChanged += new EventHandler(this.comboBoxPIN5_SelectedIndexChanged); this.comboBoxPIN5.SelectedIndexChanged += new EventHandler(this.comboBoxPIN5_SelectedIndexChanged);
this.comboBoxPIN4.SelectedIndexChanged -= new EventHandler(this.comboBoxPIN4_SelectedIndexChanged); this.comboBoxPIN4.SelectedIndexChanged -= new EventHandler(this.comboBoxPIN4_SelectedIndexChanged);
this.comboBoxPIN4.Items.Clear(); this.comboBoxPIN4.Items.Clear();
this.comboBoxPIN4.Items.Add("None"); this.comboBoxPIN4.Items.Add("None");
this.comboBoxPIN4.Items.Add("NG");
this.comboBoxPIN4.Items.Add("START"); this.comboBoxPIN4.Items.Add("START");
this.comboBoxPIN4.Items.Add("External Operating"); this.comboBoxPIN4.Items.Add("STOP");
this.comboBoxPIN4.Items.Add("Air Check");
this.comboBoxPIN4.Items.Add("Door Check");
this.comboBoxPIN4.Items.Add("Discharge Check");
this.comboBoxPIN4.SelectedIndexChanged += new EventHandler(this.comboBoxPIN4_SelectedIndexChanged); this.comboBoxPIN4.SelectedIndexChanged += new EventHandler(this.comboBoxPIN4_SelectedIndexChanged);
this.comboBoxPIN3.SelectedIndexChanged -= new EventHandler(this.comboBoxPIN3_SelectedIndexChanged); this.comboBoxPIN3.SelectedIndexChanged -= new EventHandler(this.comboBoxPIN3_SelectedIndexChanged);
this.comboBoxPIN3.Items.Clear(); this.comboBoxPIN3.Items.Clear();
this.comboBoxPIN3.Items.Add("None"); this.comboBoxPIN3.Items.Add("None");
this.comboBoxPIN3.Items.Add("NG");
this.comboBoxPIN3.Items.Add("START");
this.comboBoxPIN3.Items.Add("STOP"); 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.comboBoxPIN3.SelectedIndexChanged += new EventHandler(this.comboBoxPIN3_SelectedIndexChanged);
this.comboBoxPIN2.SelectedIndexChanged -= new EventHandler(this.comboBoxPIN2_SelectedIndexChanged); this.comboBoxPIN2.SelectedIndexChanged -= new EventHandler(this.comboBoxPIN2_SelectedIndexChanged);
this.comboBoxPIN2.Items.Clear(); this.comboBoxPIN2.Items.Clear();
this.comboBoxPIN2.Items.Add("None"); this.comboBoxPIN2.Items.Add("None");
this.comboBoxPIN2.Items.Add("NG"); this.comboBoxPIN2.Items.Add("NG");
this.comboBoxPIN2.Items.Add("External Operating"); this.comboBoxPIN2.Items.Add("START");
this.comboBoxPIN2.Items.Add("Air Check"); this.comboBoxPIN2.Items.Add("STOP");
this.comboBoxPIN2.Items.Add("Door Check");
this.comboBoxPIN2.Items.Add("Discharge Check");
this.comboBoxPIN2.SelectedIndexChanged += new EventHandler(this.comboBoxPIN2_SelectedIndexChanged); this.comboBoxPIN2.SelectedIndexChanged += new EventHandler(this.comboBoxPIN2_SelectedIndexChanged);
this.buttonLogin.DownImage = new Bitmap(images.GetImage(Class1.ButtonImages.engON)); 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.SelectedIndexChanged -= new EventHandler(this.comboBoxPIN6_SelectedIndexChanged);
this.comboBoxPIN6.Items.Clear(); this.comboBoxPIN6.Items.Clear();
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.Items.Add("门已打开"); this.comboBoxPIN6.Items.Add("停止");
this.comboBoxPIN6.Items.Add("排出确认");
this.comboBoxPIN6.SelectedIndexChanged += new EventHandler(this.comboBoxPIN6_SelectedIndexChanged); this.comboBoxPIN6.SelectedIndexChanged += new EventHandler(this.comboBoxPIN6_SelectedIndexChanged);
this.comboBoxPIN5.SelectedIndexChanged -= new EventHandler(this.comboBoxPIN5_SelectedIndexChanged); this.comboBoxPIN5.SelectedIndexChanged -= new EventHandler(this.comboBoxPIN5_SelectedIndexChanged);
this.comboBoxPIN5.Items.Clear(); this.comboBoxPIN5.Items.Clear();
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.Items.Add("门已打开"); this.comboBoxPIN5.Items.Add("停止");
this.comboBoxPIN5.Items.Add("排出确认");
this.comboBoxPIN5.SelectedIndexChanged += new EventHandler(this.comboBoxPIN5_SelectedIndexChanged); this.comboBoxPIN5.SelectedIndexChanged += new EventHandler(this.comboBoxPIN5_SelectedIndexChanged);
this.comboBoxPIN4.SelectedIndexChanged -= new EventHandler(this.comboBoxPIN4_SelectedIndexChanged); this.comboBoxPIN4.SelectedIndexChanged -= new EventHandler(this.comboBoxPIN4_SelectedIndexChanged);
this.comboBoxPIN4.Items.Clear(); this.comboBoxPIN4.Items.Clear();
this.comboBoxPIN4.Items.Add("不使用"); 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.Items.Add("排出确认");
this.comboBoxPIN4.SelectedIndexChanged += new EventHandler(this.comboBoxPIN4_SelectedIndexChanged); this.comboBoxPIN4.SelectedIndexChanged += new EventHandler(this.comboBoxPIN4_SelectedIndexChanged);
this.comboBoxPIN3.SelectedIndexChanged -= new EventHandler(this.comboBoxPIN3_SelectedIndexChanged); this.comboBoxPIN3.SelectedIndexChanged -= new EventHandler(this.comboBoxPIN3_SelectedIndexChanged);
this.comboBoxPIN3.Items.Clear(); this.comboBoxPIN3.Items.Clear();
this.comboBoxPIN3.Items.Add("不使用"); 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.Items.Add("排出确认");
this.comboBoxPIN3.SelectedIndexChanged += new EventHandler(this.comboBoxPIN3_SelectedIndexChanged); this.comboBoxPIN3.SelectedIndexChanged += new EventHandler(this.comboBoxPIN3_SelectedIndexChanged);
this.comboBoxPIN2.SelectedIndexChanged -= new EventHandler(this.comboBoxPIN2_SelectedIndexChanged); this.comboBoxPIN2.SelectedIndexChanged -= new EventHandler(this.comboBoxPIN2_SelectedIndexChanged);
this.comboBoxPIN2.Items.Clear(); this.comboBoxPIN2.Items.Clear();
this.comboBoxPIN2.Items.Add("不使用"); this.comboBoxPIN2.Items.Add("不使用");
this.comboBoxPIN2.Items.Add("NG"); 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.comboBoxPIN2.SelectedIndexChanged += new EventHandler(this.comboBoxPIN2_SelectedIndexChanged);
this.buttonLogin.DownImage = new Bitmap(images.GetImage(Class1.ButtonImages.chnON)); 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.SelectedIndexChanged -= new EventHandler(this.comboBoxPIN6_SelectedIndexChanged);
this.comboBoxPIN6.Items.Clear(); 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.Items.Add("Проверка разрядки");
this.comboBoxPIN6.SelectedIndexChanged += new EventHandler(this.comboBoxPIN6_SelectedIndexChanged); this.comboBoxPIN6.SelectedIndexChanged += new EventHandler(this.comboBoxPIN6_SelectedIndexChanged);
this.comboBoxPIN5.SelectedIndexChanged -= new EventHandler(this.comboBoxPIN5_SelectedIndexChanged); this.comboBoxPIN5.SelectedIndexChanged -= new EventHandler(this.comboBoxPIN5_SelectedIndexChanged);
this.comboBoxPIN5.Items.Clear(); 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.Items.Add("Проверка разрядки");
this.comboBoxPIN5.SelectedIndexChanged += new EventHandler(this.comboBoxPIN5_SelectedIndexChanged); this.comboBoxPIN5.SelectedIndexChanged += new EventHandler(this.comboBoxPIN5_SelectedIndexChanged);
this.comboBoxPIN4.SelectedIndexChanged -= new EventHandler(this.comboBoxPIN4_SelectedIndexChanged); this.comboBoxPIN4.SelectedIndexChanged -= new EventHandler(this.comboBoxPIN4_SelectedIndexChanged);
this.comboBoxPIN4.Items.Clear(); 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.Items.Add("Проверка закрытия дверцы");
this.comboBoxPIN4.Items.Add("Проверка разрядки");
this.comboBoxPIN4.SelectedIndexChanged += new EventHandler(this.comboBoxPIN4_SelectedIndexChanged); this.comboBoxPIN4.SelectedIndexChanged += new EventHandler(this.comboBoxPIN4_SelectedIndexChanged);
this.comboBoxPIN3.SelectedIndexChanged -= new EventHandler(this.comboBoxPIN3_SelectedIndexChanged); this.comboBoxPIN3.SelectedIndexChanged -= new EventHandler(this.comboBoxPIN3_SelectedIndexChanged);
this.comboBoxPIN3.Items.Clear(); 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.Items.Add("Проверка закрытия дверцы");
this.comboBoxPIN3.Items.Add("Проверка разрядки");
this.comboBoxPIN3.SelectedIndexChanged += new EventHandler(this.comboBoxPIN3_SelectedIndexChanged); this.comboBoxPIN3.SelectedIndexChanged += new EventHandler(this.comboBoxPIN3_SelectedIndexChanged);
this.comboBoxPIN2.SelectedIndexChanged -= new EventHandler(this.comboBoxPIN2_SelectedIndexChanged); this.comboBoxPIN2.SelectedIndexChanged -= new EventHandler(this.comboBoxPIN2_SelectedIndexChanged);
this.comboBoxPIN2.Items.Clear(); 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.Items.Add("Проверка закрытия дверцы");
this.comboBoxPIN2.Items.Add("Проверка разрядки");
this.comboBoxPIN2.SelectedIndexChanged += new EventHandler(this.comboBoxPIN2_SelectedIndexChanged); this.comboBoxPIN2.SelectedIndexChanged += new EventHandler(this.comboBoxPIN2_SelectedIndexChanged);
this.buttonLogin.DownImage = new Bitmap(images.GetImage(Class1.ButtonImages.rusON)); 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.SelectedIndexChanged -= new EventHandler(this.comboBoxPIN6_SelectedIndexChanged);
this.comboBoxPIN6.Items.Clear(); this.comboBoxPIN6.Items.Clear();
this.comboBoxPIN6.Items.Add("Keiner"); this.comboBoxPIN6.Items.Add("Keiner");
this.comboBoxPIN6.Items.Add("Externer Betrieb"); this.comboBoxPIN6.Items.Add("NG");
this.comboBoxPIN6.Items.Add("Luft Prüfen"); this.comboBoxPIN6.Items.Add("START");
this.comboBoxPIN6.Items.Add("Tür Prüfen"); this.comboBoxPIN6.Items.Add("STOPP");
this.comboBoxPIN6.Items.Add("Entladung Prüfen");
this.comboBoxPIN6.SelectedIndexChanged += new EventHandler(this.comboBoxPIN6_SelectedIndexChanged); this.comboBoxPIN6.SelectedIndexChanged += new EventHandler(this.comboBoxPIN6_SelectedIndexChanged);
this.comboBoxPIN5.SelectedIndexChanged -= new EventHandler(this.comboBoxPIN5_SelectedIndexChanged); this.comboBoxPIN5.SelectedIndexChanged -= new EventHandler(this.comboBoxPIN5_SelectedIndexChanged);
this.comboBoxPIN5.Items.Clear(); this.comboBoxPIN5.Items.Clear();
this.comboBoxPIN5.Items.Add("Keiner"); this.comboBoxPIN5.Items.Add("Keiner");
this.comboBoxPIN5.Items.Add("Externer Betrieb"); this.comboBoxPIN5.Items.Add("NG");
this.comboBoxPIN5.Items.Add("Luft Prüfen"); this.comboBoxPIN5.Items.Add("START");
this.comboBoxPIN5.Items.Add("Tür Prüfen"); this.comboBoxPIN5.Items.Add("STOPP");
this.comboBoxPIN5.Items.Add("Entladung Prüfen");
this.comboBoxPIN5.SelectedIndexChanged += new EventHandler(this.comboBoxPIN5_SelectedIndexChanged); this.comboBoxPIN5.SelectedIndexChanged += new EventHandler(this.comboBoxPIN5_SelectedIndexChanged);
this.comboBoxPIN4.SelectedIndexChanged -= new EventHandler(this.comboBoxPIN4_SelectedIndexChanged); this.comboBoxPIN4.SelectedIndexChanged -= new EventHandler(this.comboBoxPIN4_SelectedIndexChanged);
this.comboBoxPIN4.Items.Clear(); this.comboBoxPIN4.Items.Clear();
this.comboBoxPIN4.Items.Add("Keiner"); this.comboBoxPIN4.Items.Add("Keiner");
this.comboBoxPIN4.Items.Add("NG");
this.comboBoxPIN4.Items.Add("START"); this.comboBoxPIN4.Items.Add("START");
this.comboBoxPIN4.Items.Add("Externer Betrieb"); this.comboBoxPIN4.Items.Add("STOPP");
this.comboBoxPIN4.Items.Add("Luft Prüfen");
this.comboBoxPIN4.Items.Add("Tür Prüfen");
this.comboBoxPIN4.Items.Add("Entladung Prüfen");
this.comboBoxPIN4.SelectedIndexChanged += new EventHandler(this.comboBoxPIN4_SelectedIndexChanged); this.comboBoxPIN4.SelectedIndexChanged += new EventHandler(this.comboBoxPIN4_SelectedIndexChanged);
this.comboBoxPIN3.SelectedIndexChanged -= new EventHandler(this.comboBoxPIN3_SelectedIndexChanged); this.comboBoxPIN3.SelectedIndexChanged -= new EventHandler(this.comboBoxPIN3_SelectedIndexChanged);
this.comboBoxPIN3.Items.Clear(); this.comboBoxPIN3.Items.Clear();
this.comboBoxPIN3.Items.Add("Keiner"); this.comboBoxPIN3.Items.Add("Keiner");
this.comboBoxPIN3.Items.Add("NG");
this.comboBoxPIN3.Items.Add("START");
this.comboBoxPIN3.Items.Add("STOPP"); 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.comboBoxPIN3.SelectedIndexChanged += new EventHandler(this.comboBoxPIN3_SelectedIndexChanged);
this.comboBoxPIN2.SelectedIndexChanged -= new EventHandler(this.comboBoxPIN2_SelectedIndexChanged); this.comboBoxPIN2.SelectedIndexChanged -= new EventHandler(this.comboBoxPIN2_SelectedIndexChanged);
this.comboBoxPIN2.Items.Clear(); this.comboBoxPIN2.Items.Clear();
this.comboBoxPIN2.Items.Add("Keiner"); this.comboBoxPIN2.Items.Add("Keiner");
this.comboBoxPIN2.Items.Add("NG"); this.comboBoxPIN2.Items.Add("NG");
this.comboBoxPIN2.Items.Add("Externer Betrieb"); this.comboBoxPIN2.Items.Add("START");
this.comboBoxPIN2.Items.Add("Luft Prüfen"); this.comboBoxPIN2.Items.Add("STOPP");
this.comboBoxPIN2.Items.Add("Tür Prüfen");
this.comboBoxPIN2.Items.Add("Entladung Prüfen");
this.comboBoxPIN2.SelectedIndexChanged += new EventHandler(this.comboBoxPIN2_SelectedIndexChanged); this.comboBoxPIN2.SelectedIndexChanged += new EventHandler(this.comboBoxPIN2_SelectedIndexChanged);
this.buttonLogin.DownImage = new Bitmap(images.GetImage(Class1.ButtonImages.gerON)); 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.SelectedIndexChanged -= new EventHandler(this.comboBoxPIN6_SelectedIndexChanged);
this.comboBoxPIN6.Items.Clear(); this.comboBoxPIN6.Items.Clear();
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("START");
this.comboBoxPIN6.Items.Add("문열림감지"); this.comboBoxPIN6.Items.Add("STOP");
this.comboBoxPIN6.Items.Add("배출확인");
this.comboBoxPIN6.SelectedIndexChanged += new EventHandler(this.comboBoxPIN6_SelectedIndexChanged); this.comboBoxPIN6.SelectedIndexChanged += new EventHandler(this.comboBoxPIN6_SelectedIndexChanged);
this.comboBoxPIN5.SelectedIndexChanged -= new EventHandler(this.comboBoxPIN5_SelectedIndexChanged); this.comboBoxPIN5.SelectedIndexChanged -= new EventHandler(this.comboBoxPIN5_SelectedIndexChanged);
this.comboBoxPIN5.Items.Clear(); this.comboBoxPIN5.Items.Clear();
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("START");
this.comboBoxPIN5.Items.Add("문열림감지"); this.comboBoxPIN5.Items.Add("STOP");
this.comboBoxPIN5.Items.Add("배출확인");
this.comboBoxPIN5.SelectedIndexChanged += new EventHandler(this.comboBoxPIN5_SelectedIndexChanged); this.comboBoxPIN5.SelectedIndexChanged += new EventHandler(this.comboBoxPIN5_SelectedIndexChanged);
this.comboBoxPIN4.SelectedIndexChanged -= new EventHandler(this.comboBoxPIN4_SelectedIndexChanged); this.comboBoxPIN4.SelectedIndexChanged -= new EventHandler(this.comboBoxPIN4_SelectedIndexChanged);
this.comboBoxPIN4.Items.Clear(); this.comboBoxPIN4.Items.Clear();
this.comboBoxPIN4.Items.Add("사용안함"); this.comboBoxPIN4.Items.Add("사용안함");
this.comboBoxPIN4.Items.Add("NG");
this.comboBoxPIN4.Items.Add("START"); this.comboBoxPIN4.Items.Add("START");
this.comboBoxPIN4.Items.Add("외부운전"); this.comboBoxPIN4.Items.Add("STOP");
this.comboBoxPIN4.Items.Add("공압확인");
this.comboBoxPIN4.Items.Add("문열림감지");
this.comboBoxPIN4.Items.Add("배출확인");
this.comboBoxPIN4.SelectedIndexChanged += new EventHandler(this.comboBoxPIN4_SelectedIndexChanged); this.comboBoxPIN4.SelectedIndexChanged += new EventHandler(this.comboBoxPIN4_SelectedIndexChanged);
this.comboBoxPIN3.SelectedIndexChanged -= new EventHandler(this.comboBoxPIN3_SelectedIndexChanged); this.comboBoxPIN3.SelectedIndexChanged -= new EventHandler(this.comboBoxPIN3_SelectedIndexChanged);
this.comboBoxPIN3.Items.Clear(); this.comboBoxPIN3.Items.Clear();
this.comboBoxPIN3.Items.Add("사용안함"); this.comboBoxPIN3.Items.Add("사용안함");
this.comboBoxPIN3.Items.Add("NG");
this.comboBoxPIN3.Items.Add("START");
this.comboBoxPIN3.Items.Add("STOP"); 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.comboBoxPIN3.SelectedIndexChanged += new EventHandler(this.comboBoxPIN3_SelectedIndexChanged);
this.comboBoxPIN2.SelectedIndexChanged -= new EventHandler(this.comboBoxPIN2_SelectedIndexChanged); this.comboBoxPIN2.SelectedIndexChanged -= new EventHandler(this.comboBoxPIN2_SelectedIndexChanged);
this.comboBoxPIN2.Items.Clear(); this.comboBoxPIN2.Items.Clear();
this.comboBoxPIN2.Items.Add("사용안함"); this.comboBoxPIN2.Items.Add("사용안함");
this.comboBoxPIN2.Items.Add("NG"); this.comboBoxPIN2.Items.Add("NG");
this.comboBoxPIN2.Items.Add("외부운전"); this.comboBoxPIN2.Items.Add("START");
this.comboBoxPIN2.Items.Add("공압확인"); this.comboBoxPIN2.Items.Add("STOP");
this.comboBoxPIN2.Items.Add("문열림감지");
this.comboBoxPIN2.Items.Add("배출확인");
this.comboBoxPIN2.SelectedIndexChanged += new EventHandler(this.comboBoxPIN2_SelectedIndexChanged); this.comboBoxPIN2.SelectedIndexChanged += new EventHandler(this.comboBoxPIN2_SelectedIndexChanged);
this.buttonLogin.DownImage = new Bitmap(images.GetImage(Class1.ButtonImages.engON)); this.buttonLogin.DownImage = new Bitmap(images.GetImage(Class1.ButtonImages.engON));
@ -777,11 +737,6 @@ namespace ITC81DB_0H.Controls
value = Helper.StringZeroFillDigits4("3"); value = Helper.StringZeroFillDigits4("3");
this.ParentForm.ParentForm.CurrentSystemParameter1.PI6 = 3; this.ParentForm.ParentForm.CurrentSystemParameter1.PI6 = 3;
} }
else if (this.comboBoxPIN6.SelectedIndex == 4)
{
value = Helper.StringZeroFillDigits4("4");
this.ParentForm.ParentForm.CurrentSystemParameter1.PI6 = 4;
}
else else
{ {
value = Helper.StringZeroFillDigits4("0"); value = Helper.StringZeroFillDigits4("0");
@ -810,11 +765,6 @@ namespace ITC81DB_0H.Controls
value = Helper.StringZeroFillDigits4("3"); value = Helper.StringZeroFillDigits4("3");
this.ParentForm.ParentForm.CurrentSystemParameter1.PI5 = 3; this.ParentForm.ParentForm.CurrentSystemParameter1.PI5 = 3;
} }
else if (this.comboBoxPIN5.SelectedIndex == 4)
{
value = Helper.StringZeroFillDigits4("4");
this.ParentForm.ParentForm.CurrentSystemParameter1.PI5 = 4;
}
else else
{ {
value = Helper.StringZeroFillDigits4("0"); value = Helper.StringZeroFillDigits4("0");
@ -843,16 +793,6 @@ namespace ITC81DB_0H.Controls
value = Helper.StringZeroFillDigits4("3"); value = Helper.StringZeroFillDigits4("3");
this.ParentForm.ParentForm.CurrentSystemParameter1.PI4 = 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 else
{ {
value = Helper.StringZeroFillDigits4("0"); value = Helper.StringZeroFillDigits4("0");
@ -881,16 +821,6 @@ namespace ITC81DB_0H.Controls
value = Helper.StringZeroFillDigits4("3"); value = Helper.StringZeroFillDigits4("3");
this.ParentForm.ParentForm.CurrentSystemParameter1.PI3 = 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 else
{ {
value = Helper.StringZeroFillDigits4("0"); value = Helper.StringZeroFillDigits4("0");
@ -919,16 +849,6 @@ namespace ITC81DB_0H.Controls
value = Helper.StringZeroFillDigits4("3"); value = Helper.StringZeroFillDigits4("3");
this.ParentForm.ParentForm.CurrentSystemParameter1.PI2 = 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 else
{ {
value = Helper.StringZeroFillDigits4("0"); value = Helper.StringZeroFillDigits4("0");

View File

@ -66,7 +66,7 @@ namespace ITC81DB_0H.Controls
private void DefaultSetting() private void DefaultSetting()
{ {
this.labelSerialNo.Text = this.ParentForm.ParentForm.SystemConfig1.SerialNumber; 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) public void UpdateMainBoardVersionDisplay(string version)

View File

@ -227,7 +227,7 @@ namespace ITC81DB_0H.Controls
this.CalibrationButtonEnable(true, false, false); this.CalibrationButtonEnable(true, false, false);
this.CalibrationPictureBoxVisible(true, false, false); this.CalibrationPictureBoxVisible(true, false, false);
break; break;
case DataStore.WeightStatus.CalStandby: case DataStore.WeightStatus.CalWait:
// 분동중량 표시 // 분동중량 표시
this.IsCalibrationFinish = false; this.IsCalibrationFinish = false;
if (this.ParentForm.ParentForm.SystemConfig1.DecimalPlaces == 1) if (this.ParentForm.ParentForm.SystemConfig1.DecimalPlaces == 1)
@ -235,6 +235,15 @@ namespace ITC81DB_0H.Controls
else else
this.labelWeight.Text = "-500.00"; this.labelWeight.Text = "-500.00";
this.labelWeight.ForeColor = this.NormalColor; 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(); this.listBoxHelp.ClearAll();
if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.English) if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.English)
{ {

View File

@ -182,6 +182,7 @@ namespace ITC81DB_0H
WeightZero, WeightZero,
CalNomal, CalNomal,
CalBalans, CalBalans,
CalWait,
CalStandby, CalStandby,
CalFinish, CalFinish,
CalError, CalError,
@ -3018,8 +3019,8 @@ namespace ITC81DB_0H
this.InitialDrive = "0"; this.InitialDrive = "0";
this.PI2 = 1; this.PI2 = 1;
this.PI3 = 1; this.PI3 = 3;
this.PI4 = 1; this.PI4 = 2;
this.PI5 = 0; this.PI5 = 0;
this.PI6 = 0; this.PI6 = 0;
this.PI7 = 0; this.PI7 = 0;

View File

@ -154,6 +154,8 @@ namespace ITC81DB_0H
return DataStore.WeightStatus.WeightZero; return DataStore.WeightStatus.WeightZero;
else if (value == "cn") else if (value == "cn")
return DataStore.WeightStatus.CalNomal; return DataStore.WeightStatus.CalNomal;
else if (value == "cw")
return DataStore.WeightStatus.CalWait;
else if (value == "cB") else if (value == "cB")
return DataStore.WeightStatus.CalBalans; return DataStore.WeightStatus.CalBalans;
else if (value == "cb") else if (value == "cb")

View File

@ -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 @ Ver 1.0.5 by CJY
- 2020.11.27 - 2020.11.27
- Ver 1.0.4 Modify - Ver 1.0.4 Modify