Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 change: 1 addition & 0 deletions .github/workflows/deploy_workflow.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ jobs:
point_painting,
prometheus_ros,
protolink,
protolink_drivers,
quaternion_operation,
robotx_behavior_tree,
robotx_communication,
Expand Down
21 changes: 14 additions & 7 deletions ansible/roles/clone_packages/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -186,13 +186,6 @@
version: master
accept_hostkey: yes
tags: [utility]
- name: clone protolink
git:
repo: https://github.com/OUXT-Polaris/protolink.git
dest: "{{workspace_path}}/src/drivers/protolink"
version: master
accept_hostkey: yes
tags: [utility]

# Description Packages
- name: clone wamv_description
Expand Down Expand Up @@ -260,6 +253,20 @@
dest: "{{workspace_path}}/src/drivers/playstation_joy_interfaces"
version: humble
accept_hostkey: yes
- name: clone protolink
git:
repo: https://github.com/OUXT-Polaris/protolink.git
dest: "{{workspace_path}}/src/drivers/protolink"
version: master
accept_hostkey: yes
tags: [driver]
- name: clone protolink_drivers
git:
repo: https://github.com/OUXT-Polaris/protolink_drivers.git
dest: "{{workspace_path}}/src/drivers/protolink_drivers"
version: master
accept_hostkey: yes
tags: [driver]

# Control Package
- name: clone usv_controller package
Expand Down
Empty file modified create_container.sh
100755 → 100644
Empty file.
Empty file modified delete_container.sh
100755 → 100644
Empty file.
Empty file modified docker/create_container.sh
100755 → 100644
Empty file.
Empty file modified docker/delete_container.sh
100755 → 100644
Empty file.
Empty file modified docker/robotx_ws_docker.sh
100755 → 100644
Empty file.
2 changes: 1 addition & 1 deletion docs/docs/packages.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@

## dashboard

@github_dashboard(OUXT-Polaris/color_names,OUXT-Polaris/data_buffer,OUXT-Polaris/detic_onnx_ros2,OUXT-Polaris/geographic_conversion,OUXT-Polaris/geographic_info,OUXT-Polaris/grid_map_type_adapter,OUXT-Polaris/hermite_path_planner,OUXT-Polaris/image_processing_utils,OUXT-Polaris/joy_to_twist,OUXT-Polaris/lua_vendor,OUXT-Polaris/message_synchronizer,OUXT-Polaris/navi_sim,OUXT-Polaris/nmea_hardware_interface,OUXT-Polaris/nmea_to_geopose,OUXT-Polaris/odom_frame_publisher,OUXT-Polaris/ouxt_common,OUXT-Polaris/pcl_apps,OUXT-Polaris/pcl_type_adapter,OUXT-Polaris/perception_bringup,OUXT-Polaris/playstation_controller_drivers,OUXT-Polaris/point_painting,OUXT-Polaris/prometheus_ros,OUXT-Polaris/protolink,OUXT-Polaris/quaternion_operation,OUXT-Polaris/robotx_behavior_tree,OUXT-Polaris/robotx_communication,OUXT-Polaris/robotx_costmap_calculator,OUXT-Polaris/robotx_ekf,OUXT-Polaris/scan_segmentation,OUXT-Polaris/sol_vendor,OUXT-Polaris/tcp_sender,OUXT-Polaris/usv_controller,OUXT-Polaris/detic_onnx_ros2)
@github_dashboard(OUXT-Polaris/color_names,OUXT-Polaris/data_buffer,OUXT-Polaris/detic_onnx_ros2,OUXT-Polaris/geographic_conversion,OUXT-Polaris/geographic_info,OUXT-Polaris/grid_map_type_adapter,OUXT-Polaris/hermite_path_planner,OUXT-Polaris/image_processing_utils,OUXT-Polaris/joy_to_twist,OUXT-Polaris/lua_vendor,OUXT-Polaris/message_synchronizer,OUXT-Polaris/navi_sim,OUXT-Polaris/nmea_hardware_interface,OUXT-Polaris/nmea_to_geopose,OUXT-Polaris/odom_frame_publisher,OUXT-Polaris/ouxt_common,OUXT-Polaris/pcl_apps,OUXT-Polaris/pcl_type_adapter,OUXT-Polaris/perception_bringup,OUXT-Polaris/playstation_controller_drivers,OUXT-Polaris/point_painting,OUXT-Polaris/prometheus_ros,OUXT-Polaris/protolink,OUXT-Polaris/protolink_drivers,OUXT-Polaris/quaternion_operation,OUXT-Polaris/robotx_behavior_tree,OUXT-Polaris/robotx_communication,OUXT-Polaris/robotx_costmap_calculator,OUXT-Polaris/robotx_ekf,OUXT-Polaris/scan_segmentation,OUXT-Polaris/sol_vendor,OUXT-Polaris/tcp_sender,OUXT-Polaris/usv_controller,OUXT-Polaris/detic_onnx_ros2)
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,20 @@ syntax = "proto3";
package protolink__hardware_communication_msgs__MotorControl;

message hardware_communication_msgs__MotorControl {
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
double motor_speed = 1;
=======
bool motor_enable = 1;
double motor_speed = 2;
>>>>>>> e6e99620788d4244a48300a042935bab1c4fb7fc
=======
bool motor_enable = 1;
double motor_speed = 2;
>>>>>>> e6e99620788d4244a48300a042935bab1c4fb7fc
=======
bool motor_enable = 1;
double motor_speed = 2;
>>>>>>> origin/master
}
2 changes: 1 addition & 1 deletion firmware/mini_v/motor_driver/platformio.ini
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,4 @@ board = teensy41
framework = arduino
lib_deps = nanopb/Nanopb@^0.4.91
build_flags =
-DLEFT
-DLEFT
Empty file modified robotx_ws_docker.sh
100755 → 100644
Empty file.