Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
bc5b69f
hw1_control_b
joe-hung Jan 31, 2025
235f58a
1st_version_for_sim
joe-hung Feb 3, 2025
704efa4
blink
joe-hung Feb 5, 2025
6e8e8de
Merge branch 's2025_teamB' into Control_teamB for fixed perception
joe-hung Feb 5, 2025
b1ef6d7
blink_component.py complete
joe-hung Feb 5, 2025
af9d634
blink_component.py fixed
joe-hung Feb 5, 2025
f529c92
blink_component.py add state flag
joe-hung Feb 5, 2025
cf906ef
updated blink.py
joe-hung Feb 5, 2025
d39ca65
blink_comonent.py for onboard
joe-hung Feb 10, 2025
3524597
hw part 1.1 1.2 finish
Feb 11, 2025
bc5a2d6
Merge branch 'Control_teamB' of https://github.com/krishauser/GEMstac…
Feb 11, 2025
d6018ae
base implementation Part 1
sanjaypokkali Feb 12, 2025
876ff39
basic stanley control implementation
joe-hung Feb 12, 2025
42c0985
hw1.3 unfinished
Feb 14, 2025
6867f1a
update pedestrian_yield_logo.py
derekzyn Feb 16, 2025
4c3df3d
Update minimum distance calculation
derekzyn Feb 17, 2025
eb0d555
hw1 part1.3 finished
joe-hung Feb 17, 2025
aa1aae9
Fixed ROS type typo
joe-hung Feb 17, 2025
7743899
hw1 part2 fixed some error to run on vehicle
Feb 17, 2025
887aefe
Updated longitudinal Planner
brijesh2709 Feb 18, 2025
59753a8
Merge branch 's2025_teamB' into teamb_planning
brijesh2709 Feb 18, 2025
412df4b
Merge remote-tracking branch 'origin/teamb_planning_part2' into teamb…
brijesh2709 Feb 18, 2025
3c126f4
Testing for 3 peds in simultion
brijesh2709 Feb 18, 2025
d5ef999
change model to hang_v1, fixed typo
Feb 18, 2025
08631c4
Merge remote-tracking branch 'origin/teamb_planning' into teamB_contr…
joe-hung Feb 20, 2025
af33835
fixed gnss
joe-hung Feb 24, 2025
c48b5c4
typo
joe-hung Feb 24, 2025
c82a15a
pp tuning
Feb 24, 2025
0c9f243
pp tuning and dynamics
Feb 24, 2025
76297e8
Update planning part 2 code
derekzyn Feb 24, 2025
3fd0f46
Merge branch 'teamB_control_planning' of https://github.com/krishause…
Feb 24, 2025
a3fde25
pp tuning and planning integration
Feb 24, 2025
89e5379
test logs
Feb 24, 2025
1ba57c4
Merge branch 's2025_teamB' into teamB_control_planning
brijesh2709 Feb 25, 2025
fb11276
Merge branch 's2025_teamB' into teamB_control_planning
brijesh2709 Feb 25, 2025
ffd8bad
Car integration code from earlier today with control fixes
Feb 26, 2025
5159616
update fix route
Feb 26, 2025
5124581
working car move but no stop
Feb 26, 2025
fe63727
modified time slightly to fix tiny bug
LucasEby Feb 26, 2025
cbbe80d
Merge pull request #144 from krishauser/G8_velocity_time_bug
LucasEby Feb 26, 2025
1f5ff0a
Update longitudinal_planning.py
derekzyn Feb 27, 2025
8f22e76
Update pedestrian_yield_logic.py
derekzyn Feb 27, 2025
cca72f0
modified for simulation with pedestrian detection
derekzyn Feb 27, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1,391 changes: 1,391 additions & 0 deletions 2025-02-18_11-01-55/PurePursuitTrajectoryTracker_debug.csv

Large diffs are not rendered by default.

1,671 changes: 1,671 additions & 0 deletions 2025-02-18_11-01-55/behavior.json

Large diffs are not rendered by default.

