-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #99 from AutomecUA/dev
Bug fixes
- Loading branch information
Showing
11 changed files
with
79 additions
and
87 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
6 changes: 0 additions & 6 deletions
6
physical_bringup/launch/modules/signal_panel_recognition.launch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,16 +1,10 @@ | ||
<launch> | ||
<arg name="image_raw_topic" default="/real_camera"/> | ||
<arg name="vel_cmd_topic" default="/android_input_vel"/> | ||
<arg name="twist_linear_x" default="1"/> | ||
<arg name="signal_cmd_topic" default="/signal_vel"/> | ||
<arg name="twist_cmd_topic" default=""/> | ||
|
||
<include file="$(find signal_recognition)/launch/signal_panel_recognition.launch"> | ||
<arg name="vel_cmd_topic" value="$(arg vel_cmd_topic)"/> | ||
<arg name="twist_cmd_topic" value="$(arg twist_cmd_topic)"/> | ||
<arg name="image_raw_topic" value="$(arg image_raw_topic)"/> | ||
<arg name="signal_cmd_topic" value="$(arg signal_cmd_topic)"/> | ||
<arg name="twist_linear_x" value="$(arg twist_linear_x)"/> | ||
</include> | ||
|
||
</launch> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
<launch> | ||
<arg name="camera_topic" default="/real_camera"/> | ||
<arg name="int_camera_id" default="2"/> | ||
<arg name="signal_cmd_topic" default="/signal_vel"/> | ||
|
||
<include file="$(find physical_bringup)/launch/modules/signal_panel_recognition.launch"> | ||
<arg name="signal_cmd_topic" value="$(arg signal_cmd_topic)"/> | ||
<arg name="image_raw_topic" value="$(arg camera_topic)"/> | ||
</include> | ||
|
||
<include file="$(find physical_bringup)/launch/modules/lane_camera.launch"> | ||
<arg name="camera_topic" value="$(arg camera_topic)"/> | ||
<arg name="int_camera_id" value="$(arg int_camera_id)"/> | ||
</include> | ||
|
||
|
||
</launch> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,16 +1,10 @@ | ||
<launch> | ||
<arg name="image_raw_topic" default="/real_camera"/> | ||
<arg name="vel_cmd_topic" default="/android_input_vel"/> | ||
<arg name="twist_cmd_topic" default="/vel_cmd"/> | ||
<arg name="signal_cmd_topic" default="/signal_vel"/> | ||
<arg name="twist_linear_x" default="1"/> | ||
|
||
<node name="signal_panel_recognition" pkg="signal_recognition" type="signal_panel_recognition.py" output="screen"> | ||
<param name="vel_cmd_topic" value="$(arg vel_cmd_topic)"/> | ||
<param name="image_raw_topic" value="$(arg image_raw_topic)"/> | ||
<param name="twist_cmd_topic" value="$(arg twist_cmd_topic)"/> | ||
<param name="signal_cmd_topic" value="$(arg signal_cmd_topic)"/> | ||
<param name="twist_linear_x" value="$(arg twist_linear_x)"/> | ||
</node> | ||
|
||
</launch> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters