Revision c63c9752 scout/scoutsim/src/sim_frame.h

View differences:

scout/scoutsim/src/sim_frame.h
77 77
#define ID_TELEOP_FLUID 9
78 78
#define ID_SONAR 10
79 79

  
80
#define TELEOP_PRECISE_SPEED 30
81
#define TELEOP_FLUID_MAX_SPEED 80
80
#define TELEOP_PRECISE_SPEED 1.0f
81
#define TELEOP_FLUID_MAX_SPEED 1.5f
82
#define TELEOP_FLUID_INC 0.1f
82 83

  
83 84
// Teleop types
84 85
#define TELEOP_OFF 0
......
134 135
            ros::Publisher wireless_receive;
135 136

  
136 137
            // Teleop
137
            short teleop_l_speed;
138
            short teleop_r_speed;
138
            float teleop_l_speed;
139
            float teleop_r_speed;
139 140
            ros::Publisher teleop_pub;
140 141
            int teleop_type;
141 142

  
142
            short teleop_fluid_speed;
143
            short teleop_fluid_omega;
143
            float teleop_fluid_speed;
144
            float teleop_fluid_omega;
144 145

  
145 146
            ros::NodeHandle nh;
146 147
            wxTimer* update_timer;
......
166 167

  
167 168
            std::string images_path;
168 169

  
169
            float meter;
170 170
            float width_in_meters;
171 171
            float height_in_meters;
172 172

  

Also available in: Unified diff