浏览代码

Table Save 기능 추가
ADC Data DBM
Temperature
Dispaly 기능 추가

PYJ 4 年之前
父节点
当前提交
0d6b820765
共有 5 个文件被更改,包括 158 次插入141 次删除
  1. 4 2
      DataRequest/Func/Etc_Function.cs
  2. 1 1
      DataRequest/Func/Serial.cs
  3. 142 132
      DataRequest/SubMain.Designer.cs
  4. 4 1
      DataRequest/SubMain.cs
  5. 7 5
      DataRequest/Table.cs

+ 4 - 2
DataRequest/Func/Etc_Function.cs

@@ -75,7 +75,8 @@ namespace DataRequest.Func
75
         }
75
         }
76
         public enum NessLab_Protocol_CMD_Index
76
         public enum NessLab_Protocol_CMD_Index
77
         {
77
         {
78
-            NessLab_STATUS_RES = 101,
78
+            NessLab_STATUS_REQ = 101,
79
+            NessLab_STATUS_RES = 102,
79
             NessLab_Table_Req = 201,
80
             NessLab_Table_Req = 201,
80
             NessLab_Table_Res ,
81
             NessLab_Table_Res ,
81
             NessLab_TableSet_Req ,
82
             NessLab_TableSet_Req ,
@@ -129,7 +130,8 @@ namespace DataRequest.Func
129
 
130
 
130
             if (data != null)
131
             if (data != null)
131
             {
132
             {
132
-                for(int i = 0; i < data.Length; i++)
133
+                //tmpdata[7] = (byte)(((UInt16)((double)data[0] * 1000) & 0xFF00) >> 8);
134
+                for (int i = 0; i < data.Length; i++)
133
                 {
135
                 {
134
                     tmpdata[(i * 2) + 7]     = (byte)(((UInt16)((double)data[i] * 1000) & 0xFF00) >> 8);
136
                     tmpdata[(i * 2) + 7]     = (byte)(((UInt16)((double)data[i] * 1000) & 0xFF00) >> 8);
135
                     tmpdata[(i * 2) + 7 + 1] = (byte)(((UInt16)((double)data[i] * 1000) & 0x00FF));
137
                     tmpdata[(i * 2) + 7 + 1] = (byte)(((UInt16)((double)data[i] * 1000) & 0x00FF));

+ 1 - 1
DataRequest/Func/Serial.cs

@@ -117,7 +117,7 @@ namespace DataRequest.Func
117
             switch (data[(int)Etc_Function.NessLab_Protocol_Index.NessLab_MsgID0])
117
             switch (data[(int)Etc_Function.NessLab_Protocol_Index.NessLab_MsgID0])
118
             {
118
             {
119
                 case (int)Etc_Function.NessLab_Protocol_CMD_Index.NessLab_STATUS_RES:
119
                 case (int)Etc_Function.NessLab_Protocol_CMD_Index.NessLab_STATUS_RES:
120
-                    ((Main)main_form).subMain.NessLab_Adc_Value_Set(data[7] << 8 | data[8]);
120
+                    ((Main)main_form).subMain.NessLab_Adc_Value_Set(data[7] << 8 | data[8],data[9],data[16]);
121
                     break;
121
                     break;
122
                 case (int)Etc_Function.NessLab_Protocol_CMD_Index.NessLab_TableSet_Res:
122
                 case (int)Etc_Function.NessLab_Protocol_CMD_Index.NessLab_TableSet_Res:
123
                     ((Main)main_form).table.Table_Setting(data);
123
                     ((Main)main_form).table.Table_Setting(data);

+ 142 - 132
DataRequest/SubMain.Designer.cs

@@ -29,42 +29,44 @@
29
         private void InitializeComponent()
29
         private void InitializeComponent()
30
         {
30
         {
31
             this.panel1 = new System.Windows.Forms.Panel();
31
             this.panel1 = new System.Windows.Forms.Panel();
32
-            this.pictureBox3 = new System.Windows.Forms.PictureBox();
32
+            this.panel2 = new System.Windows.Forms.Panel();
33
+            this.pictureBox12 = new System.Windows.Forms.PictureBox();
34
+            this.pictureBox11 = new System.Windows.Forms.PictureBox();
35
+            this.pictureBox9 = new System.Windows.Forms.PictureBox();
36
+            this.pictureBox10 = new System.Windows.Forms.PictureBox();
33
             this.pictureBox5 = new System.Windows.Forms.PictureBox();
37
             this.pictureBox5 = new System.Windows.Forms.PictureBox();
34
-            this.pictureBox1 = new System.Windows.Forms.PictureBox();
35
-            this.pictureBox2 = new System.Windows.Forms.PictureBox();
38
+            this.pictureBox7 = new System.Windows.Forms.PictureBox();
39
+            this.pictureBox3 = new System.Windows.Forms.PictureBox();
40
+            this.pictureBox6 = new System.Windows.Forms.PictureBox();
36
             this.pictureBox8 = new System.Windows.Forms.PictureBox();
41
             this.pictureBox8 = new System.Windows.Forms.PictureBox();
37
-            this.pictureBox9 = new System.Windows.Forms.PictureBox();
38
-            this.textBox_Adc_Value = new System.Windows.Forms.TextBox();
39
-            this.textBox2 = new System.Windows.Forms.TextBox();
40
-            this.panel2 = new System.Windows.Forms.Panel();
41
             this.pictureBox4 = new System.Windows.Forms.PictureBox();
42
             this.pictureBox4 = new System.Windows.Forms.PictureBox();
42
-            this.pictureBox6 = new System.Windows.Forms.PictureBox();
43
-            this.pictureBox7 = new System.Windows.Forms.PictureBox();
44
-            this.pictureBox10 = new System.Windows.Forms.PictureBox();
45
-            this.pictureBox11 = new System.Windows.Forms.PictureBox();
46
-            this.pictureBox12 = new System.Windows.Forms.PictureBox();
43
+            this.pictureBox2 = new System.Windows.Forms.PictureBox();
44
+            this.pictureBox1 = new System.Windows.Forms.PictureBox();
45
+            this.textBox_Dbm = new System.Windows.Forms.TextBox();
46
+            this.textBox_Adc_Value = new System.Windows.Forms.TextBox();
47
+            this.textBox_Temperature = new System.Windows.Forms.TextBox();
47
             this.panel1.SuspendLayout();
48
             this.panel1.SuspendLayout();
48
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBox3)).BeginInit();
49
+            this.panel2.SuspendLayout();
50
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBox12)).BeginInit();
51
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBox11)).BeginInit();
52
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBox9)).BeginInit();
53
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBox10)).BeginInit();
49
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox5)).BeginInit();
54
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox5)).BeginInit();
50
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
51
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit();
55
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBox7)).BeginInit();
56
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBox3)).BeginInit();
57
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBox6)).BeginInit();
52
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox8)).BeginInit();
58
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox8)).BeginInit();
53
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBox9)).BeginInit();
54
-            this.panel2.SuspendLayout();
55
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox4)).BeginInit();
59
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox4)).BeginInit();
56
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBox6)).BeginInit();
57
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBox7)).BeginInit();
58
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBox10)).BeginInit();
59
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBox11)).BeginInit();
60
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBox12)).BeginInit();
60
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit();
61
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
61
             this.SuspendLayout();
