File tree 1 file changed +8
-7
lines changed
vehicle/autoware_accel_brake_map_calibrator/src
1 file changed +8
-7
lines changed Original file line number Diff line number Diff line change @@ -266,15 +266,16 @@ bool AccelBrakeMapCalibrator::get_current_pitch_from_tf(double * pitch)
266
266
bool AccelBrakeMapCalibrator::take_data ()
267
267
{
268
268
// take data from subscribers
269
- // take actuation data
270
- ActuationStatusStamped::ConstSharedPtr actuation_status_ptr = actuation_status_sub_.takeData ();
271
- ActuationCommandStamped::ConstSharedPtr actuation_cmd_ptr = actuation_cmd_sub_.takeData ();
272
- if (actuation_status_ptr) {
269
+ if (accel_brake_value_source_ == ACCEL_BRAKE_SOURCE::STATUS) {
270
+ ActuationStatusStamped::ConstSharedPtr actuation_status_ptr = actuation_status_sub_.takeData ();
271
+ if (!actuation_status_ptr) return false ;
273
272
take_actuation_status (actuation_status_ptr);
274
- } else if (actuation_cmd_ptr) {
273
+ }
274
+ // take actuation data
275
+ if (accel_brake_value_source_ == ACCEL_BRAKE_SOURCE::COMMAND) {
276
+ ActuationCommandStamped::ConstSharedPtr actuation_cmd_ptr = actuation_cmd_sub_.takeData ();
277
+ if (!actuation_cmd_ptr) return false ;
275
278
take_actuation_command (actuation_cmd_ptr);
276
- } else {
277
- return false ;
278
279
}
279
280
280
281
// take velocity data
You can’t perform that action at this time.
0 commit comments