Bertl
Fork of Bertl by
Revision 18:2a4fa405eec6, committed 2015-12-21
- Comitter:
- Michi_Jocham
- Date:
- Mon Dec 21 14:29:01 2015 +0000
- Parent:
- 17:308802267a62
- Commit message:
- Bertl
Changed in this revision
diff -r 308802267a62 -r 2a4fa405eec6 Robot.cpp --- a/Robot.cpp Thu Nov 12 19:05:56 2015 +0000 +++ b/Robot.cpp Mon Dec 21 14:29:01 2015 +0000 @@ -36,7 +36,10 @@ { TurnLeft(); } - +void Robot :: turnRight() +{ + TurnRigth(); +} void Robot :: pickBeeper() { PickBeeper();
diff -r 308802267a62 -r 2a4fa405eec6 Robot.h --- a/Robot.h Thu Nov 12 19:05:56 2015 +0000 +++ b/Robot.h Mon Dec 21 14:29:01 2015 +0000 @@ -14,13 +14,14 @@ #ifndef ROBOT_H #define ROBOT_H -class Robot : public ur_Bertl +class Robot : public Bertl { public: Robot() {}; Robot(int x, int y, int dir, int beeper) {} void move(); // nur Deklaration - Prototyping void turnLeft(); + void turnRight(); bool frontIsClear(); void pickBeeper(); void putBeeper();
diff -r 308802267a62 -r 2a4fa405eec6 const.h --- a/const.h Thu Nov 12 19:05:56 2015 +0000 +++ b/const.h Mon Dec 21 14:29:01 2015 +0000 @@ -11,7 +11,7 @@ #define CONST_H #define TIME /**< if defined Bertl uses the time and not motor encoder*/ const int MOVE=500; /**< ms move forward or backward */ -const int TURN=500; /**< ms TurnLeft or TurnRigth (nearly 90 degree) */ +const int TURN=205; /**< ms TurnLeft or TurnRigth (nearly 90 degree) */ const int STEPTIME=20; /**< ms turn left or right for adjusting moves for TurnLeft or TurnRigth */ /*! \var int ULTRASONIC_DISTANCE