INT69DC_7C/Controls/ControlCalibration10.cs

@@ -59,14 +59,6 @@ namespace INT69DC_7C.Controls
             this.CollLabelConstant = new Collection<SmartLabel>();
             this.CollCalStatus = new Collection<CalibrationStatus>();
 
-<<<<<<< HEAD
-            for (int i = 1; i <= this.ParentForm.ParentForm.SystemConfig.EquipmentColumns; i++)
-            {
-                this.CollButtonLane.Add(FindByNameUtil.SmartButton("buttonLane" + i, this));
-                this.CollLabelWeight.Add(FindByNameUtil.SmartLabel("labelWeight" + i, this));
-                this.CollLabelADC.Add(FindByNameUtil.SmartLabel("labelADC" + i, this));
-                this.CollLabelConstant.Add(FindByNameUtil.SmartLabel("labelConstant" + i, this));
-=======
             this.CollButtonLane.Clear();
             this.CollLabelWeight.Clear();
             this.CollLabelADC.Clear();
@@ -118,9 +110,7 @@ namespace INT69DC_7C.Controls
             this.CollLabelConstant.Add(this.labelConstant10);
 
             for (int i = 0; i < this.ParentForm.ParentForm.SystemConfig.EquipmentColumns; i++)
->>>>>>> d4b927138c4f21486cd4286de805c526717e977f
                 this.CollCalStatus.Add(new CalibrationStatus());
-            }
         }
         private void InitilizeControls()
         {

INT69DC_7C/Controls/ControlCalibration12.cs

@@ -59,14 +59,6 @@ namespace INT69DC_7C.Controls
             this.CollLabelConstant = new Collection<SmartLabel>();
             this.CollCalStatus = new Collection<CalibrationStatus>();
 
-<<<<<<< HEAD
-            for (int i = 1; i <= this.ParentForm.ParentForm.SystemConfig.EquipmentColumns; i++)
-            {
-                this.CollButtonLane.Add(FindByNameUtil.SmartButton("buttonLane" + i, this));
-                this.CollLabelWeight.Add(FindByNameUtil.SmartLabel("labelWeight" + i, this));
-                this.CollLabelADC.Add(FindByNameUtil.SmartLabel("labelADC" + i, this));
-                this.CollLabelConstant.Add(FindByNameUtil.SmartLabel("labelConstant" + i, this));
-=======
             this.CollButtonLane.Clear();
             this.CollLabelWeight.Clear();
             this.CollLabelADC.Clear();
@@ -126,9 +118,7 @@ namespace INT69DC_7C.Controls
             this.CollLabelConstant.Add(this.labelConstant12);
 
             for (int i = 0; i < this.ParentForm.ParentForm.SystemConfig.EquipmentColumns; i++)
->>>>>>> d4b927138c4f21486cd4286de805c526717e977f
                 this.CollCalStatus.Add(new CalibrationStatus());
-            }
         }
         private void InitilizeControls()
         {

INT69DC_7C/Controls/ControlCalibration7.cs

@@ -59,14 +59,6 @@ namespace INT69DC_7C.Controls
             this.CollLabelConstant = new Collection<SmartLabel>();
             this.CollCalStatus = new Collection<CalibrationStatus>();
 
-<<<<<<< HEAD
-            for (int i = 1; i <= this.ParentForm.ParentForm.SystemConfig.EquipmentColumns; i++)
-            {
-                this.CollButtonLane.Add(FindByNameUtil.SmartButton("buttonLane" + i, this));
-                this.CollLabelWeight.Add(FindByNameUtil.SmartLabel("labelWeight" + i, this));
-                this.CollLabelADC.Add(FindByNameUtil.SmartLabel("labelADC" + i, this));
-                this.CollLabelConstant.Add(FindByNameUtil.SmartLabel("labelConstant" + i, this));
-=======
             this.CollButtonLane.Clear();
             this.CollLabelWeight.Clear();
             this.CollLabelADC.Clear();
@@ -106,9 +98,7 @@ namespace INT69DC_7C.Controls
             this.CollLabelConstant.Add(this.labelConstant7);
 
             for (int i = 0; i < this.ParentForm.ParentForm.SystemConfig.EquipmentColumns; i++)
->>>>>>> d4b927138c4f21486cd4286de805c526717e977f
                 this.CollCalStatus.Add(new CalibrationStatus());
-            }
         }
         private void InitilizeControls()
         {

INT69DC_7C/Controls/ControlCalibration8.cs

@@ -59,14 +59,6 @@ namespace INT69DC_7C.Controls
             this.CollLabelConstant = new Collection<SmartLabel>();
             this.CollCalStatus = new Collection<CalibrationStatus>();
 
-<<<<<<< HEAD
-            for (int i = 1; i <= this.ParentForm.ParentForm.SystemConfig.EquipmentColumns; i++)
-            {
-                this.CollButtonLane.Add(FindByNameUtil.SmartButton("buttonLane" + i, this));
-                this.CollLabelWeight.Add(FindByNameUtil.SmartLabel("labelWeight" + i, this));
-                this.CollLabelADC.Add(FindByNameUtil.SmartLabel("labelADC" + i, this));
-                this.CollLabelConstant.Add(FindByNameUtil.SmartLabel("labelConstant" + i, this));
-=======
             this.CollButtonLane.Clear();
             this.CollLabelWeight.Clear();
             this.CollLabelADC.Clear();
@@ -110,9 +102,7 @@ namespace INT69DC_7C.Controls
             this.CollLabelConstant.Add(this.labelConstant8);
 
             for (int i = 0; i < this.ParentForm.ParentForm.SystemConfig.EquipmentColumns; i++)
->>>>>>> d4b927138c4f21486cd4286de805c526717e977f
                 this.CollCalStatus.Add(new CalibrationStatus());
-            }
         }
         private void InitilizeControls()
         {

INT69DC_7C/DataStore.cs

@@ -1326,7 +1326,7 @@ namespace INT69DC_7C
             this.DataStoragePeriod = 36;
 
             this.Unit = "g";
-            this.SerialNumber = "25I0000";
+            this.SerialNumber = "23D0000";
             this.EthernetServerAddress = "0.0.0.0";
             this.User_Level1_Name = "Level 1";
             this.User_Level2_Name = "Level 2";

INT69DC_7C/Forms/FormConfiguration.cs

@@ -609,6 +609,7 @@ namespace INT69DC_7C.Forms
 
             // Part 11
             if (this.ParentForm.SystemConfig.IsOptPart11 == true)
+
                 this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.AutoZeroVariance, "", before, after);
         }
         private void comboBoxZeroParameterMode_SelectedIndexChanged(object sender, EventArgs e)

INT69DC_7C/Forms/FormMainDisplay.cs

@@ -4303,6 +4303,10 @@ namespace INT69DC_7C.Forms
                 this.Part11AutomaticLogoutReset();
 
             this.ParentForm.TransferData(CommunicationCommand.CutInput, CommunicationID.MainBoard);
+
+            // Part11
+            if (this.ParentForm.SystemConfig.IsOptPart11 == true)
+                this.ParentForm.SetTrackingHistoryData(DataStore.TrackingOperation.MainCut, "");
         }
         private void buttonPrint_Click(object sender, EventArgs e)
         {