Skip to content

Commit 454bc7e

Browse files
small fixes
1 parent 086f7ad commit 454bc7e

1 file changed

Lines changed: 14 additions & 1 deletion

File tree

GEMstack/onboard/interface/gem_gazebo.py

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -336,6 +336,17 @@ def __init__(self, scene : str = None):
336336
self.stereo_sub = None
337337
self.faults = []
338338

339+
self.dubins = SecondOrderDubinsCar(
340+
wheelAngleMin=settings.get('vehicle.geometry.min_wheel_angle'),
341+
wheelAngleMax=settings.get('vehicle.geometry.max_wheel_angle'),
342+
velocityMin=-settings.get('vehicle.limits.max_reverse_speed'),
343+
velocityMax=settings.get('vehicle.limits.max_speed'),
344+
accelMin=-settings.get('vehicle.limits.max_acceleration'),
345+
accelMax=settings.get('vehicle.limits.max_deceleration'),
346+
wheelAngleRateMin=-settings.get('vehicle.limits.max_steering_rate'),
347+
wheelAngleRateMax=settings.get('vehicle.limits.max_steering_rate'),
348+
wheelBase=settings.get('vehicle.geometry.wheelbase'))
349+
339350

340351
# # -------------------- PACMod setup --------------------
341352
# # GEM vehicle enable
@@ -538,6 +549,8 @@ def send_command(self, command : GEMVehicleCommand):
538549

539550
phi = ?????
540551

552+
553+
541554
accelerator_pedal_position = np.clip(command.accelerator_pedal_position,0.0,1.0)
542555
brake_pedal_position = np.clip(command.brake_pedal_position,0.0,1.0)
543556
acceleration = pedal_positions_to_acceleration(accelerator_pedal_position,brake_pedal_position,v,0,1)
@@ -557,7 +570,7 @@ def send_command(self, command : GEMVehicleCommand):
557570
msg = AckermannDrive()
558571
msg.acceleration = acceleration
559572
msg.speed = acceleration * self.dt #float('inf') if acceleration >0 else float('-inf')
560-
msg.steering_angle = command.steering_wheel_angle
573+
msg.steering_angle = phides
561574
msg.steering_angle_velocity = steering_angle_rate
562575

563576

0 commit comments

Comments
 (0)