62
             this.SuspendLayout();
62
             // 
63
             // 
63
             // panel1
64
             // panel1
64
             // 
65
             // 
65
             this.panel1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(32)))), ((int)(((byte)(30)))), ((int)(((byte)(45)))));
66
             this.panel1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(32)))), ((int)(((byte)(30)))), ((int)(((byte)(45)))));
67
+            this.panel1.Controls.Add(this.textBox_Temperature);
66
             this.panel1.Controls.Add(this.panel2);
68
             this.panel1.Controls.Add(this.panel2);
67
-            this.panel1.Controls.Add(this.textBox2);
69
+            this.panel1.Controls.Add(this.textBox_Dbm);
68
             this.panel1.Controls.Add(this.textBox_Adc_Value);
70
             this.panel1.Controls.Add(this.textBox_Adc_Value);
69
             this.panel1.Dock = System.Windows.Forms.DockStyle.Fill;
71
             this.panel1.Dock = System.Windows.Forms.DockStyle.Fill;
70
             this.panel1.Location = new System.Drawing.Point(0, 0);
72
             this.panel1.Location = new System.Drawing.Point(0, 0);
@@ -72,14 +74,60 @@
72
             this.panel1.Size = new System.Drawing.Size(768, 461);
74
             this.panel1.Size = new System.Drawing.Size(768, 461);
73
             this.panel1.TabIndex = 0;
75
             this.panel1.TabIndex = 0;
