Revision 6257c97d 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 1.0f
81
#define TELEOP_FLUID_MAX_SPEED 1.5f
82
#define TELEOP_FLUID_INC 0.1f
80
// Absolute speeds (0 - 255)
81
#define TELEOP_PRECISE_SPEED 160
82
#define TELEOP_FLUID_MAX_SPEED 200
83
#define TELEOP_FLUID_INC 10
83 84

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

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

  
143
            float teleop_fluid_speed;
144
            float teleop_fluid_omega;
144
            int teleop_fluid_speed;
145
            int teleop_fluid_omega;
145 146

  
146 147
            ros::NodeHandle nh;
147 148
            wxTimer* update_timer;

Also available in: Unified diff