소스 검색

불필요한 Data Length 제거
SelfTest Gain 저장 Index 추가
SelfTest 프로토콜 제거

PYJ 5 년 전
부모
커밋
36a88afb5c

BIN
.vs/Jdas_Mbic/v15/.suo


BIN
.vs/Jdas_Mbic/v15/Server/sqlite3/storage.ide


BIN
.vs/Jdas_Mbic/v15/Server/sqlite3/storage.ide-shm


BIN
.vs/Jdas_Mbic/v15/Server/sqlite3/storage.ide-wal


+ 5 - 4
Jdas_Mbic/Func/Bluecell_BootProtocol.cs

@@ -83,16 +83,13 @@ namespace Jdas_Mbic
83 83
             BLUECELL_SOFTWARERESET = 0,
84 84
             ATT_DL1_PATH = 0x12,
85 85
             ATT_UL1_PATH = 0x16,
86
-            ATT_SelfTest1 = 0x18,
86
+            ATT_SelfTest = 0x18,
87 87
             ATT_DL2_PATH = 0x22,
88 88
             ATT_UL2_PATH = 0x26,
89
-            ATT_SelfTest2 = 0x28,
90 89
             ATT_DL3_PATH = 0x32,
91 90
             ATT_UL3_PATH = 0x36,
92
-            ATT_SelfTest3 = 0x38,
93 91
             ATT_DL4_PATH = 0x42,
94 92
             ATT_UL4_PATH = 0x46,
95
-            ATT_SelfTest4 = 0x48,
96 93
             Bluecell_ULO_ALC_ON_OFF = 0x51,
97 94
             Bluecell_DLI_AGC_ON_OFF = 0x61,
98 95
             ATT_TableSet = 0x70,
@@ -163,6 +160,10 @@ namespace Jdas_Mbic
163 160
             Bluecell_UL_Det_Path3_Offset,
164 161
             Bluecell_UL_Det_Path4_Offset,
165 162
             Bluecell_Temp_Shutdown_Path_ON_OFF,
163
+            Bluecell_Path1_GainValue,
164
+            Bluecell_Path2_GainValue,
165
+            Bluecell_Path3_GainValue,
166
+            Bluecell_Path4_GainValue,
166 167
         };
167 168
 
168 169
        

+ 103 - 77
Jdas_Mbic/Main.Designer.cs

@@ -104,12 +104,8 @@
104 104
             this.panel1 = new System.Windows.Forms.Panel();
105 105
             this.label10 = new System.Windows.Forms.Label();
106 106
             this.button_TempShutdown = new System.Windows.Forms.Button();
107
-            this.textBox_UL4_TableOffset = new System.Windows.Forms.TextBox();
108
-            this.textBox_UL2_TableOffset = new System.Windows.Forms.TextBox();
109 107
             this.textBox_DL4_TableOffset = new System.Windows.Forms.TextBox();
110
-            this.textBox_UL3_TableOffset = new System.Windows.Forms.TextBox();
111 108
             this.textBox_DL2_TableOffset = new System.Windows.Forms.TextBox();
112
-            this.textBox_UL1_TableOffset = new System.Windows.Forms.TextBox();
113 109
             this.textBox_DL3_TableOffset = new System.Windows.Forms.TextBox();
114 110
             this.textBox_DL1_TableOffset = new System.Windows.Forms.TextBox();
115 111
             this.textBox_Bank2Name = new System.Windows.Forms.TextBox();
@@ -133,6 +129,8 @@
133 129
             this.button_SelfTest1 = new System.Windows.Forms.Button();
134 130
             this.button_SelfTest3 = new System.Windows.Forms.Button();
135 131
             this.panel_Serial = new System.Windows.Forms.Panel();
132
+            this.numericUpDown_Version1 = new System.Windows.Forms.NumericUpDown();
133
+            this.numericUpDown_Version2 = new System.Windows.Forms.NumericUpDown();
136 134
             this.numericUpDown_Version3 = new System.Windows.Forms.NumericUpDown();
137 135
             this.label1 = new System.Windows.Forms.Label();
138 136
             this.pictureBox_R_TX = new System.Windows.Forms.PictureBox();
@@ -141,7 +139,6 @@
141 139
             this.pictureBox_G_RX = new System.Windows.Forms.PictureBox();
142 140
             this.pictureBox1 = new System.Windows.Forms.PictureBox();
143 141
             this.label9 = new System.Windows.Forms.Label();
144
-            this.label_TableOffset = new System.Windows.Forms.Label();
145 142
             this.label111 = new System.Windows.Forms.Label();
146 143
             this.label100 = new System.Windows.Forms.Label();
147 144
             this.label110 = new System.Windows.Forms.Label();
@@ -298,8 +295,10 @@
298 295
             this.numericUpDown1 = new System.Windows.Forms.NumericUpDown();
299 296
             this.label3 = new System.Windows.Forms.Label();
300 297
             this.numericUpDown2 = new System.Windows.Forms.NumericUpDown();
301
-            this.numericUpDown_Version2 = new System.Windows.Forms.NumericUpDown();
302
-            this.numericUpDown_Version1 = new System.Windows.Forms.NumericUpDown();
298
+            this.numericUpDown_Path3_GainValue = new System.Windows.Forms.NumericUpDown();
299
+            this.numericUpDown_Path4_GainValue = new System.Windows.Forms.NumericUpDown();
300
+            this.numericUpDown_Path2_GainValue = new System.Windows.Forms.NumericUpDown();
301
+            this.numericUpDown_Path1_GainValue = new System.Windows.Forms.NumericUpDown();
303 302
             ((System.ComponentModel.ISupportInitialize)(this.numericUpDown_ShutdownUL3)).BeginInit();
