Diff: manualMode.h

Revision:

13:57d8e360e9aa

Parent:

8:02ed55a576e0

Child:

17:726b6f53a457

diff -r 565fca1ead5b -r 57d8e360e9aa manualMode.h
--- a/manualMode.h	Mon Nov 02 09:04:20 2015 +0000
+++ b/manualMode.h	Tue Nov 03 00:45:17 2015 +0000
@@ -17,9 +17,7 @@
     #endif
 }
 
-//赤修正
 
-#ifdef IM920
 void manualMoveIM920()
 {
 #ifdef BLUE
@@ -160,103 +158,5 @@
     if(b!=8) edge8=1;
     if(b!=9) edge9=1;
 }
-#else
-void manualMovePS3()
-{
-#ifdef BLUE
-    if(analog_ly>50) {
-        Move_l(-0.4);
-        Move_r(0.4);
-    } 
-    else if(analog_ly<-50) {
-        Move_l(0.4);
-        Move_r(-0.4);
-    } 
-    else {
-        if(analog_lx>50) {
-            Move_l(0.6);
-            Move_r(0.6);
-        } else if(analog_lx<-50) {
-            Move_l(-0.6);
-            Move_r(-0.6);
-        } else {
-            Move_l(0.0);
-            Move_r(0.0);
-        }
-    }
-#else
-    if(analog_ly>50) {
-        Move_l(0.4);
-        Move_r(-0.4);
-    }
-    else if(analog_ly<-50) {
-        Move_l(-0.4);
-        Move_r(0.4);
-    }
-    else {
-        if(analog_lx>50) {
-            Move_l(-0.6);
-            Move_r(-0.6);
-        } else if(analog_lx<-50) {
-            Move_l(0.6);
-            Move_r(0.6);
-        } else {
-            Move_l(0.0);
-            Move_r(0.0);
-        }
-    }
-#endif
-}
-void manualPS3(){
-    if(circle){  /*mode change*/
-        if(edge_circle){
-            edge_circle=0;
-            autoflag=1;
-            Indicator4=1;
-            IndicatorAuto=0;
-            Move_l(0.0);
-            Move_r(0.0);
-            resetState();
-            flaga=0;
-            step=114;
-            CStep=114;
-            spcount=speed;
-        }
-    }
-    else if(left){
-        sendData(1,5);
-    }
-    else if(right){
-        sendData(1,4);
-    }
-    else if(l1){  /*L up*/
-        if(edge_l1){
-            edge_l1=0;
-            if(stateL!=92) stateL++;
-            sendData(4,stateL);
-        }
-    }
-    else if(l2){  /*L down*/
-        if(edge_l2){
-            edge_l2=0;
-            if(stateL!=1) stateL--;
-            sendData(4,stateL);
-        }
-    }
-    else if(r1){  /*R up*/
-        if(edge_r1){
-            edge_r1=0;
-            if(stateR!=92) stateR++;
-            sendData(5,stateR);
-        }
-    }
-    else if(r2){  /*R down*/
-        if(edge_r2){
-            edge_r2=0;
-            if(stateR!=1) stateR--;
-            sendData(5,stateR);
-        }
-    }
-}
-#endif 
+
 #endif /*manualMode.h*/