Revision 6257c97d scout/scoutsim/src/scout.h

View differences:

scout/scoutsim/src/scout.h
121 121
            void paint(wxDC& dc);
122 122

  
123 123
        private:
124
            float absolute_to_mps(int absolute_speed);
124 125
            void setMotors(const motors::set_motors::ConstPtr& msg);
125 126
            bool setPenCallback(scoutsim::SetPen::Request&,
126 127
                                scoutsim::SetPen::Response&);
......
157 158

  
158 159
            /// @todo should these be an array or something?
159 160

  
160
            // Keep track of the last commanded speeds sent to the sim
161
            int motor_fl_speed;
162
            int motor_fr_speed;
163
            int motor_bl_speed;
164
            int motor_br_speed;
161
            // Keep track of the last commanded speeds sent to the sim,
162
            // converted to m/s
163
            float motor_fl_speed;
164
            float motor_fr_speed;
165
            float motor_bl_speed;
166
            float motor_br_speed;
165 167

  
166 168
            // Keep track of encoder ticks for each motor
167 169
            unsigned int fl_ticks;

Also available in: Unified diff