Ronja Naderi / EigeneFunktionen

Eigene Funktionen

Dependencies:   HCSR

Fork of Bertl by Franz Pucher

Files at this revision

API Documentation at this revision

Revision 18:a317c6d6f570, committed 2015-12-21

Comitter:
Ronja_Naderi
Date:
Mon Dec 21 14:32:12 2015 +0000
Parent:
17:308802267a62
Commit message:
Eigene Funktionen

Changed in this revision

Robot.h Show annotated file Show diff for this revision Revisions of this file
config.h Show annotated file Show diff for this revision Revisions of this file
const.h Show annotated file Show diff for this revision Revisions of this file 
diff -r 308802267a62 -r a317c6d6f570 Robot.h
--- a/Robot.h	Thu Nov 12 19:05:56 2015 +0000
+++ b/Robot.h	Mon Dec 21 14:32:12 2015 +0000
@@ -14,7 +14,7 @@
 #ifndef ROBOT_H
 #define ROBOT_H
 
-class Robot : public ur_Bertl
+class Robot : public Bertl
 {
 public:
     Robot() {};

diff -r 308802267a62 -r a317c6d6f570 config.h
--- a/config.h	Thu Nov 12 19:05:56 2015 +0000
+++ b/config.h	Mon Dec 21 14:32:12 2015 +0000
@@ -35,12 +35,12 @@
 //------------------ CHANGE ONLY IF NESSESARY -------------------------------------
 
 DigitalOut MotorL_EN(p34);          // wiring motor left
-DigitalOut MotorL_FORWARD(P1_1);    // change to P1_0 for Bertl 2015
-DigitalOut MotorL_REVERSE(P1_0);    // change to P1_1 for Bertl 2015
+DigitalOut MotorL_FORWARD(P1_0);    // change to P1_0 for Bertl 2015
+DigitalOut MotorL_REVERSE(P1_1);    // change to P1_1 for Bertl 2015
 
 DigitalOut MotorR_EN(p36);          // wiring motor right
-DigitalOut MotorR_FORWARD(P1_3);    // change to P1_4 for Bertl 2015
-DigitalOut MotorR_REVERSE(P1_4);    // change to P1_3 for Bertl 2015
+DigitalOut MotorR_FORWARD(P1_4);    // change to P1_4 for Bertl 2015
+DigitalOut MotorR_REVERSE(P1_3);    // change to P1_3 for Bertl 2015
 
 I2C i2c(p28,p27);   
 BusIn linesensor(p18, p16, p19, p17);  

diff -r 308802267a62 -r a317c6d6f570 const.h
--- a/const.h	Thu Nov 12 19:05:56 2015 +0000
+++ b/const.h	Mon Dec 21 14:32:12 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=210  ;     /**< 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