Motor
Fork of Motor by
Diff: motor.h
- Revision:
- 7:fbd3fa0445e5
- Parent:
- 6:37199f371bf8
- Child:
- 8:63a67086a1b5
diff -r 37199f371bf8 -r fbd3fa0445e5 motor.h --- a/motor.h Mon Sep 16 17:54:14 2013 +0000 +++ b/motor.h Tue Sep 17 22:52:10 2013 +0000 @@ -60,9 +60,7 @@ int getDecoderCount(); void resetPID(); - -<<<<<<< local -======= + /** Set pwm duty cycle * * @param newPWM Duty cycle @@ -70,8 +68,7 @@ void setPWM(int newPWM); //void pid(); - ->>>>>>> other + int setPoint; int pMulti; int iDiv;