ATT Value 값 LayOut 변경 / Temperature ATT ON OFF 버튼 추가 / Setting > Table Control Page 이름 변경 / Table Setting ATT 제어 할 수 있도록 Layout 변경

.gitignore

@@ -1 +1,2 @@
 .vs/Jdas_Mbic/v15/Server/sqlite3/db.lock
+.vs

Jdas_Mbic/Main.Designer.cs

@@ -135,6 +135,22 @@
             this.Column_Offset = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.serialPort_JdasMbic = new System.IO.Ports.SerialPort(this.components);
             this.timer_JdasMbic = new System.Windows.Forms.Timer(this.components);
+            this.groupBox7 = new System.Windows.Forms.GroupBox();
+            this.label32 = new System.Windows.Forms.Label();
+            this.numericUpDown9 = new System.Windows.Forms.NumericUpDown();
+            this.label34 = new System.Windows.Forms.Label();
+            this.numericUpDown10 = new System.Windows.Forms.NumericUpDown();
+            this.button1 = new System.Windows.Forms.Button();
+            this.button2 = new System.Windows.Forms.Button();
+            this.radioButton_ATT1 = new System.Windows.Forms.RadioButton();
+            this.radioButton_ATT2 = new System.Windows.Forms.RadioButton();
+            this.radioButton_ATT3 = new System.Windows.Forms.RadioButton();
+            this.radioButton_ATT4 = new System.Windows.Forms.RadioButton();
+            this.groupBox_Temp = new System.Windows.Forms.GroupBox();
+            this.pictureBox26 = new System.Windows.Forms.PictureBox();
+            this.pictureBox27 = new System.Windows.Forms.PictureBox();
+            this.label_Temp = new System.Windows.Forms.Label();
+            this.label33 = new System.Windows.Forms.Label();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
             this.tabControl1.SuspendLayout();
             this.tabPage_Main.SuspendLayout();
@@ -187,6 +203,12 @@
             ((System.ComponentModel.ISupportInitialize)(this.numericUpDown_MultiSet)).BeginInit();
             this.groupBox3.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.dataGridView_TableSetting)).BeginInit();
+            this.groupBox7.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDown9)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDown10)).BeginInit();
+            this.groupBox_Temp.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBox26)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBox27)).BeginInit();
             this.SuspendLayout();
             // 
             // pictureBox1
@@ -210,6 +232,7 @@
             // 
             // tabPage_Main
             // 
+            this.tabPage_Main.Controls.Add(this.groupBox_Temp);
             this.tabPage_Main.Controls.Add(this.groupBox5);
             this.tabPage_Main.Controls.Add(this.groupBox2);
             this.tabPage_Main.Controls.Add(this.groupBox1);
@@ -1085,14 +1108,14 @@
             this.groupBox9.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
             this.groupBox9.Name = "groupBox9";
             this.groupBox9.Padding = new System.Windows.Forms.Padding(2, 3, 2, 3);
-            this.groupBox9.Size = new System.Drawing.Size(206, 306);
+            this.groupBox9.Size = new System.Drawing.Size(206, 226);
             this.groupBox9.TabIndex = 135;
             this.groupBox9.TabStop = false;
             this.groupBox9.Text = "Connection";
             // 
             // button3
             // 
-            this.button3.Location = new System.Drawing.Point(12, 194);
+            this.button3.Location = new System.Drawing.Point(12, 184);
             this.button3.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
             this.button3.Name = "button3";
             this.button3.Size = new System.Drawing.Size(180, 34);
@@ -1103,7 +1126,7 @@
             // 
             // button_terminal
             // 
-            this.button_terminal.Location = new System.Drawing.Point(12, 148);
+            this.button_terminal.Location = new System.Drawing.Point(12, 138);
             this.button_terminal.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
             this.button_terminal.Name = "button_terminal";
             this.button_terminal.Size = new System.Drawing.Size(180, 34);
@@ -1143,7 +1166,7 @@
             // 
             // button_PortOpen
             // 
-            this.button_PortOpen.Location = new System.Drawing.Point(12, 104);
+            this.button_PortOpen.Location = new System.Drawing.Point(12, 94);
             this.button_PortOpen.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
             this.button_PortOpen.Name = "button_PortOpen";
             this.button_PortOpen.Size = new System.Drawing.Size(180, 34);
@@ -1201,6 +1224,7 @@
             // 
             // tabPage_Table
             // 