74
             // 
76
             // 
75
-            // pictureBox3
77
+            // panel2
76
             // 
78
             // 
77
-            this.pictureBox3.Image = global::DataRequest.Properties.Resources.green_s;
78
-            this.pictureBox3.Location = new System.Drawing.Point(69, 38);
79
-            this.pictureBox3.Name = "pictureBox3";
80
-            this.pictureBox3.Size = new System.Drawing.Size(25, 20);
81
-            this.pictureBox3.TabIndex = 16;
82
-            this.pictureBox3.TabStop = false;
79
+            this.panel2.Controls.Add(this.pictureBox12);
80
+            this.panel2.Controls.Add(this.pictureBox11);
81
+            this.panel2.Controls.Add(this.pictureBox9);
82
+            this.panel2.Controls.Add(this.pictureBox10);
83
+            this.panel2.Controls.Add(this.pictureBox5);
84
+            this.panel2.Controls.Add(this.pictureBox7);
85
+            this.panel2.Controls.Add(this.pictureBox3);
86
+            this.panel2.Controls.Add(this.pictureBox6);
87
+            this.panel2.Controls.Add(this.pictureBox8);
88
+            this.panel2.Controls.Add(this.pictureBox4);
89
+            this.panel2.Controls.Add(this.pictureBox2);
90
+            this.panel2.Controls.Add(this.pictureBox1);
91
+            this.panel2.Location = new System.Drawing.Point(419, 129);
92
+            this.panel2.Name = "panel2";
93
+            this.panel2.Size = new System.Drawing.Size(134, 181);
94
+            this.panel2.TabIndex = 27;
95
+            // 
96
+            // pictureBox12
97
+            // 
98
+            this.pictureBox12.Image = global::DataRequest.Properties.Resources.red_s;
99
+            this.pictureBox12.Location = new System.Drawing.Point(38, 90);
100
+            this.pictureBox12.Name = "pictureBox12";
101
+            this.pictureBox12.Size = new System.Drawing.Size(25, 20);
102
+            this.pictureBox12.TabIndex = 23;
103
+            this.pictureBox12.TabStop = false;
104
+            // 
105
+            // pictureBox11
106
+            // 
107
+            this.pictureBox11.Image = global::DataRequest.Properties.Resources.red_s;
108
+            this.pictureBox11.Location = new System.Drawing.Point(38, 116);
109
+            this.pictureBox11.Name = "pictureBox11";
110
+            this.pictureBox11.Size = new System.Drawing.Size(25, 20);
111
+            this.pictureBox11.TabIndex = 15;
112
+            this.pictureBox11.TabStop = false;
113
+            // 
114
+            // pictureBox9
115
+            // 
116
+            this.pictureBox9.Image = global::DataRequest.Properties.Resources.red_s;
117
+            this.pictureBox9.Location = new System.Drawing.Point(38, 12);
118
+            this.pictureBox9.Name = "pictureBox9";
119
+            this.pictureBox9.Size = new System.Drawing.Size(25, 20);
120
+            this.pictureBox9.TabIndex = 23;
121
+            this.pictureBox9.TabStop = false;
122
+            // 
123
+            // pictureBox10
124
+            // 
125
+            this.pictureBox10.Image = global::DataRequest.Properties.Resources.green_s;
126
+            this.pictureBox10.Location = new System.Drawing.Point(69, 116);
127
+            this.pictureBox10.Name = "pictureBox10";
128
+            this.pictureBox10.Size = new System.Drawing.Size(25, 20);
129
+            this.pictureBox10.TabIndex = 16;
130
+            this.pictureBox10.TabStop = false;
83
             // 
131
             // 
84
             // pictureBox5
132
             // pictureBox5
85
             // 
133
             // 
@@ -90,23 +138,32 @@
90
             this.pictureBox5.TabIndex = 15;
138
             this.pictureBox5.TabIndex = 15;
91
             this.pictureBox5.TabStop = false;
139
             this.pictureBox5.TabStop = false;
92
             // 
140
             // 
93
-            // pictureBox1
141
+            // pictureBox7
94
             // 
142
             // 
