2015_robocon_bteam / Mbed 2 deprecated 2015robot_main

Dependencies:   PID QEI mbed

Fork of 2015robot_main by Naoto Deguchi

Revision:
57:3fbd487e055e
Parent:
51:cb430192b28b
Child:
59:9d66edf3e734
--- a/communicate.h	Tue Sep 29 03:46:22 2015 +0000
+++ b/communicate.h	Tue Sep 29 08:23:03 2015 +0000
@@ -12,6 +12,7 @@
     }
 }
 
+#ifdef IM920
 /***IM920 Communication.***/
 char rcvBUFF_IM920[40], rcvBUFF_SBDBT[40];
 int rcvCOUNT_IM920 = 0, rcvCOUNT_SBDBT = 0;
@@ -170,9 +171,9 @@
         rcvFLAG = 0;
     }
 }
-
+#else
 /***Get state ps3con.***/
-/*#define SBDBT_TX p28
+#define SBDBT_TX p28
 #define SBDBT_RX p27
 Serial SBDBT(SBDBT_TX, SBDBT_RX);
 #define ps3_start 0x80
@@ -182,6 +183,8 @@
 short edge_square       = 0;
 short edge_r1           = 0;
 short edge_l1           = 0;
+short edge_r2           = 0;
+short edge_l2           = 0;
 short edge_l_up         = 0;
 short edge_l_down       = 0;
 short edge_r_up         = 0;
@@ -241,6 +244,8 @@
     if(!triangle) edge_triangle=1;
     if(!r1) edge_r1=1;
     if(!l1) edge_l1=1;
+    if(!r2) edge_r2=1;
+    if(!l2) edge_l2=1;
     if(!right) edge_right=1;
     if(!left) edge_left=1; 
     if(!up) edge_up=1;
@@ -266,4 +271,5 @@
     SBDBT.baud(2400);
     SBDBT.format(8, Serial::None, 1);
     SBDBT.attach(SBDBT_interrupt, Serial::RxIrq);
-}*/
\ No newline at end of file
+}
+#endif
\ No newline at end of file