+            this.tabPage_Table.Controls.Add(this.groupBox7);
             this.tabPage_Table.Controls.Add(this.groupBox6);
             this.tabPage_Table.Controls.Add(this.groupBox3);
             this.tabPage_Table.Controls.Add(this.dataGridView_TableSetting);
@@ -1223,16 +1247,16 @@
             this.groupBox6.Controls.Add(this.button_CurrentOutput);
             this.groupBox6.Controls.Add(this.button_MultiSet);
             this.groupBox6.Controls.Add(this.button_MultiOffset);
-            this.groupBox6.Location = new System.Drawing.Point(338, 136);
+            this.groupBox6.Location = new System.Drawing.Point(338, 130);
             this.groupBox6.Name = "groupBox6";
-            this.groupBox6.Size = new System.Drawing.Size(493, 219);
+            this.groupBox6.Size = new System.Drawing.Size(493, 125);
             this.groupBox6.TabIndex = 1;
             this.groupBox6.TabStop = false;
             // 
             // label31
             // 
             this.label31.AutoSize = true;
-            this.label31.Location = new System.Drawing.Point(58, 173);
+            this.label31.Location = new System.Drawing.Point(58, 88);
             this.label31.Name = "label31";
             this.label31.Size = new System.Drawing.Size(86, 12);
             this.label31.TabIndex = 7;
@@ -1241,7 +1265,7 @@
             // label30
             // 
             this.label30.AutoSize = true;
-            this.label30.Location = new System.Drawing.Point(59, 104);
+            this.label30.Location = new System.Drawing.Point(59, 55);
             this.label30.Name = "label30";
             this.label30.Size = new System.Drawing.Size(68, 12);
             this.label30.TabIndex = 7;
@@ -1250,7 +1274,7 @@
             // label29
             // 
             this.label29.AutoSize = true;
-            this.label29.Location = new System.Drawing.Point(59, 40);
+            this.label29.Location = new System.Drawing.Point(59, 25);
             this.label29.Name = "label29";
             this.label29.Size = new System.Drawing.Size(54, 12);
             this.label29.TabIndex = 7;
@@ -1258,28 +1282,28 @@
             // 
             // numericUpDown11
             // 
-            this.numericUpDown11.Location = new System.Drawing.Point(150, 171);
+            this.numericUpDown11.Location = new System.Drawing.Point(150, 86);
             this.numericUpDown11.Name = "numericUpDown11";
             this.numericUpDown11.Size = new System.Drawing.Size(120, 21);
             this.numericUpDown11.TabIndex = 6;
             // 
             // numericUpDown_MultiOffset
             // 
-            this.numericUpDown_MultiOffset.Location = new System.Drawing.Point(150, 102);
+            this.numericUpDown_MultiOffset.Location = new System.Drawing.Point(150, 53);
             this.numericUpDown_MultiOffset.Name = "numericUpDown_MultiOffset";
             this.numericUpDown_MultiOffset.Size = new System.Drawing.Size(120, 21);
             this.numericUpDown_MultiOffset.TabIndex = 6;
             // 
             // numericUpDown_MultiSet
             // 
-            this.numericUpDown_MultiSet.Location = new System.Drawing.Point(150, 38);
+            this.numericUpDown_MultiSet.Location = new System.Drawing.Point(150, 23);
             this.numericUpDown_MultiSet.Name = "numericUpDown_MultiSet";
             this.numericUpDown_MultiSet.Size = new System.Drawing.Size(120, 21);
             this.numericUpDown_MultiSet.TabIndex = 6;
             // 
             // button_CurrentOutput
             // 
-            this.button_CurrentOutput.Location = new System.Drawing.Point(291, 168);
+            this.button_CurrentOutput.Location = new System.Drawing.Point(291, 83);
             this.button_CurrentOutput.Name = "button_CurrentOutput";
             this.button_CurrentOutput.Size = new System.Drawing.Size(75, 23);
             this.button_CurrentOutput.TabIndex = 1;
@@ -1289,7 +1313,7 @@
             // 
             // button_MultiSet
             // 
-            this.button_MultiSet.Location = new System.Drawing.Point(291, 35);
+            this.button_MultiSet.Location = new System.Drawing.Point(291, 20);
             this.button_MultiSet.Name = "button_MultiSet";
             this.button_MultiSet.Size = new System.Drawing.Size(75, 23);
             this.button_MultiSet.TabIndex = 2;