95
-            this.pictureBox1.Image = global::DataRequest.Properties.Resources.green_s;
96
-            this.pictureBox1.Location = new System.Drawing.Point(69, 64);
97
-            this.pictureBox1.Name = "pictureBox1";
98
-            this.pictureBox1.Size = new System.Drawing.Size(25, 20);
99
-            this.pictureBox1.TabIndex = 20;
100
-            this.pictureBox1.TabStop = false;
143
+            this.pictureBox7.Image = global::DataRequest.Properties.Resources.green_s;
144
+            this.pictureBox7.Location = new System.Drawing.Point(69, 90);
145
+            this.pictureBox7.Name = "pictureBox7";
146
+            this.pictureBox7.Size = new System.Drawing.Size(25, 20);
147
+            this.pictureBox7.TabIndex = 24;
148
+            this.pictureBox7.TabStop = false;
101
             // 
149
             // 
102
-            // pictureBox2
150
+            // pictureBox3
103
             // 
151
             // 
104
-            this.pictureBox2.Image = global::DataRequest.Properties.Resources.red_s;
105
-            this.pictureBox2.Location = new System.Drawing.Point(38, 64);
106
-            this.pictureBox2.Name = "pictureBox2";
107
-            this.pictureBox2.Size = new System.Drawing.Size(25, 20);
108
-            this.pictureBox2.TabIndex = 19;
109
-            this.pictureBox2.TabStop = false;
152
+            this.pictureBox3.Image = global::DataRequest.Properties.Resources.green_s;
153
+            this.pictureBox3.Location = new System.Drawing.Point(69, 38);
154
+            this.pictureBox3.Name = "pictureBox3";
155
+            this.pictureBox3.Size = new System.Drawing.Size(25, 20);
156
+            this.pictureBox3.TabIndex = 16;
157
+            this.pictureBox3.TabStop = false;
158
+            // 
159
+            // pictureBox6
160
+            // 
161
+            this.pictureBox6.Image = global::DataRequest.Properties.Resources.red_s;
162
+            this.pictureBox6.Location = new System.Drawing.Point(38, 142);
163
+            this.pictureBox6.Name = "pictureBox6";
164
+            this.pictureBox6.Size = new System.Drawing.Size(25, 20);
165
+            this.pictureBox6.TabIndex = 19;
166
+            this.pictureBox6.TabStop = false;
110
             // 
167
             // 
111
             // pictureBox8
168
             // pictureBox8
112
             // 
169
             // 
@@ -117,48 +174,6 @@
117
             this.pictureBox8.TabIndex = 24;
174
             this.pictureBox8.TabIndex = 24;
118
             this.pictureBox8.TabStop = false;
175
             this.pictureBox8.TabStop = false;
119
             // 
176
             // 
120
-            // pictureBox9
121
-            // 
122
-            this.pictureBox9.Image = global::DataRequest.Properties.Resources.red_s;
123
-            this.pictureBox9.Location = new System.Drawing.Point(38, 12);
124
-            this.pictureBox9.Name = "pictureBox9";
125
-            this.pictureBox9.Size = new System.Drawing.Size(25, 20);
126
-            this.pictureBox9.TabIndex = 23;
127
-            this.pictureBox9.TabStop = false;
128
-            // 
129
-            // textBox_Adc_Value
130
-            // 
131
-            this.textBox_Adc_Value.Location = new System.Drawing.Point(138, 141);
132
-            this.textBox_Adc_Value.Name = "textBox_Adc_Value";
133
-            this.textBox_Adc_Value.Size = new System.Drawing.Size(100, 21);
134
-            this.textBox_Adc_Value.TabIndex = 25;
135
-            // 
136
-            // textBox2
137
-            // 
138
-            this.textBox2.Location = new System.Drawing.Point(244, 141);
139
-            this.textBox2.Name = "textBox2";
140
-            this.textBox2.Size = new System.Drawing.Size(100, 21);
141
-            this.textBox2.TabIndex = 26;
142
-            // 
143
-            // panel2
144
-            // 
145
-            this.panel2.Controls.Add(this.pictureBox12);
146
-            this.panel2.Controls.Add(this.pictureBox11);
147
-            this.panel2.Controls.Add(this.pictureBox9);
148
-            this.panel2.Controls.Add(this.pictureBox10);
149
-            this.panel2.Controls.Add(this.pictureBox5);
150
-            this.panel2.Controls.Add(this.pictureBox7);
151
-            this.panel2.Controls.Add(this.pictureBox3);
152
-            this.panel2.Controls.Add(this.pictureBox6);
153
-            this.panel2.Controls.Add(this.pictureBox8);
154
-            this.panel2.Controls.Add(this.pictureBox4);
155
-            this.panel2.Controls.Add(this.pictureBox2);
156
-            this.panel2.Controls.Add(this.pictureBox1);
157
-            this.panel2.Location = new System.Drawing.Point(419, 129);
158
-            this.panel2.Name = "panel2";
159
-            this.panel2.Size = new System.Drawing.Size(134, 181);
160
-            this.panel2.TabIndex = 27;
161
-            // 
162
             // pictureBox4