304 303
             ((System.ComponentModel.ISupportInitialize)(this.numericUpDown_ShutdownDL3)).BeginInit();
305 304
             ((System.ComponentModel.ISupportInitialize)(this.numericUpDown_ALC3)).BeginInit();
@@ -334,6 +333,8 @@
334 333
             ((System.ComponentModel.ISupportInitialize)(this.numericUpDown_MASK)).BeginInit();
335 334
             this.panel1.SuspendLayout();
336 335
             this.panel_Serial.SuspendLayout();
336
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDown_Version1)).BeginInit();
337
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDown_Version2)).BeginInit();
337 338
             ((System.ComponentModel.ISupportInitialize)(this.numericUpDown_Version3)).BeginInit();
338 339
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox_R_TX)).BeginInit();
339 340
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox_G_TX)).BeginInit();
@@ -417,8 +418,10 @@
417 418
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox_TempHigh_Alarm_OFF)).BeginInit();
418 419
             ((System.ComponentModel.ISupportInitialize)(this.numericUpDown1)).BeginInit();
419 420
             ((System.ComponentModel.ISupportInitialize)(this.numericUpDown2)).BeginInit();
420
-            ((System.ComponentModel.ISupportInitialize)(this.numericUpDown_Version2)).BeginInit();
421
-            ((System.ComponentModel.ISupportInitialize)(this.numericUpDown_Version1)).BeginInit();
421
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDown_Path3_GainValue)).BeginInit();
422
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDown_Path4_GainValue)).BeginInit();
423
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDown_Path2_GainValue)).BeginInit();
424
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDown_Path1_GainValue)).BeginInit();
422 425
             this.SuspendLayout();
423 426
             // 
424 427
             // textBox_FRBT_TIME
@@ -1513,14 +1516,14 @@
1513 1516
             // panel1
1514 1517
             // 
1515 1518
             this.panel1.BackColor = System.Drawing.Color.White;
1519
+            this.panel1.Controls.Add(this.numericUpDown_Path3_GainValue);
1520
+            this.panel1.Controls.Add(this.numericUpDown_Path4_GainValue);
1521
+            this.panel1.Controls.Add(this.numericUpDown_Path2_GainValue);
1522
+            this.panel1.Controls.Add(this.numericUpDown_Path1_GainValue);
1516 1523
             this.panel1.Controls.Add(this.label10);
1517 1524
             this.panel1.Controls.Add(this.button_TempShutdown);
1518
-            this.panel1.Controls.Add(this.textBox_UL4_TableOffset);
1519
-            this.panel1.Controls.Add(this.textBox_UL2_TableOffset);
1520 1525
             this.panel1.Controls.Add(this.textBox_DL4_TableOffset);
1521
-            this.panel1.Controls.Add(this.textBox_UL3_TableOffset);
1522 1526
             this.panel1.Controls.Add(this.textBox_DL2_TableOffset);
1523
-            this.panel1.Controls.Add(this.textBox_UL1_TableOffset);
1524 1527
             this.panel1.Controls.Add(this.textBox_DL3_TableOffset);
1525 1528
             this.panel1.Controls.Add(this.textBox_DL1_TableOffset);
1526 1529
             this.panel1.Controls.Add(this.textBox_Bank2Name);
@@ -1551,7 +1554,6 @@
1551 1554
             this.panel1.Controls.Add(this.textBox_FRBT_TIME);
1552 1555
             this.panel1.Controls.Add(this.label_Temp);
1553 1556
             this.panel1.Controls.Add(this.label9);
1554
-            this.panel1.Controls.Add(this.label_TableOffset);
1555 1557
             this.panel1.Controls.Add(this.label111);
1556 1558
             this.panel1.Controls.Add(this.label66);
1557 1559
             this.panel1.Controls.Add(this.label13);
@@ -1645,22 +1647,6 @@
1645 1647
             this.button_TempShutdown.UseVisualStyleBackColor = true;
1646 1648
             this.button_TempShutdown.Click += new System.EventHandler(this.button_PATH_Ctrl_Click);
1647 1649
             // 
1648
-            // textBox_UL4_TableOffset
1649
-            // 
1650
-            this.textBox_UL4_TableOffset.Location = new System.Drawing.Point(1030, 741);
1651
-            this.textBox_UL4_TableOffset.Name = "textBox_UL4_TableOffset";
1652
-            this.textBox_UL4_TableOffset.Size = new System.Drawing.Size(75, 23);
1653
-            this.textBox_UL4_TableOffset.TabIndex = 178;
1654
-            this.textBox_UL4_TableOffset.Visible = false;
1655
-            // 
1656
-            // textBox_UL2_TableOffset
1657
-            // 
1658
-            this.textBox_UL2_TableOffset.Location = new System.Drawing.Point(824, 741);
1659
-            this.textBox_UL2_TableOffset.Name = "textBox_UL2_TableOffset";
1660
-            this.textBox_UL2_TableOffset.Size = new System.Drawing.Size(75, 23);
1661
-            this.textBox_UL2_TableOffset.TabIndex = 178;
1662
-            this.textBox_UL2_TableOffset.Visible = false;
1663
-            // 
1664 1650
             // textBox_DL4_TableOffset
1665 1651
             // 
1666 1652
             this.textBox_DL4_TableOffset.Location = new System.Drawing.Point(526, 746);
@@ -1669,14 +1655,6 @@
1669 1655
             this.textBox_DL4_TableOffset.TabIndex = 178;
1670 1656
             this.textBox_DL4_TableOffset.Visible = false;
1671 1657
             // 
