Diff: main.cpp

Revision:

1:2a3dc618aef7

Parent:

0:b96079b7d167

Child:

2:1d66645de649

--- a/main.cpp	Tue Dec 13 08:03:46 2016 +0000
+++ b/main.cpp	Tue Dec 13 09:47:15 2016 +0000
@@ -7,27 +7,25 @@
 HeptaXbee xbee(p9, p10);//(tx,rx)=(Din,Dout)
 HeptaBattery battery(p16,p29,p26);
 HeptaAccel accel(p28,p27,0x38);
-//ピンアサイン読み込み、オブジェクトの生成
 
 int main() {
     pc.baud(9600);
     xbee.baud(9600);
     xbee.printf("Xbee Uplink Ok Mode\r\n");
     int rcmd=0,cmdflag=0;
-    char ddata[16],acx[4],acy[4],acz[4],bat[4];//変数の定義
-    int dsize[2]; 
+    char acx[4],acy[4],acz[4],bat[4];
     for(int i=1;i<10;i++){
         xbee.printf("num = %d\r\n",i);
         xbee.xbee_recieve(&rcmd,&cmdflag);
         pc.printf("rcmd=%d,cmdflag=%d\r\n",rcmd,cmdflag);
         if(cmdflag==1){
             if(rcmd=='a'){
-               xbee.printf("Command Get%d\r\n");
+               xbee.printf("Command Get\r\n");
                for(int j=1;j<10;j++){
-                  accel.sensing_u16(acx,acy,acz,&dsize[0]);
+                  accel.sensing_u16(acx,acy,acz);
                   battery.vol_u16(bat,&dsize[1]);
-                  xbee.xbee_s_transmit(ddata,16,acx,acy,acz,bat,
-                  dsize[0],dsize[0],dsize[0],dsize[1]);
+                  xbee.xbee_s_transmit(acx,acy,acz,bat);
+                  wait(1.0);
                }
             }
         xbee.initialize();