Merge branch 'main' of http://intechrnd.iptime.org:3000/SJ84/INT63DC_6CH

# Conflicts:
#	INT63DC_6CH.suo
#	INT63DC_6CH/bin/Release/INT63DC_6CH.exe
#	INT63DC_6CH/bin/Release/INT63DC_6CH.pdb

.gitignore

@@ -1 +1,3 @@
 INT63DC_6CH/obj/
+INT63DC_6CH/bin/Release/INT63DC_6CH.exe
+INT63DC_6CH/bin/Release/INT63DC_6CH.pdb

INT63DC_6CH/DataStore.cs

@@ -1476,12 +1476,12 @@ namespace INT63DC_6CH
             this.Number = 1;
             this.Name = "ProductName 1";
             this.LotNo = "Lot 1";
-            this.UnderRange = "1000";
-            this.PassRange = "2000";
-            this.OverRange = "3000";
+            this.UnderRange = "10000";
+            this.PassRange = "20000";
+            this.OverRange = "30000";
             this.TareRange = "0";
-            this.UnderRange = "0";
-            this.OverRange = "99999";
+            this.UnderRangeLimit = "0";
+            this.OverRangeLimit = "999999";
         }
 
         private void ProgressBarLevelRescale()
@@ -2206,7 +2206,6 @@ namespace INT63DC_6CH
         private bool m_IsServoAlarmTorque;
         private bool m_IsServoOff;
         private bool m_IsInverterAlarm;
-        private bool m_IsAlignError;
         private bool m_IsPinchPoint;
 
         private bool m_IsBuzzerStatus;
@@ -2260,11 +2259,6 @@ namespace INT63DC_6CH
             get { return this.m_IsInverterAlarm; }
             set { this.m_IsInverterAlarm = value; }
         }
-        public bool IsAlignError
-        {
-            get { return this.m_IsAlignError; }
-            set { this.m_IsAlignError = value; }
-        }
         public bool IsPinchPoint
         {
             get { return this.m_IsPinchPoint; }
@@ -2289,7 +2283,6 @@ namespace INT63DC_6CH
             this.IsServoAlarmTorque = false;
             this.IsServoOff = false;
             this.IsInverterAlarm = false;
-            this.IsAlignError = false;
             this.IsPinchPoint = false;
 
             this.IsBuzzerStatus = false;
@@ -2318,57 +2311,57 @@ namespace INT63DC_6CH
                 this.IsBuzzerStatus = false;
             }
             else
-                this.IsPinchPoint = true; 
+                this.IsPinchPoint = true;
             #endregion
-            #region 알람 15-봉 정렬 에러(정렬기)
+            #region 알람 15-
             if (sValue4[1] == '0')
-                this.IsAlignError = false;
+            { }
             else
-                this.IsAlignError = true; 
+            { }
             #endregion
             #region 알람 14-
             if (sValue4[2] == '0')
             { }
             else
-            { } 
+            { }
             #endregion
             #region 알람 13-
             if (sValue4[3] == '0')
             { }
             else
-            { } 
+            { }
             #endregion
 
             #region 알람 12-서보알람토크
             if (sValue3[0] == '0')
                 this.IsServoAlarmTorque = false;
             else
-                this.IsServoAlarmTorque = true; 
+                this.IsServoAlarmTorque = true;
             #endregion
             #region 알람 11-
             if (sValue3[1] == '0')
             { }
             else
-            { } 
+            { }
             #endregion
             #region 알람 10-서보알람
             if (sValue3[2] == '0')
                 this.IsServoAlarm = false;
             else
-                this.IsServoAlarm = true; 
+                this.IsServoAlarm = true;
             #endregion
             #region 알람 9-인버터알람
             if (sValue3[3] == '0')
                 this.IsInverterAlarm = false;
             else
-                this.IsInverterAlarm = true; 
+                this.IsInverterAlarm = true;
             #endregion
 
             #region 알람 8-비상정지
             if (sValue2[0] == '0')
                 this.IsEmergencyStop = false;
             else
-                this.IsEmergencyStop = true; 
+                this.IsEmergencyStop = true;
             #endregion
             #region 알람 7-
             if (sValue2[1] == '0')
@@ -2399,19 +2392,19 @@ namespace INT63DC_6CH
             if (sValue1[1] == '0')
                 this.IsPressureError = false;
             else
-                this.IsPressureError = true; 
+                this.IsPressureError = true;
             #endregion
             #region 알람 2-셀 에러
             if (sValue1[2] == '0')
                 this.IsLoadcellError = false;
             else
-                this.IsLoadcellError = true; 
+                this.IsLoadcellError = true;
             #endregion
             #region 알람 1-입력센서 에러
             if (sValue1[3] == '0')
                 this.IsEntrySensorError = false;
             else
-                this.IsEntrySensorError = true; 
+                this.IsEntrySensorError = true;
             #endregion
         }
         #endregion

INT63DC_6CH/Forms/FormMainDisplay.cs

@@ -1677,7 +1677,7 @@ namespace INT63DC_6CH.Forms
 
             if (alarm.IsEntrySensorError == true || alarm.IsLoadcellError == true || alarm.IsPressureError == true ||
                 alarm.IsEmergencyStop == true || alarm.IsInverterAlarm == true || alarm.IsServoAlarm == true || alarm.IsServoAlarmTorque == true ||
-                alarm.IsAlignError == true || alarm.IsPinchPoint == true)
+                alarm.IsPinchPoint == true)
             {
                 this.pictureBoxAlarm.Visible = true;
             }
@@ -1719,11 +1719,6 @@ namespace INT63DC_6CH.Forms
                 this.MainDisplayAlarmList.listBoxMessage.AddItem("Servo Torque Alarm");
                 isAlarmMessageView = true;
             }
-            if (alarm.IsAlignError == true)
-            {
-                this.MainDisplayAlarmList.listBoxMessage.AddItem("Product discharge error");
-                isAlarmMessageView = true;
-            }
             if (alarm.IsInverterAlarm == true)
                 this.UpdateAlarmMessageDisplay();
 
@@ -1789,8 +1784,6 @@ namespace INT63DC_6CH.Forms
                 this.smartListBox1.AddItem("Servo Torque Alarm");
             if (alarm.IsEntrySensorError == true)
                 this.smartListBox1.AddItem("Entry Sensor Error");
-            if (alarm.IsAlignError == true)
-                this.smartListBox1.AddItem("Product discharge error");
 
             // bypass 설정 체크
             bool isBypass = false;