1672
-            // textBox_UL3_TableOffset
1673
-            // 
1674
-            this.textBox_UL3_TableOffset.Location = new System.Drawing.Point(931, 741);
1675
-            this.textBox_UL3_TableOffset.Name = "textBox_UL3_TableOffset";
1676
-            this.textBox_UL3_TableOffset.Size = new System.Drawing.Size(75, 23);
1677
-            this.textBox_UL3_TableOffset.TabIndex = 177;
1678
-            this.textBox_UL3_TableOffset.Visible = false;
1679
-            // 
1680 1658
             // textBox_DL2_TableOffset
1681 1659
             // 
1682 1660
             this.textBox_DL2_TableOffset.Location = new System.Drawing.Point(320, 746);
@@ -1685,14 +1663,6 @@
1685 1663
             this.textBox_DL2_TableOffset.TabIndex = 178;
1686 1664
             this.textBox_DL2_TableOffset.Visible = false;
1687 1665
             // 
1688
-            // textBox_UL1_TableOffset
1689
-            // 
1690
-            this.textBox_UL1_TableOffset.Location = new System.Drawing.Point(718, 741);
1691
-            this.textBox_UL1_TableOffset.Name = "textBox_UL1_TableOffset";
1692
-            this.textBox_UL1_TableOffset.Size = new System.Drawing.Size(75, 23);
1693
-            this.textBox_UL1_TableOffset.TabIndex = 176;
1694
-            this.textBox_UL1_TableOffset.Visible = false;
1695
-            // 
1696 1666
             // textBox_DL3_TableOffset
1697 1667
             // 
1698 1668
             this.textBox_DL3_TableOffset.Location = new System.Drawing.Point(427, 746);
@@ -1908,6 +1878,20 @@
1908 1878
             this.panel_Serial.TabIndex = 154;
1909 1879
             this.panel_Serial.Paint += new System.Windows.Forms.PaintEventHandler(this.panel_Serial_Paint);
1910 1880
             // 
1881
+            // numericUpDown_Version1
1882
+            // 
1883
+            this.numericUpDown_Version1.Location = new System.Drawing.Point(3, 516);
1884
+            this.numericUpDown_Version1.Name = "numericUpDown_Version1";
1885
+            this.numericUpDown_Version1.Size = new System.Drawing.Size(37, 23);
1886
+            this.numericUpDown_Version1.TabIndex = 151;
1887
+            // 
1888
+            // numericUpDown_Version2
1889
+            // 
1890
+            this.numericUpDown_Version2.Location = new System.Drawing.Point(45, 516);
1891
+            this.numericUpDown_Version2.Name = "numericUpDown_Version2";
1892
+            this.numericUpDown_Version2.Size = new System.Drawing.Size(37, 23);
1893
+            this.numericUpDown_Version2.TabIndex = 151;
1894
+            // 
1911 1895
             // numericUpDown_Version3
1912 1896
             // 
1913 1897
             this.numericUpDown_Version3.Location = new System.Drawing.Point(87, 516);
@@ -1974,24 +1958,13 @@
1974 1958
             // 
1975 1959
             this.label9.AutoSize = true;
1976 1960
             this.label9.Font = new System.Drawing.Font("맑은 고딕", 9F);
1977
-            this.label9.Location = new System.Drawing.Point(128, 754);
1961
+            this.label9.Location = new System.Drawing.Point(638, 745);
1978 1962
             this.label9.Name = "label9";
1979
-            this.label9.Size = new System.Drawing.Size(71, 15);
1963
+            this.label9.Size = new System.Drawing.Size(65, 15);
1980 1964
             this.label9.TabIndex = 105;
1981
-            this.label9.Text = "Table Offset";
1965
+            this.label9.Text = "Gain Value";
1982 1966
             this.label9.Visible = false;
1983 1967
             // 
1984
-            // label_TableOffset
1985
-            // 
1986
-            this.label_TableOffset.AutoSize = true;
1987
-            this.label_TableOffset.Font = new System.Drawing.Font("맑은 고딕", 9F);
1988
-            this.label_TableOffset.Location = new System.Drawing.Point(639, 746);
1989
-            this.label_TableOffset.Name = "label_TableOffset";
1990
-            this.label_TableOffset.Size = new System.Drawing.Size(71, 15);
1991
-            this.label_TableOffset.TabIndex = 105;
1992
-            this.label_TableOffset.Text = "Table Offset";
1993
-            this.label_TableOffset.Visible = false;
1994
-            // 
1995 1968
             // label111
1996 1969
             // 
1997 1970
             this.label111.AutoSize = true;
@@ -3546,19 +3519,69 @@
3546 3519
             0,
3547 3520
             -2147483648});
3548 3521
             // 
3549
-            // numericUpDown_Version2
3522
+            // numericUpDown_Path3_GainValue
3550 3523
             // 
3551
-            this.numericUpDown_Version2.Location = new System.Drawing.Point(45, 516);
3552
-            this.numericUpDown_Version2.Name = "numericUpDown_Version2";
3553
-            this.numericUpDown_Version2.Size = new System.Drawing.Size(37, 23);
3554
-            this.numericUpDown_Version2.TabIndex = 151;
3524
+            this.numericUpDown_Path3_GainValue.Location = new System.Drawing.Point(936, 743);
3525
+            this.numericUpDown_Path3_GainValue.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
3526
+            this.numericUpDown_Path3_GainValue.Minimum = new decimal(new int[] {
3527
+            100,
3528
+            0,
3529
+            0,
3530
+            -2147483648});
3531
+            this.numericUpDown_Path3_GainValue.Name = "numericUpDown_Path3_GainValue";
3532
+            this.numericUpDown_Path3_GainValue.Size = new System.Drawing.Size(65, 23);
3533
+            this.numericUpDown_Path3_GainValue.TabIndex = 181;
3534
+            this.numericUpDown_Path3_GainValue.Enter += new System.EventHandler(this.Activi_Change__SettingComplete);
3535
+            this.numericUpDown_Path3_GainValue.KeyDown += new System.Windows.Forms.KeyEventHandler(this.ATT_Enter);
3536
+            this.numericUpDown_Path3_GainValue.Leave += new System.EventHandler(this.Activi_Change__Setting);
3555 3537
             // 