@@ -1299,7 +1323,7 @@
             // 
             // button_MultiOffset
             // 
-            this.button_MultiOffset.Location = new System.Drawing.Point(291, 102);
+            this.button_MultiOffset.Location = new System.Drawing.Point(291, 53);
             this.button_MultiOffset.Name = "button_MultiOffset";
             this.button_MultiOffset.Size = new System.Drawing.Size(75, 23);
             this.button_MultiOffset.TabIndex = 3;
@@ -1426,7 +1450,7 @@
             this.dataGridView_TableSetting.RowTemplate.Height = 23;
             this.dataGridView_TableSetting.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.True;
             this.dataGridView_TableSetting.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
-            this.dataGridView_TableSetting.Size = new System.Drawing.Size(296, 338);
+            this.dataGridView_TableSetting.Size = new System.Drawing.Size(296, 361);
             this.dataGridView_TableSetting.TabIndex = 0;
             this.dataGridView_TableSetting.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView_TableSetting_CellClick);
             // 
@@ -1447,6 +1471,198 @@
             // 
             this.timer_JdasMbic.Tick += new System.EventHandler(this.timer1_Tick);
             // 
+            // groupBox7
+            // 
+            this.groupBox7.Controls.Add(this.radioButton_ATT4);
+            this.groupBox7.Controls.Add(this.radioButton_ATT3);
+            this.groupBox7.Controls.Add(this.radioButton_ATT2);
+            this.groupBox7.Controls.Add(this.radioButton_ATT1);
+            this.groupBox7.Controls.Add(this.button1);
+            this.groupBox7.Controls.Add(this.button2);
+            this.groupBox7.Controls.Add(this.label32);
+            this.groupBox7.Controls.Add(this.numericUpDown9);
+            this.groupBox7.Controls.Add(this.label34);
+            this.groupBox7.Controls.Add(this.numericUpDown10);
+            this.groupBox7.Location = new System.Drawing.Point(338, 261);
+            this.groupBox7.Name = "groupBox7";
+            this.groupBox7.Size = new System.Drawing.Size(493, 117);
+            this.groupBox7.TabIndex = 2;
+            this.groupBox7.TabStop = false;
+            // 
+            // label32
+            // 
+            this.label32.AutoSize = true;
+            this.label32.Location = new System.Drawing.Point(59, 92);
+            this.label32.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.label32.Name = "label32";
+            this.label32.Size = new System.Drawing.Size(56, 12);
+            this.label32.TabIndex = 104;
+            this.label32.Text = "ATT_UL3";
+            // 
+            // numericUpDown9
+            // 
+            this.numericUpDown9.DecimalPlaces = 1;
+            this.numericUpDown9.Increment = new decimal(new int[] {
+            5,
+            0,
+            0,
+            65536});
+            this.numericUpDown9.Location = new System.Drawing.Point(150, 87);
+            this.numericUpDown9.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
+            this.numericUpDown9.Maximum = new decimal(new int[] {
+            30,
+            0,
+            0,
+            0});
+            this.numericUpDown9.Name = "numericUpDown9";
+            this.numericUpDown9.Size = new System.Drawing.Size(120, 21);
+            this.numericUpDown9.TabIndex = 106;
+            // 
+            // label34
+            // 
+            this.label34.AutoSize = true;
+            this.label34.Location = new System.Drawing.Point(59, 59);
+            this.label34.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.label34.Name = "label34";
+            this.label34.Size = new System.Drawing.Size(56, 12);
+            this.label34.TabIndex = 105;
+            this.label34.Text = "ATT_DL3";
+            // 
+            // numericUpDown10
+            // 
+            this.numericUpDown10.DecimalPlaces = 1;
+            this.numericUpDown10.Increment = new decimal(new int[] {
+            5,
+            0,
+            0,
+            65536});
+            this.numericUpDown10.Location = new System.Drawing.Point(150, 55);
+            this.numericUpDown10.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
+            this.numericUpDown10.Maximum = new decimal(new int[] {
+            30,
+            0,
+            0,
+            0});
+            this.numericUpDown10.Name = "numericUpDown10";
+            this.numericUpDown10.Size = new System.Drawing.Size(120, 21);
+            this.numericUpDown10.TabIndex = 107;
+            // 
+            // button1
+            // 
+            this.button1.Location = new System.Drawing.Point(291, 85);
+            this.button1.Name = "button1";
+            this.button1.Size = new System.Drawing.Size(75, 23);
+            this.button1.TabIndex = 108;
+            this.button1.Text = "APPLY";
+            this.button1.UseVisualStyleBackColor = true;
+            // 
+            // button2
+            // 
+            this.button2.Location = new System.Drawing.Point(291, 55);
+            this.button2.Name = "button2";
+            this.button2.Size = new System.Drawing.Size(75, 23);
+            this.button2.TabIndex = 109;
+            this.button2.Text = "APPLY";
+            this.button2.UseVisualStyleBackColor = true;
+            // 
+            // radioButton_ATT1
+            // 
+            this.radioButton_ATT1.AutoSize = true;
+            this.radioButton_ATT1.Location = new System.Drawing.Point(44, 20);
+            this.radioButton_ATT1.Name = "radioButton_ATT1";
+            this.radioButton_ATT1.Size = new System.Drawing.Size(53, 16);
+            this.radioButton_ATT1.TabIndex = 110;
+            this.radioButton_ATT1.TabStop = true;
+            this.radioButton_ATT1.Text = "ATT1";
+            this.radioButton_ATT1.UseVisualStyleBackColor = true;
+            // 
+            // radioButton_ATT2
+            // 
+            this.radioButton_ATT2.AutoSize = true;
+            this.radioButton_ATT2.Location = new System.Drawing.Point(142, 20);
+            this.radioButton_ATT2.Name = "radioButton_ATT2";
+            this.radioButton_ATT2.Size = new System.Drawing.Size(53, 16);
+            this.radioButton_ATT2.TabIndex = 110;
+            this.radioButton_ATT2.TabStop = true;
+            this.radioButton_ATT2.Text = "ATT2";
+            this.radioButton_ATT2.UseVisualStyleBackColor = true;
+            // 
+            // radioButton_ATT3
+            // 
+            this.radioButton_ATT3.AutoSize = true;
+            this.radioButton_ATT3.Location = new System.Drawing.Point(240, 20);
+            this.radioButton_ATT3.Name = "radioButton_ATT3";
+            this.radioButton_ATT3.Size = new System.Drawing.Size(53, 16);
+            this.radioButton_ATT3.TabIndex = 110;
+            this.radioButton_ATT3.TabStop = true;
+            this.radioButton_ATT3.Text = "ATT3";
+            this.radioButton_ATT3.UseVisualStyleBackColor = true;
+            // 
+            // radioButton_ATT4
+            // 
+            this.radioButton_ATT4.AutoSize = true;
+            this.radioButton_ATT4.Location = new System.Drawing.Point(338, 20);
+            this.radioButton_ATT4.Name = "radioButton_ATT4";
+            this.radioButton_ATT4.Size = new System.Drawing.Size(53, 16);
+            this.radioButton_ATT4.TabIndex = 110;
+            this.radioButton_ATT4.TabStop = true;
+            this.radioButton_ATT4.Text = "ATT4";
+            this.radioButton_ATT4.UseVisualStyleBackColor = true;
+            // 
+            // groupBox_Temp
+            // 
+            this.groupBox_Temp.Controls.Add(this.label_Temp);
+            this.groupBox_Temp.Controls.Add(this.label33);
+            this.groupBox_Temp.Controls.Add(this.pictureBox26);
+            this.groupBox_Temp.Controls.Add(this.pictureBox27);
+            this.groupBox_Temp.Location = new System.Drawing.Point(3, 300);
+            this.groupBox_Temp.Name = "groupBox_Temp";
+            this.groupBox_Temp.Size = new System.Drawing.Size(206, 72);
+            this.groupBox_Temp.TabIndex = 141;
+            this.groupBox_Temp.TabStop = false;
+            // 
+            // pictureBox26
+            // 
+            this.pictureBox26.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox26.Image")));
+            this.pictureBox26.Location = new System.Drawing.Point(155, 20);
+            this.pictureBox26.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
+            this.pictureBox26.Name = "pictureBox26";
+            this.pictureBox26.Size = new System.Drawing.Size(37, 36);
+            this.pictureBox26.TabIndex = 142;
+            this.pictureBox26.TabStop = false;
+            this.pictureBox26.Tag = "2";
+            // 
+            // pictureBox27
+            // 
+            this.pictureBox27.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox27.Image")));
+            this.pictureBox27.Location = new System.Drawing.Point(155, 20);
+            this.pictureBox27.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
+            this.pictureBox27.Name = "pictureBox27";
+            this.pictureBox27.Size = new System.Drawing.Size(37, 36);
+            this.pictureBox27.TabIndex = 144;
+            this.pictureBox27.TabStop = false;
+            this.pictureBox27.Tag = "1";
+            // 
+            // label_Temp
+            // 
+            this.label_Temp.AutoSize = true;
+            this.label_Temp.Location = new System.Drawing.Point(13, 19);
+            this.label_Temp.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.label_Temp.Name = "label_Temp";
+            this.label_Temp.Size = new System.Drawing.Size(77, 12);
+            this.label_Temp.TabIndex = 145;
+            this.label_Temp.Text = "Temperature";
+            // 
+            // label33
+            // 
+            this.label33.AutoSize = true;
+            this.label33.Location = new System.Drawing.Point(42, 44);
+            this.label33.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.label33.Name = "label33";
+            this.label33.Size = new System.Drawing.Size(29, 12);
+            this.label33.TabIndex = 146;
+            this.label33.Text = "0.0V";
+            // 
             // JdasMbic
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
@@ -1516,6 +1732,14 @@
             this.groupBox3.ResumeLayout(false);
             this.groupBox3.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)(this.dataGridView_TableSetting)).EndInit();
