aa
Dependencies: mbed TrapezoidControl QEI
Diff: System/Process/Process.cpp
- Revision:
- 37:7cfa39c41245
- Parent:
- 36:788274604650
diff -r 788274604650 -r 7cfa39c41245 System/Process/Process.cpp --- a/System/Process/Process.cpp Wed Sep 25 11:03:03 2019 +0000 +++ b/System/Process/Process.cpp Wed Sep 25 11:42:58 2019 +0000 @@ -377,8 +377,6 @@ } if(DWSW) { zyouge=true; - } else { - zyouge=false; } if(AIRSW) { if(SW_flag==false) { @@ -407,7 +405,7 @@ } } if(Twsh==2) { - motor[MOTOR_0].pwm = 240; + motor[MOTOR_0].pwm = 230; motor[MOTOR_0].dir = FOR; if(UPLS2) { motor[MOTOR_0].pwm = 100; @@ -415,6 +413,9 @@ zyouge=false; } } + } else { + motor[MOTOR_0].pwm = 100; + motor[MOTOR_0].dir = BRAKE; } } @@ -726,9 +727,10 @@ } if(cros==2) { - mode=21; - count=0; - cros=0; + + // mode=21; + // count=0; + // cros=0; }//ゆっくりモードに入れなかった時の保険 switch(g[2]) {