3556
-            // numericUpDown_Version1
3538
+            // numericUpDown_Path4_GainValue
3557 3539
             // 
3558
-            this.numericUpDown_Version1.Location = new System.Drawing.Point(3, 516);
3559
-            this.numericUpDown_Version1.Name = "numericUpDown_Version1";
3560
-            this.numericUpDown_Version1.Size = new System.Drawing.Size(37, 23);
3561
-            this.numericUpDown_Version1.TabIndex = 151;
3540
+            this.numericUpDown_Path4_GainValue.Location = new System.Drawing.Point(1034, 743);
3541
+            this.numericUpDown_Path4_GainValue.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
3542
+            this.numericUpDown_Path4_GainValue.Minimum = new decimal(new int[] {
3543
+            100,
3544
+            0,
3545
+            0,
3546
+            -2147483648});
3547
+            this.numericUpDown_Path4_GainValue.Name = "numericUpDown_Path4_GainValue";
3548
+            this.numericUpDown_Path4_GainValue.Size = new System.Drawing.Size(65, 23);
3549
+            this.numericUpDown_Path4_GainValue.TabIndex = 182;
3550
+            this.numericUpDown_Path4_GainValue.Enter += new System.EventHandler(this.Activi_Change__SettingComplete);
3551
+            this.numericUpDown_Path4_GainValue.KeyDown += new System.Windows.Forms.KeyEventHandler(this.ATT_Enter);
3552
+            this.numericUpDown_Path4_GainValue.Leave += new System.EventHandler(this.Activi_Change__Setting);
3553
+            // 
3554
+            // numericUpDown_Path2_GainValue
3555
+            // 
3556
+            this.numericUpDown_Path2_GainValue.Location = new System.Drawing.Point(829, 744);
3557
+            this.numericUpDown_Path2_GainValue.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
3558
+            this.numericUpDown_Path2_GainValue.Minimum = new decimal(new int[] {
3559
+            100,
3560
+            0,
3561
+            0,
3562
+            -2147483648});
3563
+            this.numericUpDown_Path2_GainValue.Name = "numericUpDown_Path2_GainValue";
3564
+            this.numericUpDown_Path2_GainValue.Size = new System.Drawing.Size(65, 23);
3565
+            this.numericUpDown_Path2_GainValue.TabIndex = 183;
3566
+            this.numericUpDown_Path2_GainValue.Enter += new System.EventHandler(this.Activi_Change__SettingComplete);
3567
+            this.numericUpDown_Path2_GainValue.KeyDown += new System.Windows.Forms.KeyEventHandler(this.ATT_Enter);
3568
+            this.numericUpDown_Path2_GainValue.Leave += new System.EventHandler(this.Activi_Change__Setting);
3569
+            // 
3570
+            // numericUpDown_Path1_GainValue
3571
+            // 
3572
+            this.numericUpDown_Path1_GainValue.Location = new System.Drawing.Point(722, 743);
3573
+            this.numericUpDown_Path1_GainValue.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
3574
+            this.numericUpDown_Path1_GainValue.Minimum = new decimal(new int[] {
3575
+            100,
3576
+            0,
3577
+            0,
3578
+            -2147483648});
3579
+            this.numericUpDown_Path1_GainValue.Name = "numericUpDown_Path1_GainValue";
3580
+            this.numericUpDown_Path1_GainValue.Size = new System.Drawing.Size(65, 23);
3581
+            this.numericUpDown_Path1_GainValue.TabIndex = 184;
3582
+            this.numericUpDown_Path1_GainValue.Enter += new System.EventHandler(this.Activi_Change__SettingComplete);
3583
+            this.numericUpDown_Path1_GainValue.KeyDown += new System.Windows.Forms.KeyEventHandler(this.ATT_Enter);
3584
+            this.numericUpDown_Path1_GainValue.Leave += new System.EventHandler(this.Activi_Change__Setting);
3562 3585
             // 
3563 3586
             // JdasMbic
3564 3587
             // 
@@ -3613,6 +3636,8 @@
3613 3636
             this.panel1.PerformLayout();
3614 3637
             this.panel_Serial.ResumeLayout(false);
3615 3638
             this.panel_Serial.PerformLayout();
3639
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDown_Version1)).EndInit();
3640
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDown_Version2)).EndInit();
3616 3641
             ((System.ComponentModel.ISupportInitialize)(this.numericUpDown_Version3)).EndInit();
3617 3642
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox_R_TX)).EndInit();
3618 3643
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox_G_TX)).EndInit();
@@ -3713,8 +3738,10 @@
3713 3738
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox_TempHigh_Alarm_OFF)).EndInit();
3714 3739
             ((System.ComponentModel.ISupportInitialize)(this.numericUpDown1)).EndInit();
3715 3740
             ((System.ComponentModel.ISupportInitialize)(this.numericUpDown2)).EndInit();
3716
-            ((System.ComponentModel.ISupportInitialize)(this.numericUpDown_Version2)).EndInit();
3717
-            ((System.ComponentModel.ISupportInitialize)(this.numericUpDown_Version1)).EndInit();
3741
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDown_Path3_GainValue)).EndInit();
3742
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDown_Path4_GainValue)).EndInit();
3743
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDown_Path2_GainValue)).EndInit();
3744
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDown_Path1_GainValue)).EndInit();
3718 3745
             this.ResumeLayout(false);
3719 3746
 
3720 3747
         }
@@ -3975,15 +4002,10 @@
3975 4002
         private System.Windows.Forms.Label label8;