+            this.groupBox7.ResumeLayout(false);
+            this.groupBox7.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDown9)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDown10)).EndInit();
+            this.groupBox_Temp.ResumeLayout(false);
+            this.groupBox_Temp.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBox26)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBox27)).EndInit();
             this.ResumeLayout(false);
 
         }
@@ -1627,6 +1851,22 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn Column_Offset;
         private System.IO.Ports.SerialPort serialPort_JdasMbic;
         private System.Windows.Forms.Timer timer_JdasMbic;
+        private System.Windows.Forms.GroupBox groupBox7;
+        private System.Windows.Forms.Button button1;
+        private System.Windows.Forms.Label label32;
+        public System.Windows.Forms.NumericUpDown numericUpDown9;
+        private System.Windows.Forms.Label label34;
+        public System.Windows.Forms.NumericUpDown numericUpDown10;
+        private System.Windows.Forms.RadioButton radioButton_ATT4;
+        private System.Windows.Forms.RadioButton radioButton_ATT3;
+        private System.Windows.Forms.RadioButton radioButton_ATT2;
+        private System.Windows.Forms.RadioButton radioButton_ATT1;
+        private System.Windows.Forms.Button button2;
+        private System.Windows.Forms.GroupBox groupBox_Temp;
+        private System.Windows.Forms.Label label_Temp;
+        public System.Windows.Forms.Label label33;
+        public System.Windows.Forms.PictureBox pictureBox26;
+        public System.Windows.Forms.PictureBox pictureBox27;
     }
 }
 