177
             // pictureBox4
163
             // 
178
             // 
164
             this.pictureBox4.Image = global::DataRequest.Properties.Resources.green_s;
179
             this.pictureBox4.Image = global::DataRequest.Properties.Resources.green_s;
@@ -168,50 +183,44 @@
168
             this.pictureBox4.TabIndex = 20;
183
             this.pictureBox4.TabIndex = 20;
169
             this.pictureBox4.TabStop = false;
184
             this.pictureBox4.TabStop = false;
170
             // 
185
             // 
171
-            // pictureBox6
186
+            // pictureBox2
172
             // 
187
             // 
173
-            this.pictureBox6.Image = global::DataRequest.Properties.Resources.red_s;
174
-            this.pictureBox6.Location = new System.Drawing.Point(38, 142);
175
-            this.pictureBox6.Name = "pictureBox6";
176
-            this.pictureBox6.Size = new System.Drawing.Size(25, 20);
177
-            this.pictureBox6.TabIndex = 19;
178
-            this.pictureBox6.TabStop = false;
188
+            this.pictureBox2.Image = global::DataRequest.Properties.Resources.red_s;
189
+            this.pictureBox2.Location = new System.Drawing.Point(38, 64);
190
+            this.pictureBox2.Name = "pictureBox2";
191
+            this.pictureBox2.Size = new System.Drawing.Size(25, 20);
192
+            this.pictureBox2.TabIndex = 19;
193
+            this.pictureBox2.TabStop = false;
179
             // 
194
             // 
180
-            // pictureBox7
195
+            // pictureBox1
181
             // 
196
             // 
182
-            this.pictureBox7.Image = global::DataRequest.Properties.Resources.green_s;
183
-            this.pictureBox7.Location = new System.Drawing.Point(69, 90);
184
-            this.pictureBox7.Name = "pictureBox7";
185
-            this.pictureBox7.Size = new System.Drawing.Size(25, 20);
186
-            this.pictureBox7.TabIndex = 24;
187
-            this.pictureBox7.TabStop = false;
197
+            this.pictureBox1.Image = global::DataRequest.Properties.Resources.green_s;
198
+            this.pictureBox1.Location = new System.Drawing.Point(69, 64);
199
+            this.pictureBox1.Name = "pictureBox1";
200
+            this.pictureBox1.Size = new System.Drawing.Size(25, 20);
201
+            this.pictureBox1.TabIndex = 20;
202
+            this.pictureBox1.TabStop = false;
188
             // 
203
             // 
189
-            // pictureBox10
204
+            // textBox_Dbm
190
             // 
205
             // 
191
-            this.pictureBox10.Image = global::DataRequest.Properties.Resources.green_s;
192
-            this.pictureBox10.Location = new System.Drawing.Point(69, 116);
193
-            this.pictureBox10.Name = "pictureBox10";
194
-            this.pictureBox10.Size = new System.Drawing.Size(25, 20);
195
-            this.pictureBox10.TabIndex = 16;
196
-            this.pictureBox10.TabStop = false;
206
+            this.textBox_Dbm.Location = new System.Drawing.Point(244, 141);
207
+            this.textBox_Dbm.Name = "textBox_Dbm";
208
+            this.textBox_Dbm.Size = new System.Drawing.Size(100, 21);
209
+            this.textBox_Dbm.TabIndex = 26;
197
             // 
210
             // 
198
-            // pictureBox11
211
+            // textBox_Adc_Value
199
             // 
212
             // 
200
-            this.pictureBox11.Image = global::DataRequest.Properties.Resources.red_s;
201
-            this.pictureBox11.Location = new System.Drawing.Point(38, 116);
202
-            this.pictureBox11.Name = "pictureBox11";
203
-            this.pictureBox11.Size = new System.Drawing.Size(25, 20);
204
-            this.pictureBox11.TabIndex = 15;
205
-            this.pictureBox11.TabStop = false;
213
+            this.textBox_Adc_Value.Location = new System.Drawing.Point(138, 141);
214
+            this.textBox_Adc_Value.Name = "textBox_Adc_Value";
215
+            this.textBox_Adc_Value.Size = new System.Drawing.Size(100, 21);
216
+            this.textBox_Adc_Value.TabIndex = 25;
206
             // 