3976 4003
         private System.Windows.Forms.TextBox textBox_Bank1Name;
3977 4004
         private System.Windows.Forms.Label label6;
3978
-        private System.Windows.Forms.TextBox textBox_UL4_TableOffset;
3979
-        private System.Windows.Forms.TextBox textBox_UL2_TableOffset;
3980 4005
         private System.Windows.Forms.TextBox textBox_DL4_TableOffset;
3981
-        private System.Windows.Forms.TextBox textBox_UL3_TableOffset;
3982 4006
         private System.Windows.Forms.TextBox textBox_DL2_TableOffset;
3983
-        private System.Windows.Forms.TextBox textBox_UL1_TableOffset;
3984 4007
         private System.Windows.Forms.TextBox textBox_DL3_TableOffset;
3985 4008
         private System.Windows.Forms.TextBox textBox_DL1_TableOffset;
3986
-        private System.Windows.Forms.Label label_TableOffset;
3987 4009
         private System.Windows.Forms.Label label9;
3988 4010
         public System.Windows.Forms.Timer timer_JdasMbic;
3989 4011
         public System.Windows.Forms.NumericUpDown numericUpDown_Version3;
@@ -3991,6 +4013,10 @@
3991 4013
         private System.Windows.Forms.Button button_TempShutdown;
3992 4014
         public System.Windows.Forms.NumericUpDown numericUpDown_Version1;
3993 4015
         public System.Windows.Forms.NumericUpDown numericUpDown_Version2;
4016
+        public System.Windows.Forms.NumericUpDown numericUpDown_Path3_GainValue;
4017
+        public System.Windows.Forms.NumericUpDown numericUpDown_Path4_GainValue;
4018
+        public System.Windows.Forms.NumericUpDown numericUpDown_Path2_GainValue;
4019
+        public System.Windows.Forms.NumericUpDown numericUpDown_Path1_GainValue;
3994 4020
     }
3995 4021
 }
3996 4022
 

+ 86 - 68
Jdas_Mbic/Main.cs

@@ -576,7 +576,18 @@ namespace Jdas_Mbic
576 576
             byte tmp_H = 0;
577 577
             byte tmp_L = 0;
578 578
             UInt16 Length = TableGetMaxLength - 3;
579
-            Int16 UserData = Convert.ToInt16(numeric.Value * 10);
579
+            Int16 UserData = 0;
580
+            if (numeric.Name == "numericUpDown_Path1_GainValue"
581
+            || numeric.Name == "numericUpDown_Path2_GainValue"
582
+            || numeric.Name == "numericUpDown_Path3_GainValue"
583
+            || numeric.Name == "numericUpDown_Path4_GainValue")
584
+            {
585
+                UserData = Convert.ToInt16(numeric.Value);
586
+            }
587
+            else
588
+            {
589
+                UserData = Convert.ToInt16(numeric.Value * 10);
590
+            }
580 591
            
581 592
 
582 593
             temp_buf[(int)Bluecell_ProtIndex_p.Bluecell_Header] = BLUECELL_HEADER;
@@ -657,6 +668,26 @@ namespace Jdas_Mbic
657 668
                     temp_buf[(int)Bluecell_ProtIndex_p.Bluecell_Type]
658 669
                         = (byte)Bluecell_BootProtocol.DATATYPE.Bluecell_ATT_UL4_USER;
659 670
                     break;
671
+                case "numericUpDown_Path1_GainValue":
672
+                    temp_buf[(int)Bluecell_ProtIndex_p.Bluecell_Type]
673
+                        = (byte)Bluecell_BootProtocol.DATATYPE.Bluecell_Path1_GainValue;
674
+
675
+                    break;
676
+                case "numericUpDown_Path2_GainValue":
677
+                    temp_buf[(int)Bluecell_ProtIndex_p.Bluecell_Type]
678
+                        = (byte)Bluecell_BootProtocol.DATATYPE.Bluecell_Path2_GainValue;
679
+
680
+                    break;
681
+                case "numericUpDown_Path3_GainValue":
682
+                    temp_buf[(int)Bluecell_ProtIndex_p.Bluecell_Type]
683
+                        = (byte)Bluecell_BootProtocol.DATATYPE.Bluecell_Path3_GainValue;
684
+
685
+                    break;
686
+                case "numericUpDown_Path4_GainValue":
687
+                    temp_buf[(int)Bluecell_ProtIndex_p.Bluecell_Type]
688
+                        = (byte)Bluecell_BootProtocol.DATATYPE.Bluecell_Path4_GainValue;
689
+
690
+                    break;
660 691
             }
661 692
             UInt16 CRCRET = crc.CRC16_Generate(temp_buf, Length );
662 693
             temp_buf[(int)Bluecell_ProtIndex_p.Bluecell_data + 2] = Convert.ToByte((CRCRET & 0xFF00) >> 8);
@@ -675,10 +706,10 @@ namespace Jdas_Mbic
675 706
           bluecell_type,
676 707
           bluecell_length,
677 708
           bluecell_crcindex,
678
-          Selftest1,
679
-          Selftest2,
680
-          Selftest3,
681
-          Selftest4,
709
+          Path1_GainValue,
710
+          Path2_GainValue,
711
+          Path3_GainValue,
712
+          Path4_GainValue,
682 713
           ATT_DL1_PATH,
683 714
           ATT_DL2_PATH,
684 715
           ATT_DL3_PATH,
@@ -891,51 +922,29 @@ namespace Jdas_Mbic
891 922
             MBIC_ULO_ALC_Atten3_L,
892 923
             MBIC_ULO_ALC_Atten4_H,
893 924
             MBIC_ULO_ALC_Atten4_L,
