Revision 04114d13 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
// Absolute speeds (0 - 255)
81
#define TELEOP_PRECISE_SPEED 160
82
#define TELEOP_FLUID_MAX_SPEED 200
83
#define TELEOP_FLUID_INC 10
80
// Absolute speeds (-128 - 127)
81
#define TELEOP_PRECISE_SPEED 62
82
#define TELEOP_FLUID_MAX_SPEED 100
83
#define TELEOP_FLUID_INC 8
84 84

  
85 85
// Teleop types
86 86
#define TELEOP_OFF 0
......
112 112
            DECLARE_EVENT_TABLE()
113 113

  
114 114
        private:
115

  
115 116
            void onUpdate(wxTimerEvent& evt);
116 117
            void onPaint(wxPaintEvent& evt);
117 118

  
......
136 137
            ros::Publisher wireless_receive;
137 138

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

  

Also available in: Unified diff