Diff: hepta_sat/HeptaXbee.cpp

Revision:

1:d9b4d2303984

Parent:

0:edad9f0f386a

--- a/hepta_sat/HeptaXbee.cpp	Fri Dec 09 05:16:28 2016 +0000
+++ b/hepta_sat/HeptaXbee.cpp	Tue Dec 13 09:54:46 2016 +0000
@@ -98,29 +98,36 @@
         xbee.puts( s );
 }
 
-void HeptaXbee::xbee_s_transmit(char* OutputData,size_t output_num,
-                          char dataA[],char dataB[],char dataC[],char dataD[],
-                           int numA,int numB,int numC,int numD)
+void HeptaXbee::xbee_s_transmit(char dataA[],char dataB[],char dataC[],char dataD[])
 {
+    char OutputData[255];
+    int output_num,numA,numB,numC,numD;
+    numA = sizeof(dataA) / sizeof(dataA[0]);
+    numB = sizeof(dataB) / sizeof(dataB[0]);
+    numC = sizeof(dataC) / sizeof(dataC[0]);
+    numD = sizeof(dataD) / sizeof(dataD[0]);
+    output_num=numA+numB+numC+numD;
     int N=0,i=0,ii;
-    for(i = 0; i <= numA-1; i++){
-        OutputData[N+i] = dataA[i];
-    }
-    N=i;
-    for(i = 0; i <= numB-1; i++){
-        OutputData[N+i] = dataB[i];
-    }
-    N=N+i;
-    for(i = 0; i <= numC-1; i++){
-        OutputData[N+i] = dataC[i];
-    }
-    N=N+i;
-    for(i = 0; i <= numD-1; i++){
-        OutputData[N+i] = dataD[i];
-    }
-    for(ii=0;ii<output_num;ii++){
+       for(i = 0; i <= numA-1; i++){
+           OutputData[N+i] = dataA[i];
+       }
+       N=i;
+       for(i = 0; i <= numB-1; i++){
+           OutputData[N+i] = dataB[i];
+       }
+       N=N+i;
+       for(i = 0; i <= numC-1; i++){
+           OutputData[N+i] = dataC[i];
+       }
+       N=N+i;
+       for(i = 0; i <= numD-1; i++){
+           OutputData[N+i] = dataD[i];
+       }
+       for(ii=0;ii<output_num;ii++){
         xbee.putc(OutputData[ii]);
-    }
+       } 
+    xbee.putc(0x0a);
+    xbee.putc(0x0d);
 }
     
                  
\ No newline at end of file