22 changes: 22 additions & 0 deletions 2025-02-18_11-01-55/meta.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
events:
- description: Hardware fault override_active
time: 1739898141.896652
vehicle_time: 1739898141.8965485
- description: Ctrl+C pressed, switching to recovery mode
time: 1739898143.8960507
vehicle_time: 1739898143.8812282
- description: Mission execution ended
time: 1739898143.916531
vehicle_time: 1739898143.8812282
exit_reason: normal exit
git_branch: Control_teamB
git_commit_id: 7743899fd6632599b8aa1c4c3c9a73270873950b
pipelines:
- name: drive
time: 1739898116.0726633
vehicle_time: 1739898115.9723945
- name: recovery
time: 1739898143.9031632
vehicle_time: 1739898143.8812282
start_time: 1739898115.96277
start_time_human_readable: '2025-02-18 11:01:55'
316 changes: 316 additions & 0 deletions 2025-02-18_11-01-55/settings.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,316 @@
control:
longitudinal_control:
pid_d: 0.0
pid_i: 0.1
pid_p: 1.0
pure_pursuit:
crosstrack_gain: 0.5
desired_speed: trajectory
lookahead: 2.0
lookahead_scale: 3.0
recovery:
brake_amount: 0.5
brake_speed: 2.0
model_predictive_controller:
dt: 0.1
lookahead: 20
run:
after:
show_log_folder: true
computation_graph:
components:
- state_estimation:
inputs: []
outputs:
- vehicle
- roadgraph_update:
inputs:
- vehicle
outputs:
- roadgraph
- obstacle_detection:
inputs:
- vehicle
outputs:
- obstacles
- agent_detection:
inputs:
- vehicle
outputs:
- agents
- lane_detection:
inputs:
- vehicle
- roadgraph
outputs:
- vehicle_lane
- sign_detection:
inputs:
- vehicle
- roadgraph
outputs:
- roadgraph.signs
- environment_detection:
inputs:
- vehicle
outputs:
- environment
- intent_estimation:
inputs:
- vehicle
- roadgraph
- agents
outputs:
- agent_intents
- relations_estimation:
inputs:
- vehicle
- roadgraph
- agents
- obstacles
outputs:
- relations
- predicate_evaluation:
inputs:
- vehicle
- roadgraph
- agents
- obstacles
outputs:
- predicates
- perception_normalization:
inputs:
- all
outputs: []
- mission_execution:
inputs: []
outputs:
- mission
- route_planning:
inputs:
- vehicle
- roadgraph
- mission
outputs:
- route
- driving_logic:
inputs: []
outputs:
- intent
- motion_planning:
inputs:
- all
outputs:
- trajectory
- trajectory_tracking:
inputs:
- vehicle
- trajectory
outputs: []
- signaling:
inputs:
- intent
outputs: []
description: Drive the GEM vehicle along a fixed route (currently xyhead_highbay_backlot_p.csv)
drive:
perception:
perception_normalization: StandardPerceptionNormalizer
state_estimation: GNSSStateEstimator
planning:
motion_planning:
args:
- null
type: RouteToTrajectoryPlanner
route_planning:
args:
- GEMstack/knowledge/routes/xyhead_highbay_backlot_p.csv
type: StaticRoutePlanner
trajectory_tracking:
args:
desired_speed: 2.5
print: false
type: pure_pursuit.PurePursuitTrajectoryTracker
log:
components:
- state_estimation
- trajectory_tracking
ros_topics: []
vehicle_interface: true
mission_execution: StandardExecutor
mode: hardware
name: launch/fixed_route.yaml
recovery:
planning:
trajectory_tracking:
print: false
type: recovery.StopTrajectoryTracker
replay:
components: []
log: null
ros_topics: []
require_engaged: false
variants:
log_ros:
log:
ros_topics:
- /game_control/joy
- /front_radar/front_radar/objects
- /front_radar/front_radar/radar_tracks
- /lidar1/velodyne_points
- /novatel/inspva
- /novatel/imu
- /novatel/bestpos
- /zed2/zed_node/depth/camera_info
- /zed2/zed_node/depth/depth_registered
- /zed2/zed_node/rgb/camera_info
- /zed2/zed_node/rgb/image_rect_color
- /zed2/zed_node/imu/data
- /zed2/zed_node/imu/data_raw
- /zed2/zed_node/imu/mag
- /pacmod/as_rx/enable
- /pacmod/as_rx/accel_cmd
- /pacmod/as_rx/brake_cmd
- /pacmod/as_rx/shift_cmd
- /pacmod/as_rx/steer_cmd
- /pacmod/as_rx/turn_cmd
- /pacmod/as_rx/turn_signal_cmd
- /pacmod/as_rx/vehicle_speed_cmd
- /pacmod/as_tx/enable
- /pacmod/as_tx/global_rpt
- /pacmod/as_tx/accel_rpt
- /pacmod/as_tx/brake_rpt
- /pacmod/as_tx/shift_rpt
- /pacmod/as_tx/steer_rpt
- /pacmod/as_tx/turn_rpt
- /pacmod/as_tx/vehicle_speed_rpt
sim:
run:
drive:
perception:
agent_detection: OmniscientAgentDetector
state_estimation: OmniscientStateEstimator
mode: simulation
vehicle_interface:
args:
scene: scenes/xyhead_demo.yaml
type: gem_simulator.GEMDoubleIntegratorSimulationInterface
visualization:
args:
rate: 20
save_as: null
type: klampt_visualization.KlamptVisualization
vehicle_interface: gem_hardware.GEMHardwareInterface
simulator:
dt: 0.01
gnss_emulator:
dt: 0.1
real_time_multiplier: 1.0
vehicle:
calibration:
calibration_date: '2024-03-05'
front_camera:
center_position:
- 1.78
- 0
- 1.58
reference: rear_axle_center
rotation:
- - 0
- 0
- 1
- - -1
- 0
- 0
- - 0
- -1
- 0
gnss_location:
- 1.1
- 0
- 1.62
gnss_yaw: 0.0
rear_axle_height: 0.33
reference: rear_axle_center
top_lidar:
position:
- 1.1
- 0
- 2.03
reference: rear_axle_center
rotation:
- - 1
- 0
- 0
- - 0
- 1
- 0
- - 0
- 0
- 1
control_defaults:
accelerator_pedal_speed: 3.0
brake_pedal_speed: 3.0
steering_wheel_speed: 4.0
dynamics:
acceleration_deadband: 0.1
acceleration_model: kris_v1
accelerator_active_range:
- 0.2
- 1.0
aerodynamic_drag_coefficient: 0.01
brake_active_range:
- 0
- 1
gravity: 9.81
internal_dry_deceleration: 0.2
internal_viscous_deceleration: 0.05
lateral_friction: 1.0
longitudinal_friction: 1.0
mass: 300.0
max_accelerator_acceleration:
- 0.0
- 5.0
max_accelerator_acceleration_reverse: 2.5
max_accelerator_power:
- 0.0
- 10000.0
max_accelerator_power_reverse: 10000.0
max_brake_deceleration: 8.0
enable_through_joystick: true
geometry:
bounds:
- - -0.35
- 2.85
- - -0.85
- 0.85
- - 0
- 2.5
height: 2.5
length: 3.2
max_steering_angle: 11.0
max_wheel_angle: 0.6108
min_steering_angle: -11.0
min_wheel_angle: -0.6108
urdf_model: /home/gem/control_team_b/GEMstack/knowledge/vehicle/model/gem_e4.urdf
wheel_radius: 0.33
wheelbase: 2.56
width: 1.7
limits:
max_acceleration: 1.0
max_accelerator_pedal: 0.5
max_brake_pedal: 0.5
max_deceleration: 2.0
max_reverse_speed: 0.25
max_speed: 2.5
max_steering_rate: 2.0
max_command_rate: 10.0
max_gear: 1
name: GEM
num_wiper_settings: 1
sensors:
ros_topics:
front_camera: /oak/rgb/image_raw
front_depth: /oak/stereo/image_raw
gnss: /septentrio_gnss/insnavgeod
top_lidar: /ouster/points
version: e4
5 changes: 4 additions & 1 deletion GEMstack/knowledge/defaults/computation_graph.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,14 @@ components:
inputs: [vehicle, roadgraph, mission]
outputs: route
- driving_logic:
inputs: all
inputs:
outputs: intent
- motion_planning:
inputs: all
outputs: trajectory
- trajectory_tracking:
inputs: [vehicle, trajectory]
outputs:
- signaling:
inputs: [intent]
outputs:
8 changes: 4 additions & 4 deletions GEMstack/knowledge/defaults/current.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@ control:
brake_amount : 0.5
brake_speed : 2.0
pure_pursuit:
lookahead: 2.0
lookahead: 2.5
lookahead_scale: 3.0
crosstrack_gain: 1.0
crosstrack_gain: 0.3 # 0.5 # default: 1
desired_speed: trajectory
longitudinal_control:
pid_p: 1.0
pid_p: 1.5
pid_i: 0.1
pid_d: 0.0
pid_d: 0.0

#configure the simulator, if using
simulator:
Expand Down
8 changes: 4 additions & 4 deletions GEMstack/knowledge/routes/forward_15m.csv
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
0.0,0,0
1.0,0,0
2.0,0,0
3.0,0,0
0,0,0
1,0,0
2,0,0
3,0,0
4,0,0
5,0,0
6,0,0
Expand Down
Loading
Loading