894
-            MBIC_DLI_P1_Level_Table_Ref,
895
-            MBIC_DLI_P2_Level_Table_Ref,
896
-            MBIC_DLI_P3_Level_Table_Ref,
897
-            MBIC_DLI_P4_Level_Table_Ref,
898
-            MBIC_ULO_P1_Level_Table_Ref,
899
-            MBIC_ULO_P2_Level_Table_Ref,
900
-            MBIC_ULO_P3_Level_Table_Ref,
901
-            MBIC_ULO_P4_Level_Table_Ref,
902
-            MBIC_TEMP_DL_P1_Level_Table_Ref,
903
-            MBIC_TEMP_DL_P2_Level_Table_Ref,
904
-            MBIC_TEMP_DL_P3_Level_Table_Ref,
905
-            MBIC_TEMP_DL_P4_Level_Table_Ref,
906
-            MBIC_TEMP_UL_P1_Level_Table_Ref,
907
-            MBIC_TEMP_UL_P2_Level_Table_Ref,
908
-            MBIC_TEMP_UL_P3_Level_Table_Ref,
909
-            MBIC_TEMP_UL_P4_Level_Table_Ref,
910
-            MBIC_DLI_P1_Table_Length,
911
-            MBIC_DLI_P2_Table_Length,
912
-            MBIC_DLI_P3_Table_Length,
913
-            MBIC_DLI_P4_Table_Length,
914
-            MBIC_ULO_P1_Table_Length,
915
-            MBIC_ULO_P2_Table_Length,
916
-            MBIC_ULO_P3_Table_Length,
917
-            MBIC_ULO_P4_Table_Length,
918
-            MBIC_DLI_P1_Level_Table_Length,
919
-            MBIC_DLI_P2_Level_Table_Length,
920
-            MBIC_DLI_P3_Level_Table_Length,
921
-            MBIC_DLI_P4_Level_Table_Length,
922
-            MBIC_ULO_P1_Level_Table_Length,
923
-            MBIC_ULO_P2_Level_Table_Length,
924
-            MBIC_ULO_P3_Level_Table_Length,
925
-            MBIC_ULO_P4_Level_Table_Length,
926
-            MBIC_TEMP_DL_P1_Level_Table_Length,
927
-            MBIC_TEMP_DL_P2_Level_Table_Length,
928
-            MBIC_TEMP_DL_P3_Level_Table_Length,
929
-            MBIC_TEMP_DL_P4_Level_Table_Length,
930
-            MBIC_TEMP_UL_P1_Level_Table_Length,
931
-            MBIC_TEMP_UL_P2_Level_Table_Length,
932
-            MBIC_TEMP_UL_P3_Level_Table_Length,
933
-            MBIC_TEMP_UL_P4_Level_Table_Length,
934 925
             DL_Det_ALL_Offset,
935
-            UL_Det_Path_Offset1,
936
-            UL_Det_Path_Offset2,
937
-            Path_TempShutdown_Set,
938
-            UL_Det_Path_Offset4,
926
+            MBIC_Download_Auto_Restart_Set,
927
+            Path_TempSave_Bit,/*DL1 / DL 2 /DL3 /DL4 /UL1/UL2/UL3/UL4*/
928
+            Path_TempShutdown_Set,/*DL1 / DL 2 /DL3 /DL4 /UL1/UL2/UL3/UL4*/
929
+            SelfTest,
930
+            SelfTest_ATT_DL1_H,
931
+            SelfTest_ATT_DL1_L,
932
+            SelfTest_ATT_DL2_H,
933
+            SelfTest_ATT_DL2_L,
934
+            SelfTest_ATT_DL3_H,
935
+            SelfTest_ATT_DL3_L,
936
+            SelfTest_ATT_DL4_H,
937
+            SelfTest_ATT_DL4_L,
938
+            SelfTest_ATT_UL1_H,
939
+            SelfTest_ATT_UL1_L,
940
+            SelfTest_ATT_UL2_H,
941
+            SelfTest_ATT_UL2_L,
942
+            SelfTest_ATT_UL3_H,
943
+            SelfTest_ATT_UL3_L,
944
+            SelfTest_ATT_UL4_H,
945
+            SelfTest_ATT_UL4_L,
946
+            Reserve = SelfTest_ATT_UL4_L + 16,
947
+            /**/
939 948
             bluecell_crc_H,
940 949
             bluecell_crc_L,
941 950
             bluecell_etx,
@@ -1123,7 +1132,7 @@ namespace Jdas_Mbic
1123 1132
             {
1124 1133
                 this.Invoke(new StringSend(Button_Text_Set), button_TempShutdown, "ON");// = false;
1125 1134
             }
1126
-            if (buf[(int)BluecellReqIndex.Selftest1] == 0)
1135
+            if (buf[(int)BluecellReqIndex.SelfTest] == 0)
1127 1136
             {
1128 1137
                 this.Invoke(new StringSend(Button_Text_Set), button_SelfTest1, "OFF");// = false;
1129 1138
             }
@@ -1132,7 +1141,7 @@ namespace Jdas_Mbic
1132 1141
                 this.Invoke(new StringSend(Button_Text_Set), button_SelfTest1, "ON");// = false;
1133 1142
             }
1134 1143
 
1135
-            if (buf[(int)BluecellReqIndex.Selftest2] == 0)
1144
+            if (buf[(int)BluecellReqIndex.SelfTest] == 0)
1136 1145
             {
1137 1146
                 this.Invoke(new StringSend(Button_Text_Set), button_SelfTest2, "OFF");// = false;
1138 1147
             }
@@ -1142,7 +1151,7 @@ namespace Jdas_Mbic
1142 1151
 
1143 1152
             }
1144 1153
 
