Diff: main_processing/setup_command_active/setup.cpp

Revision:

22:a95f7c63af3c

Parent:

21:d69a8f3c76e1

Child:

23:d95d8d3e89f3

--- a/main_processing/setup_command_active/setup.cpp	Sat Jan 30 09:02:03 2016 +0000
+++ b/main_processing/setup_command_active/setup.cpp	Sat Jan 30 09:27:51 2016 +0000
@@ -10,9 +10,8 @@
     Sw[1].mode(PullUp);
     Sw[2].mode(PullUp);
     Sw[3].mode(PullUp);
-    Sw_ticker.attach(Sw_sample, 0.02);
-    //Sw_ticker.attach(Sw_sample, 0.005);
-    //data.lcdpoint[0] = 0;
+    Sw_ticker.attach(Sw_sample, 0.1);
+    
     Lcd.cls();
     Lcd.print(lcdstr[0][0]);
     
@@ -20,7 +19,8 @@
     BallChecker.mode(PullUp);
     
     //value
-    data.strategy = 3;
+    data.strategy = 0;
+    
     
     //spi
     spi.format(16, 3);
@@ -28,12 +28,12 @@
     spi_ss[0]=spi_ss[1]=spi_ss[2]=spi_ss[3]=1;
     
     //motor
-    //motor.baud(115200);                             //ボーレート設定
-    //motor.printf("1F0002F0003F0004F000\r\n");       //モータ停止
+    motor.baud(115200);                             //ボーレート設定
+    motor.printf("1F0002F0003F0004F000\r\n");       //モータ停止
     //motor.attach(&tx_motor,Serial::TxIrq);          //送信空き割り込み（モータ用）
     
     for(int i=0; i<5; i++){
-        
+        ReadCmps();
         data.CmpsInitialValue = data.cmps;
         wait_ms(10);
     }