DAC 제어 소수점 둘째자리 까지 제어 할 수 있도록 수정

Basic_Terminal/Wnd/Main_Form.Designer.cs

@@ -2087,12 +2087,12 @@
             // 
             // numericUpDown_DAC_VoltCtrl_A
             // 
-            this.numericUpDown_DAC_VoltCtrl_A.DecimalPlaces = 1;
+            this.numericUpDown_DAC_VoltCtrl_A.DecimalPlaces = 2;
             this.numericUpDown_DAC_VoltCtrl_A.Increment = new decimal(new int[] {
             1,
             0,
             0,
-            65536});
+            131072});
             this.numericUpDown_DAC_VoltCtrl_A.Location = new System.Drawing.Point(95, 55);
             this.numericUpDown_DAC_VoltCtrl_A.Maximum = new decimal(new int[] {
             4,
@@ -2108,12 +2108,12 @@
             // 
             // numericUpDown_DAC_VoltCtrl_E
             // 
-            this.numericUpDown_DAC_VoltCtrl_E.DecimalPlaces = 1;
+            this.numericUpDown_DAC_VoltCtrl_E.DecimalPlaces = 2;
             this.numericUpDown_DAC_VoltCtrl_E.Increment = new decimal(new int[] {
             1,
             0,
             0,
-            65536});
+            131072});
             this.numericUpDown_DAC_VoltCtrl_E.Location = new System.Drawing.Point(95, 84);
             this.numericUpDown_DAC_VoltCtrl_E.Maximum = new decimal(new int[] {
             4,
@@ -2223,12 +2223,12 @@
             // 
             // numericUpDown_DAC_VoltCtrl_H
             // 
-            this.numericUpDown_DAC_VoltCtrl_H.DecimalPlaces = 1;
+            this.numericUpDown_DAC_VoltCtrl_H.DecimalPlaces = 2;
             this.numericUpDown_DAC_VoltCtrl_H.Increment = new decimal(new int[] {
             1,
             0,
             0,
-            65536});
+            131072});
             this.numericUpDown_DAC_VoltCtrl_H.Location = new System.Drawing.Point(836, 84);
             this.numericUpDown_DAC_VoltCtrl_H.Maximum = new decimal(new int[] {
             4,
@@ -2244,12 +2244,12 @@
             // 
             // numericUpDown_DAC_VoltCtrl_F
             // 
-            this.numericUpDown_DAC_VoltCtrl_F.DecimalPlaces = 1;
+            this.numericUpDown_DAC_VoltCtrl_F.DecimalPlaces = 2;
             this.numericUpDown_DAC_VoltCtrl_F.Increment = new decimal(new int[] {
             1,
             0,
             0,
-            65536});
+            131072});
             this.numericUpDown_DAC_VoltCtrl_F.Location = new System.Drawing.Point(342, 84);
             this.numericUpDown_DAC_VoltCtrl_F.Maximum = new decimal(new int[] {
             4,
@@ -2265,12 +2265,12 @@
             // 
             // numericUpDown_DAC_VoltCtrl_G
             // 
-            this.numericUpDown_DAC_VoltCtrl_G.DecimalPlaces = 1;
+            this.numericUpDown_DAC_VoltCtrl_G.DecimalPlaces = 2;
             this.numericUpDown_DAC_VoltCtrl_G.Increment = new decimal(new int[] {
             1,
             0,
             0,
-            65536});
+            131072});
             this.numericUpDown_DAC_VoltCtrl_G.Location = new System.Drawing.Point(589, 84);
             this.numericUpDown_DAC_VoltCtrl_G.Maximum = new decimal(new int[] {
             4,
@@ -2286,12 +2286,12 @@
             // 
             // numericUpDown_DAC_VoltCtrl_D
             // 
-            this.numericUpDown_DAC_VoltCtrl_D.DecimalPlaces = 1;
+            this.numericUpDown_DAC_VoltCtrl_D.DecimalPlaces = 2;
             this.numericUpDown_DAC_VoltCtrl_D.Increment = new decimal(new int[] {
             1,
             0,
             0,
-            65536});
+            131072});
             this.numericUpDown_DAC_VoltCtrl_D.Location = new System.Drawing.Point(836, 55);
             this.numericUpDown_DAC_VoltCtrl_D.Maximum = new decimal(new int[] {
             4,
@@ -2307,12 +2307,12 @@
             // 
             // numericUpDown_DAC_VoltCtrl_B
             // 
-            this.numericUpDown_DAC_VoltCtrl_B.DecimalPlaces = 1;
+            this.numericUpDown_DAC_VoltCtrl_B.DecimalPlaces = 2;
             this.numericUpDown_DAC_VoltCtrl_B.Increment = new decimal(new int[] {
             1,
             0,
             0,
-            65536});
+            131072});
             this.numericUpDown_DAC_VoltCtrl_B.Location = new System.Drawing.Point(342, 55);
             this.numericUpDown_DAC_VoltCtrl_B.Maximum = new decimal(new int[] {
             4,
@@ -2328,12 +2328,12 @@
             // 
             // numericUpDown_DAC_VoltCtrl_C
             // 
-            this.numericUpDown_DAC_VoltCtrl_C.DecimalPlaces = 1;
+            this.numericUpDown_DAC_VoltCtrl_C.DecimalPlaces = 2;
             this.numericUpDown_DAC_VoltCtrl_C.Increment = new decimal(new int[] {
             1,
             0,
             0,
-            65536});
+            131072});
             this.numericUpDown_DAC_VoltCtrl_C.Location = new System.Drawing.Point(589, 55);
             this.numericUpDown_DAC_VoltCtrl_C.Maximum = new decimal(new int[] {
             4,

Basic_Terminal/Wnd/Main_Form.cs

@@ -336,64 +336,67 @@ namespace RF_TRIO_PLL_ZIG
                     temp_val = data[(int)Bluecell_TypeIndex_t.PLL_3_5G_UL_H] << 8;
                     temp_val = ((temp_val | data[(int)Bluecell_TypeIndex_t.PLL_3_5G_UL_L]) / 10);
                     this.Invoke(new StringSend(numeric_Text_Set), numericUpDown_PLL_3_5G_UL, temp_val.ToString());
-
+                    /***********************DAC A Sector**********************************/
                     temp_val = data[(int)Bluecell_TypeIndex_t.DAC_VCtrl_A_H] << 8;
                     temp_val = ((temp_val | data[(int)Bluecell_TypeIndex_t.DAC_VCtrl_A_L]) );
                     ret = (temp_val & 0x0FFF) * 4;
                     ret = ret / 4095;
-                    ret = Math.Round(Convert.ToDouble(ret), 1);
+                    ret = Math.Round(Convert.ToDouble(ret), 2);
                     this.Invoke(new StringSend(numeric_Text_Set), numericUpDown_DAC_VoltCtrl_A, ret.ToString());
-
+                    /***********************DAC B Sector**********************************/
                     temp_val = data[(int)Bluecell_TypeIndex_t.DAC_VCtrl_B_H] << 8;
                     temp_val = ((temp_val | data[(int)Bluecell_TypeIndex_t.DAC_VCtrl_B_L]) );
                     ret = (temp_val & 0x0FFF) * 4;
                     ret = ret / 4095;
-                    ret = Math.Round(Convert.ToDouble(ret), 1);
+                    ret = Math.Round(Convert.ToDouble(ret), 2);
                     this.Invoke(new StringSend(numeric_Text_Set), numericUpDown_DAC_VoltCtrl_B, ret.ToString());
-
+                    /***********************DAC C Sector**********************************/
                     temp_val = data[(int)Bluecell_TypeIndex_t.DAC_VCtrl_C_H] << 8;
                     temp_val = ((temp_val | data[(int)Bluecell_TypeIndex_t.DAC_VCtrl_C_L]) );
                     ret = (temp_val & 0x0FFF) * 4;
                     ret = ret / 4095;
-                    ret = Math.Round(Convert.ToDouble(ret ), 1);
+                    ret = Math.Round(Convert.ToDouble(ret ), 2);
 
                     this.Invoke(new StringSend(numeric_Text_Set), numericUpDown_DAC_VoltCtrl_C, ret.ToString());
-
+                    /***********************DAC D Sector**********************************/
                     temp_val = data[(int)Bluecell_TypeIndex_t.DAC_VCtrl_D_H] << 8;
                     temp_val = ((temp_val | data[(int)Bluecell_TypeIndex_t.DAC_VCtrl_D_L]) );
                     ret = (temp_val & 0x0FFF) * 4;
                     ret = ret / 4095;
-                    ret = Math.Round(Convert.ToDouble(ret), 1);
+                    ret = Math.Round(Convert.ToDouble(ret), 2);
                     this.Invoke(new StringSend(numeric_Text_Set), numericUpDown_DAC_VoltCtrl_D, ret.ToString());
-
+                    /***********************DAC E Sector**********************************/
                     temp_val = data[(int)Bluecell_TypeIndex_t.DAC_VCtrl_E_H] << 8;
                     temp_val = ((temp_val | data[(int)Bluecell_TypeIndex_t.DAC_VCtrl_E_L]) );
                     ret = (temp_val & 0x0FFF) * 4;
                     ret = ret / 4095;
-                    ret = Math.Round(Convert.ToDouble(ret), 1);
+                    ret = Math.Round(Convert.ToDouble(ret), 2);
                     this.Invoke(new StringSend(numeric_Text_Set), numericUpDown_DAC_VoltCtrl_E, ret.ToString());
-
+                    /***********************DAC F Sector**********************************/
                     temp_val = data[(int)Bluecell_TypeIndex_t.DAC_VCtrl_F_H] << 8;
                     temp_val = ((temp_val | data[(int)Bluecell_TypeIndex_t.DAC_VCtrl_F_L]) );
                     ret = (temp_val & 0x0FFF) * 4;
                     ret = ret / 4095;
-                    ret = Math.Round(Convert.ToDouble(ret), 1);
+                    ret = Math.Round(Convert.ToDouble(ret), 2);
                     this.Invoke(new StringSend(numeric_Text_Set), numericUpDown_DAC_VoltCtrl_F, ret.ToString());
-
+                    /***********************DAC G Sector**********************************/
                     temp_val = data[(int)Bluecell_TypeIndex_t.DAC_VCtrl_G_H] << 8;
                     temp_val = ((temp_val | data[(int)Bluecell_TypeIndex_t.DAC_VCtrl_G_L]) );
                     ret = (temp_val & 0x0FFF) * 4;
                     ret = ret / 4095;
-                    ret = Math.Round(Convert.ToDouble(ret), 1);
+                    ret = Math.Round(Convert.ToDouble(ret), 2);
                     this.Invoke(new StringSend(numeric_Text_Set), numericUpDown_DAC_VoltCtrl_G, ret.ToString());
-
+                    /***********************DAC H Sector**********************************/
                     temp_val = data[(int)Bluecell_TypeIndex_t.DAC_VCtrl_H_H] << 8;
                     temp_val = ((temp_val | data[(int)Bluecell_TypeIndex_t.DAC_VCtrl_H_L]) );
                     ret = (temp_val & 0x0FFF) * 4;
                     ret = ret / 4095;
-                    ret = Math.Round(Convert.ToDouble(ret), 1);
+                    ret = Math.Round(Convert.ToDouble(ret), 2);
                     this.Invoke(new StringSend(numeric_Text_Set), numericUpDown_DAC_VoltCtrl_H, ret.ToString());
 
+
+
+
                     PictureBox pic_on;
                     PictureBox pic_off;
                     pic_on = pictureBox_PATH_1_8G_DL_ON;