Browse Source

불필요한 Data 정상 int데이터로 변경 Tx_Buffers 추가 /

june9152 5 years ago
parent
commit
8e3217678f

+ 23 - 11
app/src/main/java/com/example/repeater/MainActivity.java

@@ -22,6 +22,17 @@ public class MainActivity extends AppCompatActivity implements Runnable,OnClickL
22
     private ListView listview_rf;
22
     private ListView listview_rf;
23
     private ListView listview_info_set;
23
     private ListView listview_info_set;
24
     private ListView listview_rf_set;
24
     private ListView listview_rf_set;
25
+
26
+    public byte[] getTx_buffers() {
27
+        return Tx_buffers;
28
+    }
29
+
30
+    public void setTx_buffers(byte[] tx_buffers) {
31
+        Tx_buffers = tx_buffers;
32
+    }
33
+
34
+    public byte[] Tx_buffers = new byte[31];// = data.getBytes();
35
+
25
     /*** WIFI Start***/
36
     /*** WIFI Start***/
26
     BufferedReader in;      //서버로부터 온 데이터를 읽는다.
37
     BufferedReader in;      //서버로부터 온 데이터를 읽는다.
27
     PrintWriter out;        //서버에 데이터를 전송한다.
38
     PrintWriter out;        //서버에 데이터를 전송한다.
@@ -114,17 +125,17 @@ public class MainActivity extends AppCompatActivity implements Runnable,OnClickL
114
         adapter_infor.addItem("firm info.", "0.1Ver", "", "READ");
125
         adapter_infor.addItem("firm info.", "0.1Ver", "", "READ");
115
         adapter_infor.addItem("FPGA Ver.", "0.2Ver", "", "READ");
126
         adapter_infor.addItem("FPGA Ver.", "0.2Ver", "", "READ");
116
         adapter_infor.addItem("F/W Ver.", "0.3Ver", "", "READ");
127
         adapter_infor.addItem("F/W Ver.", "0.3Ver", "", "READ");
117
-        adapter_infor.addItem("Config No.", "0.4Ver", "", "READ");
118
-        adapter_infor.addItem("Sub Frame No.", "0.5Ver", "", "READ");
119
-        adapter_infor.addItem("CH1 TTG", "0.6Ver", "", "READ");
120
-        adapter_infor.addItem("CH1 RTG", "0.7Ver", "", "READ");
121
-        adapter_infor.addItem("CH2 TTG", "0.8Ver", "", "READ");
122
-        adapter_infor.addItem("CH2 RTG", "0.9Ver", "", "READ");
123
-        adapter_infor.addItem("CH1 Polarity", "1.1Ver", "", "READ");
124
-        adapter_infor.addItem("CH1 Default", "1.2Ver", "", "READ");
125
-        adapter_infor.addItem("CH2 Polarity", "1.1Ver", "", "READ");
126
-        adapter_infor.addItem("CH2 Default", "1.2Ver", "", "READ");
127
-        adapter_infor.addItem("Auto Config", "1.3Ver", "", "READ");
128
+        adapter_infor.addItem("Config No.", "0", "", "READ");
129
+        adapter_infor.addItem("Sub Frame No.", "1", "", "READ");
130
+        adapter_infor.addItem("CH1 TTG", "2", "", "READ");
131
+        adapter_infor.addItem("CH1 RTG", "3", "", "READ");
132
+        adapter_infor.addItem("CH2 TTG", "4", "", "READ");
133
+        adapter_infor.addItem("CH2 RTG", "5", "", "READ");
134
+        adapter_infor.addItem("CH1 Polarity", "6", "", "READ");
135
+        adapter_infor.addItem("CH1 Default", "7", "", "READ");
136
+        adapter_infor.addItem("CH2 Polarity", "8", "", "READ");
137
+        adapter_infor.addItem("CH2 Default", "9", "", "READ");
138
+        adapter_infor.addItem("Auto Config", "10", "", "READ");
128
 
139
 
129
         listview = (ListView) findViewById(R.id.listview_info_set);
140
         listview = (ListView) findViewById(R.id.listview_info_set);
130
         listview.setAdapter(adapter_info_set);
141
         listview.setAdapter(adapter_info_set);
@@ -290,6 +301,7 @@ public class MainActivity extends AppCompatActivity implements Runnable,OnClickL
290
                 if(isSend_Status() == true){
301
                 if(isSend_Status() == true){
291
                     isSend_Set(false);
302
                     isSend_Set(false);
292
                 }else{
303
                 }else{
304
+                    Tx_buffers[4] = (byte) adapter_infor.getItem(4);
293
                     isSend_Set(true);
305
                     isSend_Set(true);
294
                 }
306
                 }
295
 
307
 

+ 12 - 6
app/src/main/java/com/example/repeater/send.java

@@ -36,8 +36,8 @@ public class send extends TimerTask {
36
 
36
 
37
     }
37
     }
38
     //byte[] data = {"abcdefghijklmnopqrxtuvwxyz"};
38
     //byte[] data = {"abcdefghijklmnopqrxtuvwxyz"};
39
-    public String data = "BLUECELL";
40
-    byte[] buffers = data.getBytes();
39
+    public String data = "BE";
40
+    byte[] buffers = new byte[31];// = data.getBytes();
41
     int test_i = 0;
41
     int test_i = 0;
42
     @Override
42
     @Override
43
     public void run() {
43
     public void run() {
@@ -49,11 +49,17 @@ public class send extends TimerTask {
49
                 //            byteArrayOutputStream.write(data, 0, 5);
49
                 //            byteArrayOutputStream.write(data, 0, 5);
50
                 //            dos.writeChars(testdata);
50
                 //            dos.writeChars(testdata);
51
 
51
 
52
-                //dos.write(buffers, 0, buffers.length);
53
-                dos.write(0xbe);
52
+             //   dos.write(buffers, 0, buffers.length);
53
+                //dos.write(0xbe);
54
+                buffers = (this.mAcitivity).getTx_buffers();
55
+                buffers[0] = (byte) 0xbe;          // Header
56
+                buffers[1] = (byte) 0x00;          // type
57
+                buffers[2] = (byte) buffers.length;// length
54
 
58
 
55
-                for(int i = 0; i < 50; i++)
56
-                    dos.write(i);
59
+                //for(int i = 1; i < 30; i++)
60
+                 //   buffers[i] = (byte)i;
61
+
62
+                    dos.write(buffers,0,30);
57
 
63
 
58
 
64
 
59
                 Log.d("send.class / 메시지 전송", "성공");
65
                 Log.d("send.class / 메시지 전송", "성공");