Revision b4885314 include/amiro/Odometry.h

View differences:

include/amiro/Odometry.h
2 2
#define AMIRO_ODOMETRY_H_
3 3

  
4 4
#include <amiro/MotorControl.h>
5
#include <amiro/gyro/l3g4200d.hpp>
5 6

  
6 7
#include <Types.h> // types::position
7 8

  
......
13 14
     * Constructor
14 15
     *
15 16
     * @param mi object for retrieving the motor increments of the qei
17
     * @param gyro object for retrieving the gyroscope data
18
     * @param mc object for retrieving calibration parameters
16 19
     */
17
    Odometry(MotorIncrements* mi);
20
    Odometry(MotorIncrements* mi, L3G4200D* gyroscope);
18 21

  
19 22
    /**
20 23
     * Set the position of the roboter
......
74 77
     */
75 78
    void updateOdometry();
76 79

  
77
    MotorIncrements* motorIncrements;
80
    MotorIncrements* motorIncrements; // QEI driver
81
    L3G4200D* gyro;  // Gyroscope driver
78 82
    chibios_rt::EvtSource eventSource;
79 83
    const unsigned int period;
80 84
    int incrementsPerRevolution;

Also available in: Unified diff