Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rov msgs #34

Merged
merged 2 commits into from
Sep 30, 2023
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
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ Now select `🏃‍♂️ ROS All` to run all dependency download and building s
This whole process should become `F1`, `Enter`, `Enter` once you've done it once,
although the magic of symlink should mean you won't need to build again for most things.

If you're working on package metadata (e.g. `package.xml`) or interfaces, you'll need to run `🏃‍♂️ ROS Quick Build` or use `Control + Shift + B` every time you change something.
If you're working on package metadata (e.g. `package.xml`) or rov_msgs, you'll need to run `🏃‍♂️ ROS Quick Build` or use `Control + Shift + B` every time you change something.

### Automatic building for non-VSCode heathens

Expand All @@ -47,7 +47,7 @@ Run this command from your workspace folder

The magic of symlink should mean you won't need to build again for most
things, but if you're working on package metadata (e.g. `package.xml`) or
interfaces, you'll need to run this every time you change something:
rov_msgs, you'll need to run this every time you change something:

```bash
. src/.vscode/easy_build.sh
Expand Down
2 changes: 1 addition & 1 deletion src/pi/manipulators/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,4 +50,4 @@ On receiving a msg it toggles a manipulator on or off.

Sends on and off signals to the IC2 board to confirm it is working. There is no ROS features being used.

[msg/Manip]:../../interfaces/msg/Manip.msg
[msg/Manip]:../../rov_msgs/msg/Manip.msg
2 changes: 1 addition & 1 deletion src/pi/manipulators/manipulators/manipulators.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
from manipulators.tca9555 import TCA9555
from rclpy.node import Node, Subscription
from rclpy.qos import qos_profile_system_default
from interfaces.msg import Manip
from rov_msgs.msg import Manip


class Manipulator(Node):
Expand Down
2 changes: 0 additions & 2 deletions src/pi/pixhawk_communication/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@

<exec_depend>ros2launch</exec_depend>

<build_depend>interfaces</build_depend>

<test_depend>ament_flake8</test_depend>
<test_depend>ament_pep257</test_depend>
<test_depend>python3-pytest</test_depend>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 3.8)
project(interfaces)
project(rov_msgs)

if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
add_compile_options(-Wall -Wextra -Wpedantic)
Expand Down
2 changes: 1 addition & 1 deletion src/interfaces/README.md → src/rov_msgs/README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# interfaces
# rov_msgs

## Overview

Expand Down
File renamed without changes.
File renamed without changes.
4 changes: 2 additions & 2 deletions src/interfaces/package.xml → src/rov_msgs/package.xml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?xml version="1.0"?>
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">
<name>interfaces</name>
<name>rov_msgs</name>
<version>1.0.0</version>
<description>MATE ROV Custom ROS Interfaces</description>
<description>MATE ROV Custom ROS messages</description>
<maintainer email="bwp18@case.edu">Benjamin Poulin</maintainer>
<maintainer email="ery12@case.edu">Eric Yarnot</maintainer>
<maintainer email="rmc170@case.edu">Michael Carlstrom</maintainer>
Expand Down
File renamed without changes.
4 changes: 2 additions & 2 deletions src/surface/gui/gui/widgets/task_selector.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
from PyQt6.QtWidgets import QGridLayout, QLabel, QPushButton, QWidget
from task_selector.tasks import Tasks

from interfaces.msg import TaskFeedback
from interfaces.srv import TaskRequest
from rov_msgs.msg import TaskFeedback
from rov_msgs.srv import TaskRequest

WIDTH = 200

Expand Down
2 changes: 1 addition & 1 deletion src/surface/gui/gui/widgets/video_widget.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
from PyQt6.QtWidgets import QLabel, QPushButton, QVBoxLayout, QWidget
from sensor_msgs.msg import Image

from interfaces.msg import CameraControllerSwitch
from rov_msgs.msg import CameraControllerSwitch

WIDTH = 1280
HEIGHT = 720
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
from rclpy.node import Node
from rclpy.qos import qos_profile_system_default

from interfaces.msg import ROVControl
from rov_msgs.msg import ROVControl


# key bindings
Expand Down
2 changes: 1 addition & 1 deletion src/surface/task_selector/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<depend>rclpy</depend>
<depend>sensor_msgs</depend>

<exec_depend>interfaces</exec_depend>
<exec_depend>rov_msgs</exec_depend>
<exec_depend>ros2launch</exec_depend>

<test_depend>ament_flake8</test_depend>
Expand Down
2 changes: 1 addition & 1 deletion src/surface/task_selector/task_selector/basic_task_node.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
from rclpy.executors import MultiThreadedExecutor
from rclpy.node import Node

from interfaces.action import BasicTask
from rov_msgs.action import BasicTask


class BasicTaskNode(Node):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
from rclpy.executors import MultiThreadedExecutor
from rclpy.node import Node

from interfaces.action import BasicTask
from rov_msgs.action import BasicTask


class BasicTaskTimedNode(Node):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
from rclpy.node import Node
from task_selector.tasks import Tasks

from interfaces.srv import TaskRequest
from rov_msgs.srv import TaskRequest


class ExampleRequestClient(Node):
Expand Down
2 changes: 1 addition & 1 deletion src/surface/task_selector/task_selector/is_morning_node.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
from rclpy.executors import MultiThreadedExecutor
from rclpy.node import Node

from interfaces.action import Example
from rov_msgs.action import Example


class IsMorning(Node):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
from rclpy.qos import qos_profile_system_default, qos_profile_sensor_data
from sensor_msgs.msg import Joy

from interfaces.action import BasicTask
from interfaces.msg import CameraControllerSwitch, Manip
from rov_msgs.action import BasicTask
from rov_msgs.msg import CameraControllerSwitch, Manip

# Button meanings for PS5 Control might be different for others
X_BUTTON: int = 0 # Manipulator 0
Expand Down
8 changes: 4 additions & 4 deletions src/surface/task_selector/task_selector/task_selector.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
from rclpy.qos import qos_profile_system_default
from task_selector.tasks import Tasks

# from interfaces.action import Example
from interfaces.action import BasicTask
from interfaces.msg import TaskFeedback
from interfaces.srv import TaskRequest
# from rov_msgs.action import Example
from rov_msgs.action import BasicTask
from rov_msgs.msg import TaskFeedback
from rov_msgs.srv import TaskRequest


class TaskSelector(Node):
Expand Down