diff --git a/.devcontainer/linux/devcontainer.json b/.devcontainer/linux/devcontainer.json index 6f09be19..7d44aab2 100644 --- a/.devcontainer/linux/devcontainer.json +++ b/.devcontainer/linux/devcontainer.json @@ -1,6 +1,6 @@ { "name" : "ROV Linux", - "image": "ghcr.io/cwrurobotics/rov-24:main", + "image": "ghcr.io/cwrurobotics/rov-24:iron", "containerEnv": { "DISPLAY": "${localEnv:DISPLAY}" }, diff --git a/.devcontainer/macos/devcontainer.json b/.devcontainer/macos/devcontainer.json index 56c90a99..0cc12191 100644 --- a/.devcontainer/macos/devcontainer.json +++ b/.devcontainer/macos/devcontainer.json @@ -1,6 +1,6 @@ { "name" : "ROV macOS", - "image": "ghcr.io/cwrurobotics/rov-24:main", + "image": "ghcr.io/cwrurobotics/rov-24:iron", "containerEnv": { "DISPLAY": "${localEnv:DISPLAY}" }, diff --git a/.devcontainer/windows/devcontainer.json b/.devcontainer/windows/devcontainer.json index 62d1d937..2d72cc18 100644 --- a/.devcontainer/windows/devcontainer.json +++ b/.devcontainer/windows/devcontainer.json @@ -1,6 +1,6 @@ { "name" : "ROV Windows", - "image": "ghcr.io/cwrurobotics/rov-24:main", + "image": "ghcr.io/cwrurobotics/rov-24:iron", "containerEnv": { "DISPLAY": "${localEnv:DISPLAY}" }, diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 6a02115d..1af96772 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -1,10 +1,9 @@ -# name: Create and publish a Docker image # Configures this workflow to run every time a change is pushed to a branch in the branches array. on: push: - branches: ['main'] + branches: ['iron'] # Defines two custom environment variables for the workflow. These are used for the Container registry domain, and a name for the Docker image that this workflow builds. env: diff --git a/.github/workflows/industrial_ci_action.yml b/.github/workflows/industrial_ci_action.yml index 5ac5a24a..5e92a0b4 100644 --- a/.github/workflows/industrial_ci_action.yml +++ b/.github/workflows/industrial_ci_action.yml @@ -19,7 +19,7 @@ jobs: strategy: # fail-fast: false # uncomment if failing jobs should not cancel the others immediately matrix: # matrix is the product of entries - ROS_DISTRO: [humble] + ROS_DISTRO: [iron] ROS_REPO: [main] # exclude: # specific configuration can be excludes # - {ROS_DISTRO: melodic, ROS_REPO: testing} @@ -29,9 +29,6 @@ jobs: CCACHE_DIR: "${{ github.workspace }}/.ccache" # directory for ccache (and how we enable ccache in industrial_ci) steps: - uses: actions/checkout@v4 # clone target repository - with: - # Clone submodules as well - submodules: 'true' - uses: actions/cache@v4 # fetch/store the directory used by ccache before/after the ci run with: path: ${{ env.CCACHE_DIR }} @@ -44,7 +41,14 @@ jobs: - uses: 'ros-industrial/industrial_ci@master' # run industrial_ci env: # either pass all entries explicitly - DOCKER_IMAGE: ghcr.io/cwrurobotics/rov-24:main - ROS_REPO: ${{ matrix.ROS_REPO }} + # Added back so testing without Dockerfile can be done + ROS_DISTRO: ${{ matrix.ROS_DISTRO }} + DOCKER_IMAGE: ghcr.io/cwrurobotics/rov-24:iron + ROS_REPO: ${{ matrix.ROS_REPO }} + # Install missing libxcb-cursor0 xvfb for PyQt unit testing + # https://pytest-qt.readthedocs.io/en/latest/troubleshooting.html + ADDITIONAL_DEBS: 'libxcb-cursor0 xvfb' # Crazy one liner for install python dependencies - AFTER_INSTALL_TARGET_DEPENDENCIES_EMBED: 'for d in /root/target_ws/src/rov-24/src/pi/*/ /root/target_ws/src/rov-24/src/surface/*/; do pip install -e "$d"; done' \ No newline at end of file + AFTER_INSTALL_TARGET_DEPENDENCIES_EMBED: 'for d in /root/target_ws/src/rov-24/src/pi/*/ /root/target_ws/src/rov-24/src/surface/*/; do pip install -e "$d"; done' + # Used for running our CI but don't necessarily want to run others failing unit tests (ej. robot_upstart) + UPSTREAM_WORKSPACE: 'github:clearpathrobotics/robot_upstart#foxy-devel' diff --git a/.gitmodules b/.gitmodules index f693d1eb..050eb907 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,7 @@ [submodule "src/surface/ros2_video_streamer"] path = src/surface/ros2_video_streamer url = git@github.com:cwruRobotics/ros2_video_streamer.git +[submodule "src/pi/robot_upstart"] + path = src/pi/robot_upstart + url = git@github.com:clearpathrobotics/robot_upstart.git + branch = foxy-devel diff --git a/.vscode/install_dependencies.sh b/.vscode/install_dependencies.sh index 7aba5f5f..0a517ebb 100755 --- a/.vscode/install_dependencies.sh +++ b/.vscode/install_dependencies.sh @@ -1,11 +1,11 @@ #!/bin/bash # Update ROS dependencies -. /opt/ros/humble/setup.sh && rosdep update +. /opt/ros/iron/setup.sh && rosdep update sudo apt-get update -y # Installs ROS dependencies -. /opt/ros/humble/setup.sh && rosdep install --from-paths src --ignore-src -r -y +. /opt/ros/iron/setup.sh && rosdep install --from-paths src --ignore-src -r -y # Deletes ROS build directories rm -rf build install log diff --git a/.vscode/pi_setup.sh b/.vscode/pi_setup.sh index 4bf81f84..d9450ee6 100755 --- a/.vscode/pi_setup.sh +++ b/.vscode/pi_setup.sh @@ -17,11 +17,11 @@ sudo apt-get update sudo apt-get upgrade -y # Install ROS2 -sudo apt-get install ros-humble-ros-base -y +sudo apt-get install ros-iron-ros-base -y sudo apt-get upgrade -y # Add setup.bash to .bashrc only if it isn't already there -ROS_LINE='source /opt/ros/humble/setup.bash' +ROS_LINE='source /opt/ros/iron/setup.bash' if ! grep -qF "$ROS_LINE" ~/.bashrc ; then echo "$ROS_LINE" >> ~/.bashrc ; fi @@ -41,7 +41,7 @@ source ~/.bashrc # Install only Pi dependencies # Installs ROS dependencies -source /opt/ros/humble/setup.sh && rosdep install --from-paths src/pi --ignore-src -r -y +source /opt/ros/iron/setup.sh && rosdep install --from-paths src/pi --ignore-src -r -y # Crazy one liner for install python dependencies for d in src/pi/*/; do sudo pip install -e "$d"; done diff --git a/.vscode/ros2_install.sh b/.vscode/ros2_install.sh index 43b2c995..a4ef06d3 100755 --- a/.vscode/ros2_install.sh +++ b/.vscode/ros2_install.sh @@ -13,15 +13,25 @@ sudo apt-get update sudo apt-get install curl -y sudo curl -sSL https://raw.githubusercontent.com/ros/rosdistro/master/ros.key -o /usr/share/keyrings/ros-archive-keyring.gpg echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/ros-archive-keyring.gpg] http://packages.ros.org/ros2/ubuntu $(source /etc/os-release && echo $UBUNTU_CODENAME) main" | sudo tee /etc/apt/sources.list.d/ros2.list > /dev/null + +# Install dev tools like rosdep among others. This is ros-distro agnostic. +# More info can be found here +# https://discourse.ros.org/t/ros-developer-tools-now-in-binary-form/29802 +sudo apt install ros-dev-tools + +# Install pip +sudo apt install python3-pip + +# Update any installed packages sudo apt-get update sudo apt-get upgrade -y # Install ROS2 -sudo apt-get install ros-humble-desktop -y +sudo apt-get install ros-iron-desktop -y sudo apt-get upgrade -y # Add setup.bash to .bashrc only if it isn't already there -ROS_LINE='source /opt/ros/humble/setup.bash' +ROS_LINE='source /opt/ros/iron/setup.bash' if ! grep -qF "$ROS_LINE" ~/.bashrc ; then echo "$ROS_LINE" >> ~/.bashrc ; fi @@ -36,5 +46,6 @@ fi source ~/.bashrc # Start rosdep +sudo rosdep init rosdep update source ~/.bashrc diff --git a/.vscode/tasks.json b/.vscode/tasks.json index b5f519e3..24daf6b7 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -46,9 +46,9 @@ { "label": "Docker Pull", "type": "shell", - "command": "sudo docker pull ghcr.io/cwrurobotics/rov-24:main", + "command": "sudo docker pull ghcr.io/cwrurobotics/rov-24:iron", "windows": { - "command": "docker pull ghcr.io/cwrurobotics/rov-24:main" + "command": "docker pull ghcr.io/cwrurobotics/rov-24:iron" }, "hide": true }, diff --git a/Dockerfile b/Dockerfile index d4a77ea8..f4a22b28 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM osrf/ros:humble-desktop-full +FROM osrf/ros:iron-desktop-full RUN sudo apt-get update -y @@ -32,7 +32,7 @@ RUN echo "$export PYTHONWARNINGS=ignore:::setuptools.command.install,ignore:::se # Installs ROS and python dependencies RUN . /root/rov-24/.vscode/install_dependencies.sh -RUN . /opt/ros/humble/setup.sh \ +RUN . /opt/ros/iron/setup.sh \ && PYTHONWARNINGS=ignore:::setuptools.command.install,ignore:::setuptools.command.easy_install,ignore:::pkg_resources; export PYTHONWARNINGS\ && colcon build --symlink-install diff --git a/README.md b/README.md index 475afc8a..18df4bd4 100644 --- a/README.md +++ b/README.md @@ -51,7 +51,7 @@ To reopen after a build Go to File > Open Recent /stuff/rov-24 \[Dev Container] #### Bare Metal -To run the install script use `F1` or `ctrl+shift+p` to open the command bar and use `Tasks: Runs Task`. Then from the Task selection choose `First Time Setup`. This will install ROS and all our dependencies. +To run the install script use `F1` or `ctrl+shift+p` to open the command bar and use `Tasks: Runs Task`. Then from the Task selection choose `Setup Surface Environment`. This will install ROS and all our dependencies. ### Windows @@ -89,7 +89,7 @@ After WSL has been installed follow [this](https://code.visualstudio.com/docs/re Then run the install script. -To run the install script use `F1` or `ctrl+shift+p` to open the command bar and use `Tasks: Runs Task`. Then from the Task selection choose `First Time Setup`. This will install ROS and all our dependencies. +To run the install script use `F1` or `ctrl+shift+p` to open the command bar and use `Tasks: Runs Task`. Then from the Task selection choose `Setup Surface Environment`. This will install ROS and all our dependencies. ### macOS @@ -106,6 +106,10 @@ To reopen after a build Go to File > Open Recent /stuff/rov-24 \[Dev Container] +## Upgrading Environment + +If you are upgrading to a newer ROS version make sure to remove `source /opt/ros/$PREVIOUS_ROS_DISTRO/setup.bash`. If you are using Docker you can simply build the new container and delete the old one. + ## Test environment After running the script open a terminal and run diff --git a/src/pi/camera_streamer/package.xml b/src/pi/camera_streamer/package.xml index ce383216..e0e9a23e 100644 --- a/src/pi/camera_streamer/package.xml +++ b/src/pi/camera_streamer/package.xml @@ -2,7 +2,7 @@ camera_streamer - 1.0.0 + 1.1.0 Capture video from usb and pi cameras and send it as MJPEG streams on ROS topics Noah Mollerstuen Apches License 2.0 diff --git a/src/pi/camera_streamer/setup.py b/src/pi/camera_streamer/setup.py index 46dc20ed..dcf5924e 100644 --- a/src/pi/camera_streamer/setup.py +++ b/src/pi/camera_streamer/setup.py @@ -8,7 +8,7 @@ setup( name=PACKAGE_NAME, - version='1.0.0', + version='1.1.0', packages=[PACKAGE_NAME], data_files=[ ('share/ament_index/resource_index/packages', @@ -18,7 +18,7 @@ (os.path.join('share', PACKAGE_NAME, 'launch'), glob('launch/*launch.[pxy][yma]*')) ], - install_requires=['setuptools', 'flake8==5.0.4', 'mypy >= 1.7'], + install_requires=['setuptools', 'flake8==4.0.1', 'mypy >= 1.7'], zip_safe=True, maintainer='Noah Mollerstuen', maintainer_email='noah@mollerstuen.com', diff --git a/src/pi/manipulators/package.xml b/src/pi/manipulators/package.xml index f7872a39..0de90e93 100644 --- a/src/pi/manipulators/package.xml +++ b/src/pi/manipulators/package.xml @@ -2,7 +2,7 @@ manipulators - 1.0.0 + 1.1.0 Code for manipulators. Georgia Martinez Michael Carlstrom diff --git a/src/pi/manipulators/setup.py b/src/pi/manipulators/setup.py index 91554f3c..6cd07e56 100644 --- a/src/pi/manipulators/setup.py +++ b/src/pi/manipulators/setup.py @@ -8,7 +8,7 @@ setup( name=PACKAGE_NAME, - version='1.0.0', + version='1.1.0', packages=[PACKAGE_NAME], data_files=[ ('share/ament_index/resource_index/packages', @@ -18,7 +18,7 @@ (os.path.join('share', PACKAGE_NAME, 'launch'), glob('launch/*launch.[pxy][yma]*')) ], - install_requires=['setuptools', 'flake8==5.0.4', 'mypy >= 1.7'], + install_requires=['setuptools', 'flake8==4.0.1', 'mypy >= 1.7'], zip_safe=True, maintainer='Georgia Martinez, Michael Carlstrom', maintainer_email='gcm49@case.edu, rmc170@case.edu', diff --git a/src/pi/pi_main/package.xml b/src/pi/pi_main/package.xml index 830ecae1..82db3f36 100644 --- a/src/pi/pi_main/package.xml +++ b/src/pi/pi_main/package.xml @@ -2,17 +2,18 @@ pi_main - 1.0.0 + 1.1.0 MATE ROV Pi Main Benjamin Poulin Apache License 2.0 + robot_upstart + ament_flake8 ament_pep257 python3-pytest ros2launch - robot_upstart ament_python diff --git a/src/pi/pi_main/setup.py b/src/pi/pi_main/setup.py index e83c8b65..a5bf8efd 100644 --- a/src/pi/pi_main/setup.py +++ b/src/pi/pi_main/setup.py @@ -9,7 +9,7 @@ setup( name=PACKAGE_NAME, - version='1.0.0', + version='1.1.0', packages=[PACKAGE_NAME], data_files=[ ('share/ament_index/resource_index/packages', @@ -21,7 +21,7 @@ (os.path.join('share', PACKAGE_NAME, 'udev_rules'), glob('udev_rules/*')) ], - install_requires=['setuptools', 'flake8==5.0.4', 'mypy >= 1.7'], + install_requires=['setuptools', 'flake8==4.0.1', 'mypy >= 1.7'], zip_safe=True, maintainer='Michael Carlstrom', maintainer_email='rmc170@case.edu', diff --git a/src/pi/pixhawk_communication/package.xml b/src/pi/pixhawk_communication/package.xml index c3c881d4..3347acba 100644 --- a/src/pi/pixhawk_communication/package.xml +++ b/src/pi/pixhawk_communication/package.xml @@ -2,7 +2,7 @@ pixhawk_communication - 1.0.0 + 1.1.0 Manages Pixhawk Michael Carlstrom Apache License 2.0 diff --git a/src/pi/pixhawk_communication/setup.py b/src/pi/pixhawk_communication/setup.py index ff6d6920..23a5564d 100644 --- a/src/pi/pixhawk_communication/setup.py +++ b/src/pi/pixhawk_communication/setup.py @@ -8,7 +8,7 @@ setup( name=PACKAGE_NAME, - version='1.0.0', + version='1.1.0', packages=[PACKAGE_NAME], data_files=[ ('share/ament_index/resource_index/packages', @@ -18,7 +18,7 @@ (os.path.join('share', PACKAGE_NAME, 'launch'), glob('launch/*launch.[pxy][yma]*')) ], - install_requires=['setuptools', 'flake8==5.0.4', 'mypy >= 1.7'], + install_requires=['setuptools', 'flake8==4.0.1', 'mypy >= 1.7'], zip_safe=True, maintainer='Michael Carlstrom', maintainer_email='rmc@carlstrom.com', diff --git a/src/pi/realsense/package.xml b/src/pi/realsense/package.xml index 41e15cfe..edf8d748 100644 --- a/src/pi/realsense/package.xml +++ b/src/pi/realsense/package.xml @@ -2,7 +2,7 @@ realsense - 1.0.0 + 1.1.0 MATE ROV Pi Realsense Michael Carlstrom Apache License 2.0 diff --git a/src/pi/realsense/setup.py b/src/pi/realsense/setup.py index bc40b3d0..499dc125 100644 --- a/src/pi/realsense/setup.py +++ b/src/pi/realsense/setup.py @@ -9,7 +9,7 @@ setup( name=PACKAGE_NAME, - version='1.0.0', + version='1.1.0', packages=[PACKAGE_NAME], data_files=[ ('share/ament_index/resource_index/packages', @@ -19,7 +19,7 @@ (os.path.join('share', PACKAGE_NAME, 'launch'), glob('launch/*launch.[pxy][yma]*')) ], - install_requires=['setuptools', 'flake8==5.0.4', 'mypy >= 1.7'], + install_requires=['setuptools', 'flake8==4.0.1', 'mypy >= 1.7'], zip_safe=True, maintainer='Michael Carlstrom', maintainer_email='rmc170@case.edu', diff --git a/src/pi/robot_upstart b/src/pi/robot_upstart new file mode 160000 index 00000000..12340f4c --- /dev/null +++ b/src/pi/robot_upstart @@ -0,0 +1 @@ +Subproject commit 12340f4c6835a9f455bb2fa81bded40bc069f78e diff --git a/src/rov_msgs/package.xml b/src/rov_msgs/package.xml index 108cb80c..7d4c17f7 100644 --- a/src/rov_msgs/package.xml +++ b/src/rov_msgs/package.xml @@ -2,7 +2,7 @@ rov_msgs - 1.0.1 + 1.1.0 MATE ROV Custom ROS messages Benjamin Poulin Eric Yarnot diff --git a/src/surface/flight_control/package.xml b/src/surface/flight_control/package.xml index 78689a5a..beedf691 100644 --- a/src/surface/flight_control/package.xml +++ b/src/surface/flight_control/package.xml @@ -2,7 +2,7 @@ flight_control - 1.0.0 + 1.1.0 Mate ROV sub movement controllers Benjamin Apache License 2.0 diff --git a/src/surface/flight_control/setup.py b/src/surface/flight_control/setup.py index 4213bd15..1651b242 100644 --- a/src/surface/flight_control/setup.py +++ b/src/surface/flight_control/setup.py @@ -7,7 +7,7 @@ setup( name=package_name, - version='1.0.0', + version='1.1.0', packages=[package_name], data_files=[ ('share/ament_index/resource_index/packages', @@ -17,7 +17,7 @@ (os.path.join('share', package_name, 'launch'), glob('launch/*launch.[pxy][yma]*')) ], - install_requires=['setuptools', 'flake8==5.0.4', 'mypy>=1.7', 'pynput'], + install_requires=['setuptools', 'flake8==4.0.1', 'mypy>=1.7', 'pynput'], zip_safe=True, maintainer='benjamin', maintainer_email='bwp18@case.edu', diff --git a/src/surface/gui/gui/event_nodes/subscriber.py b/src/surface/gui/gui/event_nodes/subscriber.py index f2a96f39..2fa1ba7a 100644 --- a/src/surface/gui/gui/event_nodes/subscriber.py +++ b/src/surface/gui/gui/event_nodes/subscriber.py @@ -6,19 +6,23 @@ from rclpy.executors import SingleThreadedExecutor from rclpy.node import Node from rclpy.qos import QoSProfile, qos_profile_system_default +from rclpy.subscription import MsgType class GUIEventSubscriber(Node): """Multithreaded subscriber for receiving messages to the GUI.""" - def __init__(self, msg_type: type, topic: str, signal: pyqtBoundSignal, + def __init__(self, msg_type: MsgType, topic: str, signal: pyqtBoundSignal, qos_profile: QoSProfile = qos_profile_system_default): # Name this node with a sanitized version of the topic name: str = f'subscriber_{re.sub(r"[^a-zA-Z0-9_]", "_", topic)}' super().__init__(name, parameter_overrides=[]) + self.signal = signal + self.subscription = self.create_subscription( - msg_type, topic, signal.emit, qos_profile) + msg_type, topic, lambda data: signal.emit(data), qos_profile) + # Wrap in silly lambda becuase PyQ6 and ROS won't play nice custom_executor = SingleThreadedExecutor() custom_executor.add_node(self) diff --git a/src/surface/gui/package.xml b/src/surface/gui/package.xml index cea31521..1925b0e9 100644 --- a/src/surface/gui/package.xml +++ b/src/surface/gui/package.xml @@ -2,7 +2,7 @@ gui - 1.0.0 + 1.1.0 MATE ROV GUI and related ROS nodes Benjamin Poulin Apache License 2.0 diff --git a/src/surface/gui/setup.py b/src/surface/gui/setup.py index 4bd963b4..e53887f4 100644 --- a/src/surface/gui/setup.py +++ b/src/surface/gui/setup.py @@ -8,7 +8,7 @@ setup( name=PACKAGE_NAME, - version='1.0.0', + version='1.1.0', packages=[PACKAGE_NAME, os.path.join(PACKAGE_NAME, 'widgets'), os.path.join(PACKAGE_NAME, 'event_nodes')], data_files=[ @@ -20,7 +20,7 @@ glob('launch/*launch.[pxy][yma]*')) ], install_requires=['setuptools', 'pyqt6', 'pyqtdarktheme', 'opencv-python>=4.8.1', - 'numpy>=1.26', 'pytest-qt', 'pytest-xvfb', 'flake8==5.0.4', 'mypy>=1.7'], + 'numpy>=1.26', 'pytest-qt', 'pytest-xvfb', 'flake8==4.0.1', 'mypy>=1.7'], zip_safe=True, maintainer='Benjamin Poulin', maintainer_email='bwp18@case.edu', diff --git a/src/surface/ps5_controller/package.xml b/src/surface/ps5_controller/package.xml index 838d8120..9fd4de0a 100644 --- a/src/surface/ps5_controller/package.xml +++ b/src/surface/ps5_controller/package.xml @@ -2,7 +2,7 @@ ps5_controller - 1.0.0 + 1.1.0 Boilerplate for calling standard joystick launch file. Michael Carlstrom Apache License 2.0 diff --git a/src/surface/ps5_controller/setup.py b/src/surface/ps5_controller/setup.py index 93730f1d..c7b19729 100644 --- a/src/surface/ps5_controller/setup.py +++ b/src/surface/ps5_controller/setup.py @@ -8,7 +8,7 @@ setup( name=PACKAGE_NAME, - version='1.0.0', + version='1.1.0', packages=[PACKAGE_NAME], data_files=[ ('share/ament_index/resource_index/packages', @@ -18,7 +18,7 @@ (os.path.join('share', PACKAGE_NAME, 'launch'), glob('launch/*launch.[pxy][yma]*')) ], - install_requires=['setuptools', 'flake8==5.0.4', 'mypy >= 1.7'], + install_requires=['setuptools', 'flake8==4.0.1', 'mypy >= 1.7'], zip_safe=True, maintainer='Michael Carlstrom', maintainer_email='rmc170@case.edu', diff --git a/src/surface/ros2_video_streamer b/src/surface/ros2_video_streamer index 6d254eb3..3bd06f81 160000 --- a/src/surface/ros2_video_streamer +++ b/src/surface/ros2_video_streamer @@ -1 +1 @@ -Subproject commit 6d254eb31c0d7d8a44f757233fa497839b204eab +Subproject commit 3bd06f81f3396eec948cf41db74cb5862869d2e0 diff --git a/src/surface/rov_flir/package.xml b/src/surface/rov_flir/package.xml index be941b00..5e23881e 100644 --- a/src/surface/rov_flir/package.xml +++ b/src/surface/rov_flir/package.xml @@ -2,7 +2,7 @@ rov_flir - 1.0.0 + 1.1.0 Boilerplate for calling flir launch file. Michael Carlstrom Apache License 2.0 diff --git a/src/surface/rov_flir/setup.py b/src/surface/rov_flir/setup.py index 6717701e..a9b88642 100644 --- a/src/surface/rov_flir/setup.py +++ b/src/surface/rov_flir/setup.py @@ -7,7 +7,7 @@ setup( name=package_name, - version='1.0.0', + version='1.1.0', packages=[package_name], data_files=[ ('share/ament_index/resource_index/packages', diff --git a/src/surface/rov_gazebo/package.xml b/src/surface/rov_gazebo/package.xml index 61c48ae2..a1a0f183 100644 --- a/src/surface/rov_gazebo/package.xml +++ b/src/surface/rov_gazebo/package.xml @@ -2,7 +2,7 @@ rov_gazebo - 1.0.0 + 1.1.0 MATE ROV simulation Seongmin Jung Apache License 2.0 diff --git a/src/surface/rov_gazebo/setup.py b/src/surface/rov_gazebo/setup.py index 33f49162..85733d8e 100644 --- a/src/surface/rov_gazebo/setup.py +++ b/src/surface/rov_gazebo/setup.py @@ -8,7 +8,7 @@ setup( name=PACKAGE_NAME, - version="1.0.0", + version="1.1.0", packages=[PACKAGE_NAME], data_files=[ ("share/ament_index/resource_index/packages", ["resource/" + PACKAGE_NAME]), diff --git a/src/surface/surface_main/package.xml b/src/surface/surface_main/package.xml index 64644072..44ec4d30 100644 --- a/src/surface/surface_main/package.xml +++ b/src/surface/surface_main/package.xml @@ -2,7 +2,7 @@ surface_main - 1.0.0 + 1.1.0 MATE ROV Surface Main Benjamin Poulin Apache License 2.0 diff --git a/src/surface/surface_main/setup.py b/src/surface/surface_main/setup.py index cb5f249c..74db7982 100644 --- a/src/surface/surface_main/setup.py +++ b/src/surface/surface_main/setup.py @@ -8,7 +8,7 @@ setup( name=PACKAGE_NAME, - version='1.0.0', + version='1.1.0', packages=[PACKAGE_NAME], data_files=[ ('share/ament_index/resource_index/packages', @@ -18,7 +18,7 @@ (os.path.join('share', PACKAGE_NAME, 'launch'), glob('launch/*launch.[pxy][yma]*')) ], - install_requires=['setuptools', 'flake8==5.0.4', 'mypy >= 1.7'], + install_requires=['setuptools', 'flake8==4.0.1', 'mypy >= 1.7'], zip_safe=True, maintainer='Michael Carlstrom', maintainer_email='rmc170@case.edu',