217
             // 
207
-            // pictureBox12
218
+            // textBox_Temperature
208
             // 
219
             // 
209
-            this.pictureBox12.Image = global::DataRequest.Properties.Resources.red_s;
210
-            this.pictureBox12.Location = new System.Drawing.Point(38, 90);
211
-            this.pictureBox12.Name = "pictureBox12";
212
-            this.pictureBox12.Size = new System.Drawing.Size(25, 20);
213
-            this.pictureBox12.TabIndex = 23;
214
-            this.pictureBox12.TabStop = false;
220
+            this.textBox_Temperature.Location = new System.Drawing.Point(244, 168);
221
+            this.textBox_Temperature.Name = "textBox_Temperature";
222
+            this.textBox_Temperature.Size = new System.Drawing.Size(100, 21);
223
+            this.textBox_Temperature.TabIndex = 28;
215
             // 
224
             // 
216
             // SubMain
225
             // SubMain
217
             // 
226
             // 
@@ -224,19 +233,19 @@
224
             this.Text = "SubMain";
233
             this.Text = "SubMain";
225
             this.panel1.ResumeLayout(false);
234
             this.panel1.ResumeLayout(false);
226
             this.panel1.PerformLayout();
235
             this.panel1.PerformLayout();
227
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBox3)).EndInit();
236
+            this.panel2.ResumeLayout(false);
237
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBox12)).EndInit();
238
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBox11)).EndInit();
239
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBox9)).EndInit();
240
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBox10)).EndInit();
228
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox5)).EndInit();
241
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox5)).EndInit();
229
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
230
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).EndInit();
242
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBox7)).EndInit();
243
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBox3)).EndInit();
244
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBox6)).EndInit();
231
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox8)).EndInit();
245
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox8)).EndInit();
232
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBox9)).EndInit();
233
-            this.panel2.ResumeLayout(false);
234
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox4)).EndInit();
246
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox4)).EndInit();
235
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBox6)).EndInit();
236
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBox7)).EndInit();
237
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBox10)).EndInit();
238
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBox11)).EndInit();
239
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBox12)).EndInit();
247
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).EndInit();
248
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
240
             this.ResumeLayout(false);
249
             this.ResumeLayout(false);
241
 
250
 
242
         }
251
         }
@@ -250,7 +259,7 @@
250
         private System.Windows.Forms.PictureBox pictureBox2;
259
         private System.Windows.Forms.PictureBox pictureBox2;
251
         private System.Windows.Forms.PictureBox pictureBox3;
260
         private System.Windows.Forms.PictureBox pictureBox3;
252
         private System.Windows.Forms.PictureBox pictureBox5;
261
         private System.Windows.Forms.PictureBox pictureBox5;
253
-        private System.Windows.Forms.TextBox textBox2;
262
+        private System.Windows.Forms.TextBox textBox_Dbm;
254
         private System.Windows.Forms.TextBox textBox_Adc_Value;
263
         private System.Windows.Forms.TextBox textBox_Adc_Value;
255
         private System.Windows.Forms.Panel panel2;
264
         private System.Windows.Forms.Panel panel2;
256
         private System.Windows.Forms.PictureBox pictureBox12;
265
         private System.Windows.Forms.PictureBox pictureBox12;
@@ -259,5 +268,6 @@
259
         private System.Windows.Forms.PictureBox pictureBox7;
268
         private System.Windows.Forms.PictureBox pictureBox7;
260
         private System.Windows.Forms.PictureBox pictureBox6;
269
         private System.Windows.Forms.PictureBox pictureBox6;
261
         private System.Windows.Forms.PictureBox pictureBox4;
270
         private System.Windows.Forms.PictureBox pictureBox4;
271
+        private System.Windows.Forms.TextBox textBox_Temperature;
262
     }
272
     }
263
 }
273
 }

+ 4 - 1
DataRequest/SubMain.cs

@@ -22,11 +22,14 @@ namespace DataRequest
22
             TextBox Temp_label = (TextBox)label;
22
             TextBox Temp_label = (TextBox)label;
23
             Temp_label.Text = str;
23
             Temp_label.Text = str;
24
         }
