2015_robocon_bteam / Mbed 2 deprecated 2015robot_main_zenkoku

Important changes to repositories hosted on mbed.com

Mbed hosted mercurial repositories are deprecated and are due to be permanently deleted in July 2026.

To keep a copy of this software download the repository Zip archive or clone locally using Mercurial.

It is also possible to export all your personal repositories from the account settings page.

Dependencies:   PID QEI mbed

Diff: main_ps3.cpp

Revision:
14:943e663694c3
Parent:
13:57d8e360e9aa
Child:
17:726b6f53a457
diff -r 57d8e360e9aa -r 943e663694c3 main_ps3.cpp
--- a/main_ps3.cpp	Tue Nov 03 00:45:17 2015 +0000
+++ b/main_ps3.cpp	Tue Nov 03 04:17:13 2015 +0000
@@ -9,10 +9,6 @@
 /***マシン状態計測***/
 //#define MESURE
 
-#if defined(IM920) && defined(PS3)
-#error Caution, You should define either IM920 or PS3
-#endif
-
 #if defined(BLUE) && defined(RED)
 #error Caution, You should define either BLUE or RED
 #endif
@@ -32,6 +28,7 @@
     initializeMotors();
     initializeControllers();
     initializeRS485();
+    initializeMbedSerial();
 #ifdef BLUE
     sita=PI/4.0,targ_sita=PI/4.0;
     IndicatorBLUE = 1;
@@ -334,11 +331,8 @@
             manualIM920();     /*IM920 button*/
         }
         /***update state***/ 
-#ifdef IM920
-        readIM920();
-#endif
 //        pc.printf("x:%f,y:%f\r\n",x,y);
-        pc.printf("a2:%f ,b:%f ,X:%f ,Y:%f\r\n",a2,b,X,Y);
+        pc.printf("a2:%d ,b:%d ,X:%d ,Y:%d\r\n",a2,b,X,Y);
 //        wait(RATE);
     }
 }
\ No newline at end of file