Skip to content

Commit 37979dd

Browse files
committed
Merge branch 'main' into redtoo_dev
2 parents d6877b4 + 5cb9244 commit 37979dd

8 files changed

Lines changed: 19 additions & 5 deletions

File tree

README.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,10 @@ If using Webots, you must install webots separately.
3131

3232
The repo should now be built, and launch-able in sim or on the kart.
3333

34+
*Note:* If you want to run Phoenix via your PC then connect via ssh using following commamnd
35+
36+
`ssh -X isc@isc-onboard-1.local`
37+
3438
## Launching
3539

3640
### Sim

phoenix.repos

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,14 @@ repositories:
3939
type: git
4040
url: git@github.com:luxonis/depthai-ros.git
4141
version: 82ce67c
42+
polynomial_planner:
43+
type: git
44+
url: git@github.com:ISC-Project-Phoenix/Polynomial_planner.git
45+
version: master
46+
road_detectors:
47+
type: git
48+
url: git@github.com:ISC-Project-Phoenix/road_detectors.git
49+
version: master
4250
hybrid_pp:
4351
type: git
4452
url: git@github.com:ISC-Project-Phoenix/hybrid_pp.git

phoenix_gazebo/config/robot_localization/robot_localization.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -195,6 +195,7 @@ ekf_filter_node:
195195
# imu1_differential: false
196196
# imu1_relative: false
197197
# imu1_queue_size: 10
198+
198199
#imu0_pose_rejection_threshold: 0.8
199200
#imu0_twist_rejection_threshold: 0.8
200201
#imu0_linear_acceleration_rejection_threshold: 0.8

phoenix_gazebo/launch/include/polynomial_planner/polynomial_planner.launch.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,4 +47,5 @@ def generate_launch_description():
4747
description='Use simulation clock if true'),
4848
# Nodes
4949
plan,
50-
])
50+
51+
])

phoenix_gazebo/launch/include/polynomial_planner/polynomial_planner_ai.launch.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,4 +47,4 @@ def generate_launch_description():
4747
description='Use simulation clock if true'),
4848
# Nodes
4949
plan,
50-
])
50+
])

phoenix_gazebo/launch/include/road_detectors/obj_detector_ai.launch.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,4 +47,4 @@ def generate_launch_description():
4747
description='Use simulation clock if true'),
4848
# Nodes
4949
det,
50-
])
50+
])

phoenix_gazebo/launch/include/road_detectors/obj_detector_cv.launch.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,4 +47,4 @@ def generate_launch_description():
4747
description='Use simulation clock if true'),
4848
# Nodes
4949
det,
50-
])
50+
])

phoenix_gazebo/webots_project/protos/Phoenix.proto

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -267,4 +267,4 @@ PROTO Phoenix [
267267
centerOfMass [ 0.400000 0.000000 0.10000 ]
268268
}
269269
}
270-
}
270+
}

0 commit comments

Comments
 (0)