1145
-            if (buf[(int)BluecellReqIndex.Selftest3] == 0)
1154
+            if (buf[(int)BluecellReqIndex.SelfTest] == 0)
1146 1155
             {
1147 1156
                 this.Invoke(new StringSend(Button_Text_Set), button_SelfTest3, "OFF");// = false;
1148 1157
             }
@@ -1151,7 +1160,7 @@ namespace Jdas_Mbic
1151 1160
                 this.Invoke(new StringSend(Button_Text_Set), button_SelfTest3, "ON");// = false;
1152 1161
             }
1153 1162
 
1154
-            if (buf[(int)BluecellReqIndex.Selftest4] == 0)
1163
+            if (buf[(int)BluecellReqIndex.SelfTest] == 0)
1155 1164
             {
1156 1165
                 this.Invoke(new StringSend(Button_Text_Set), button_SelfTest4, "OFF");// = false;
1157 1166
             }
@@ -1745,9 +1754,18 @@ namespace Jdas_Mbic
1745 1754
                 this.Invoke(new StringSend(Numeric_Text_Set), numericUpDown_ATT_UL4, adcdata.ToString("N2"));
1746 1755
 
1747 1756
 
1748
-               
1757
+                AttData = (short)(buf[(int)BluecellReqIndex.Path1_GainValue]);
1758
+                this.Invoke(new StringSend(Numeric_Text_Set), numericUpDown_Path1_GainValue, AttData.ToString());
1759
+                AttData = (short)(buf[(int)BluecellReqIndex.Path2_GainValue]);
1760
+                this.Invoke(new StringSend(Numeric_Text_Set), numericUpDown_Path2_GainValue, AttData.ToString());
1761
+                AttData = (short)(buf[(int)BluecellReqIndex.Path3_GainValue]);
1762
+                this.Invoke(new StringSend(Numeric_Text_Set), numericUpDown_Path3_GainValue, AttData.ToString());
1763
+                AttData = (short)(buf[(int)BluecellReqIndex.Path4_GainValue]);
1764
+                this.Invoke(new StringSend(Numeric_Text_Set), numericUpDown_Path4_GainValue, AttData.ToString());
1765
+
1766
+
1767
+
1749 1768
 
1750
-               
1751 1769
                 //this.Invoke(new StringSend(Numeric_Text_Set), numericUpDown_ALC4_MAX, adcdata.ToString("N2"));
1752 1770
                 adcdata = 0;
1753 1771
                 AttData = (short)(((buf[(int)BluecellReqIndex.bluecell_User_DL1_H] << 8) & 0xFF00) | (buf[(int)BluecellReqIndex.bluecell_User_DL1_L] & 0x00FF));
@@ -1962,9 +1980,9 @@ namespace Jdas_Mbic
1962 1980
             adcdata *= Volt_Calc_val;
1963 1981
             this.Invoke(new StringSend(TextBox_Text_Set), textBox_DET_DL1, adcdata.ToString("N3"));
1964 1982
             dBmdata = 0;
1965
-           dBmdata = (short)((buf[(int)BluecellReqIndex.DLI_Level1_H] << 8) & 0xFF00);
1983
+            dBmdata = (short)((buf[(int)BluecellReqIndex.DLI_Level1_H] << 8) & 0xFF00);
1966 1984
             dBmdata += (short)(buf[(int)BluecellReqIndex.DLI_Level1_L] & 0x00FF);
1967
-            this.Invoke(new StringSend(TextBox_Text_Set), textBox_DET_DL1_dBm, dBmdata.ToString());
1985
+            this.Invoke(new StringSend(TextBox_Text_Set), textBox_DET_DL1_dBm, (dBmdata * 0.1).ToString());
1968 1986
             //this.Invoke(new StringSend(TextBox_Text_Set), textBox_DET_DL1_dBm, adcdata.ToString("N2"));
1969 1987
             adcdata = 0;
1970 1988
 
@@ -1975,7 +1993,7 @@ namespace Jdas_Mbic
1975 1993
             dBmdata = 0;
1976 1994
             dBmdata = (short)((buf[(int)BluecellReqIndex.DLI_Level2_H] << 8) & 0xFF00);
1977 1995
             dBmdata += (short)(buf[(int)BluecellReqIndex.DLI_Level2_L] & 0x00FF);
1978
-            this.Invoke(new StringSend(TextBox_Text_Set), textBox_DET_DL2_dBm, (dBmdata).ToString());
1996
+            this.Invoke(new StringSend(TextBox_Text_Set), textBox_DET_DL2_dBm, (dBmdata * 0.1).ToString());
1979 1997
             adcdata = 0;
1980 1998
 
1981 1999
             adcdata = ((buf[(int)BluecellReqIndex.DLI_P3_Level3_H] << 8) & 0xFF00);
@@ -1985,7 +2003,7 @@ namespace Jdas_Mbic
1985 2003
             dBmdata = 0;
1986 2004
             dBmdata = (short)((buf[(int)BluecellReqIndex.DLI_Level3_H] << 8) & 0xFF00);
1987 2005
             dBmdata += (short)(buf[(int)BluecellReqIndex.DLI_Level3_L] & 0x00FF);
1988
-            this.Invoke(new StringSend(TextBox_Text_Set), textBox_DET_DL3_dBm, (dBmdata).ToString());
2006
+            this.Invoke(new StringSend(TextBox_Text_Set), textBox_DET_DL3_dBm, (dBmdata * 0.1).ToString());
1989 2007
             adcdata = 0;
1990 2008
 
1991 2009
             adcdata = ((buf[(int)BluecellReqIndex.DLI_P4_Level4_H] << 8) & 0xFF00);
@@ -1995,7 +2013,7 @@ namespace Jdas_Mbic
1995 2013
             dBmdata = 0;
1996 2014
             dBmdata = (short)((buf[(int)BluecellReqIndex.DLI_Level4_H] << 8) & 0xFF00);