Jdas_Mbic/Main.cs

@@ -14,7 +14,7 @@ namespace Jdas_Mbic
 {
     public partial class JdasMbic : Form
     {
-        const double Table_Dbm_DefaultValue = 31.5;
+        const double Table_Dbm_DefaultValue = 0;//31.5;
         const int Table_DL_DefaultValue = 5;
         const int Table_UL_DefaultValue = -15;
         const int Table_Temp_DefaultValue = -10;
@@ -46,7 +46,7 @@ namespace Jdas_Mbic
                 dataGridView_TableSetting.Rows.Add();
                 tempstr = string.Format("{0:0.0}", TempDbmData);
                 dataGridView_TableSetting[0, i].Value = Convert.ToString(tempstr) + " dBm"; ;
-                TempDbmData = TempDbmData - 0.5;
+                TempDbmData = TempDbmData + 0.5;
                 
             }
 

Jdas_Mbic/Main.resx

@@ -118,6 +118,101 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="pictureBox26.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        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
+        RK5CYII=
+</value>
+  </data>
+  <data name="pictureBox27.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        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
+        AAAASUVORK5CYII=
+</value>
+  </data>
   <data name="pictureBox18.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAACUAAAAkCAYAAAAOwvOmAAAABGdBTUEAALGPC/xhBQAACRxJREFUWEft
@@ -1264,12 +1359,6 @@
   <metadata name="Column_Offset.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="Column_DB.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="Column_Offset.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
   <metadata name="serialPort_JdasMbic.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>

Jdas_Mbic/obj/Debug/Jdas_Mbic.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-e6ab130e68daffa7e26893f0ba4481efd3304b65
+dc6033e67fe295d45a9ff8b4bc602f92f9046681