Skip to content

Commit 5124581

Browse files
author
GEM e4 user
committed
working car move but no stop
1 parent 5159616 commit 5124581

5 files changed

Lines changed: 11 additions & 5 deletions

File tree

GEMstack/onboard/perception/pedestrian_detection.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -415,6 +415,8 @@ def find_vels_and_ids(self, agents: List[AgentState]):
415415
agents[idx].velocity = (0, 0, 0)
416416
self.current_agents[id] = agents[idx]
417417
backOrder[idx] = id
418+
print("BACKORDER")
419+
print(backOrder)
418420
return backOrder
419421

420422
# Calculates whether 2 agents overlap. True if they do, false if not
@@ -536,7 +538,7 @@ def create_agent_states(self, obj_centers: List[np.ndarray], obj_dims: List[np.n
536538
def ouster_oak_callback(self, cv_image: cv2.Mat, lidar_points: np.ndarray):
537539

538540
# Update times for basic velocity calculation
539-
self.prev_time = self.curr_time
541+
# self.prev_time = self.curr_t
540542
# self.curr_time = datetime.now() # Updating in update function now
541543

542544
self.cv_image = cv_image

GEMstack/onboard/planning/pure_pursuit.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ def __init__(self, lookahead = None, lookahead_scale = None, crosstrack_gain = N
2121
self.wheel_angle_range = [settings.get('vehicle.geometry.min_wheel_angle'),settings.get('vehicle.geometry.max_wheel_angle')]
2222
self.steering_angle_range = [settings.get('vehicle.geometry.min_steering_angle'),settings.get('vehicle.geometry.max_steering_angle')]
2323

24+
self.max_decel = 100
25+
2426
if desired_speed is not None:
2527
self.desired_speed_source = desired_speed
2628
else:

geonav_transform

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Subproject commit 8894342ca6821514f5401ccf63516041d07e44b5

launch/fixed_route.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ drive:
1818
planning:
1919
route_planning:
2020
type: StaticRoutePlanner
21-
args: [!relative_path '../GEMstack/knowledge/routes/xyhead_highbay_backlot_p.csv'] #forward_15m
22-
motion_planning: #longitudinal_planning.YieldTrajectoryPlanner
23-
type: RouteToTrajectoryPlanner
24-
args: [null] #desired speed in m/s. If null, this will keep the route untimed for the trajectory tracker
21+
args: [!relative_path '../GEMstack/knowledge/routes/forward_15m.csv'] #forward_15m
22+
motion_planning: longitudinal_planning.YieldTrajectoryPlanner
23+
# type: RouteToTrajectoryPlanner
24+
# args: [null] #desired speed in m/s. If null, this will keep the route untimed for the trajectory tracker
2525
trajectory_tracking:
2626
type: pure_pursuit.PurePursuitTrajectoryTracker
2727
# args: [null]

launch/fixed_route_combined.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ drive:
1515
state_estimation : GNSSStateEstimator
1616
perception_normalization : StandardPerceptionNormalizer
1717
agent_detection : pedestrian_detection.PedestrianDetector2D
18+
# agent_detection : pedestrian_detection.FakePedestrianDetector2D
1819
planning:
1920
route_planning:
2021
type: StaticRoutePlanner

0 commit comments

Comments
 (0)