1997 2015
             dBmdata += (short)(buf[(int)BluecellReqIndex.DLI_Level4_L] & 0x00FF);
1998
-            this.Invoke(new StringSend(TextBox_Text_Set), textBox_DET_DL4_dBm, (dBmdata).ToString());
2016
+            this.Invoke(new StringSend(TextBox_Text_Set), textBox_DET_DL4_dBm, (dBmdata * 0.1).ToString());
1999 2017
             adcdata = 0;
2000 2018
 
2001 2019
 
@@ -2006,7 +2024,7 @@ namespace Jdas_Mbic
2006 2024
             dBmdata = 0;
2007 2025
             dBmdata = (short)((buf[(int)BluecellReqIndex.ULO_Level1_H] << 8) & 0xFF00);
2008 2026
             dBmdata += (short)(buf[(int)BluecellReqIndex.ULO_Level1_L] & 0x00FF);
2009
-            this.Invoke(new StringSend(TextBox_Text_Set), textBox_DET_UL1_dBm, (dBmdata).ToString());
2027
+            this.Invoke(new StringSend(TextBox_Text_Set), textBox_DET_UL1_dBm, (dBmdata * 0.1).ToString());
2010 2028
             adcdata = 0;
2011 2029
 
2012 2030
             adcdata = ((buf[(int)BluecellReqIndex.ULO_P2_Level2_H] << 8) & 0xFF00);
@@ -2016,7 +2034,7 @@ namespace Jdas_Mbic
2016 2034
             dBmdata = 0;
2017 2035
             dBmdata = (short)((buf[(int)BluecellReqIndex.ULO_Level2_H] << 8) & 0xFF00);
2018 2036
             dBmdata += (short)(buf[(int)BluecellReqIndex.ULO_Level2_L] & 0x00FF);
2019
-            this.Invoke(new StringSend(TextBox_Text_Set), textBox_DET_UL2_dBm, (dBmdata).ToString());
2037
+            this.Invoke(new StringSend(TextBox_Text_Set), textBox_DET_UL2_dBm, (dBmdata * 0.1).ToString());
2020 2038
             adcdata = 0;
2021 2039
 
2022 2040
             adcdata = ((buf[(int)BluecellReqIndex.ULO_P3_Level3_H] << 8) & 0xFF00);
@@ -2026,7 +2044,7 @@ namespace Jdas_Mbic
2026 2044
             dBmdata = 0;
2027 2045
             dBmdata = (short)((buf[(int)BluecellReqIndex.ULO_Level3_H] << 8) & 0xFF00);
2028 2046
             dBmdata += (short)(buf[(int)BluecellReqIndex.ULO_Level3_L] & 0x00FF);
2029
-            this.Invoke(new StringSend(TextBox_Text_Set), textBox_DET_UL3_dBm, (dBmdata).ToString());
2047
+            this.Invoke(new StringSend(TextBox_Text_Set), textBox_DET_UL3_dBm, (dBmdata * 0.1).ToString());
2030 2048
             adcdata = 0;
2031 2049
 
2032 2050
             adcdata = ((buf[(int)BluecellReqIndex.ULO_P4_Level4_H] << 8) & 0xFF00);
@@ -2036,7 +2054,7 @@ namespace Jdas_Mbic
2036 2054
             dBmdata = 0;
2037 2055
             dBmdata = (short)((buf[(int)BluecellReqIndex.ULO_Level4_H] << 8) & 0xFF00);
2038 2056
             dBmdata += (short)(buf[(int)BluecellReqIndex.ULO_Level4_L] & 0x00FF);
2039
-            this.Invoke(new StringSend(TextBox_Text_Set), textBox_DET_UL4_dBm, (dBmdata).ToString());
2057
+            this.Invoke(new StringSend(TextBox_Text_Set), textBox_DET_UL4_dBm, (dBmdata * 0.1).ToString());
2040 2058
             adcdata = 0;
2041 2059
 #if false
2042 2060
             adcdata += ((buf[(int)BluecellReqIndex.DET_TEMP_H] << 8) & 0xFF00);
@@ -2923,16 +2941,16 @@ namespace Jdas_Mbic
2923 2941
                     datatype = DATATYPE.ATT_UL4_PATH;
2924 2942
                     break;
2925 2943
                 case "button_SelfTest1":
2926
-                    datatype = DATATYPE.ATT_SelfTest1;
2944
+                    datatype = DATATYPE.ATT_SelfTest;
2927 2945
                     break;
2928 2946
                 case "button_SelfTest2":
2929
-                    datatype = DATATYPE.ATT_SelfTest2;
2947
+                    datatype = DATATYPE.ATT_SelfTest;
2930 2948
                     break;
2931 2949
                 case "button_SelfTest3":
2932
-                    datatype = DATATYPE.ATT_SelfTest3;
2950
+                    datatype = DATATYPE.ATT_SelfTest;
2933 2951
                     break;
2934 2952
                 case "button_SelfTest4":
2935
-                    datatype = DATATYPE.ATT_SelfTest4;
2953
+                    datatype = DATATYPE.ATT_SelfTest;
2936 2954
                     break;
2937 2955
                 case "button_DL_Shutdown":
2938 2956
                     datatype = DATATYPE.Bluecell_DLI_Shutdown_ON_OFF;

BIN
Jdas_Mbic/bin/Debug/Jdas_Mbic.exe


BIN
Jdas_Mbic/bin/Debug/Jdas_Mbic.pdb


BIN
Jdas_Mbic/obj/Debug/Jdas_Mbic.csproj.GenerateResource.cache


BIN
Jdas_Mbic/obj/Debug/Jdas_Mbic.exe


BIN
Jdas_Mbic/obj/Debug/Jdas_Mbic.pdb