24
         }
25
-        public void NessLab_Adc_Value_Set(object data)
25
+        public void NessLab_Adc_Value_Set(object data,object data2,object data3)
26
         {
26
         {
27
             double adc_value = Convert.ToDouble(data);
27
             double adc_value = Convert.ToDouble(data);
28
             adc_value *= 0.001;
28
             adc_value *= 0.001;
29
             this.Invoke(new StringSend(TextBox_Text_Set), textBox_Adc_Value, adc_value.ToString());
29
             this.Invoke(new StringSend(TextBox_Text_Set), textBox_Adc_Value, adc_value.ToString());
30
+            this.Invoke(new StringSend(TextBox_Text_Set), textBox_Dbm, data2.ToString());
31
+            this.Invoke(new StringSend(TextBox_Text_Set), textBox_Temperature, data3.ToString());
32
+            
30
         }
33
         }
31
     }
34
     }
32
 }
35
 }

+ 7 - 5
DataRequest/Table.cs

@@ -241,14 +241,16 @@ namespace DataRequest
241
         }
241
         }
242
         private void GridView_array(ref double[] data)
242
         private void GridView_array(ref double[] data)
243
         {
243
         {
244
-            for (int i = 0; i < dataGridView_TableSetting.RowCount; i++)
244
+            int i = 0;
245
+            data[i] = dataGridView_TableSetting.RowCount;
246
+            for (i = 0; i < dataGridView_TableSetting.RowCount; i++)
245
             {
247
             {
246
-                data[i] = Convert.ToDouble(dataGridView_TableSetting[1, i].Value);
248
+                data[i + 1] = Convert.ToDouble(dataGridView_TableSetting[1, i].Value);
247
             }
249
             }
248
         }
250
         }
249
         private void button_Dev_Save_Click(object sender, EventArgs e)
251
         private void button_Dev_Save_Click(object sender, EventArgs e)
250
         {
252
         {
251
-            double[] temp_array = new double[dataGridView_TableSetting.RowCount];
253
+            double[] temp_array = new double[dataGridView_TableSetting.RowCount + 2];
252
             byte[] ret_array = new byte[temp_array.Length * 2 + 10];
254
             byte[] ret_array = new byte[temp_array.Length * 2 + 10];
253
             Etc_Function etc_Function = new Etc_Function();
255
             Etc_Function etc_Function = new Etc_Function();
254
             GridView_array(ref temp_array);
256
             GridView_array(ref temp_array);
@@ -260,7 +262,7 @@ namespace DataRequest
260
 
262
 
261
         private void button_Dev_Load_Click(object sender, EventArgs e)
263
         private void button_Dev_Load_Click(object sender, EventArgs e)
262
         {
264
         {
263
-            double[] temp_array = new double[dataGridView_TableSetting.RowCount];
265
+            double[] temp_array = new double[dataGridView_TableSetting.RowCount + 1];
264
             byte[] ret_array = new byte[temp_array.Length * 2 + 10];
266
             byte[] ret_array = new byte[temp_array.Length * 2 + 10];
265
 
267
 
266
             Etc_Function etc_Function = new Etc_Function();
268
             Etc_Function etc_Function = new Etc_Function();
@@ -323,7 +325,7 @@ namespace DataRequest
323
             //dataGridView_TableSetting.RowCount = data[(int)NessLab_Index.NessLab_DataLength];
325
             //dataGridView_TableSetting.RowCount = data[(int)NessLab_Index.NessLab_DataLength];
324
             double ret = 0;
326
             double ret = 0;
325
 
327
 
326
-            for (int i = 0; i < data[(int)NessLab_Index.NessLab_DataLength] / 2; i++)
328
+            for (int i = 1; i < data[(int)NessLab_Index.NessLab_DataLength] / 2 + 1; i++)
327
             {
329
             {
328
                 ret = (double)((data[(int)((i * 2) + (NessLab_Index.NessLab_DataLength + 1))] << 8) | data[(int)((i * 2) + NessLab_Index.NessLab_DataLength + 2)]) / 1000;
330
                 ret = (double)((data[(int)((i * 2) + (NessLab_Index.NessLab_DataLength + 1))] << 8) | data[(int)((i * 2) + NessLab_Index.NessLab_DataLength + 2)]) / 1000;
329
                 dataGridView_TableSetting[1, i].Value = ret;
331
                 dataGridView_TableSetting[1, i].Value = ret;