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.

Sign up for GitHub

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

Jump to bottom

Upgrade from galactic to humble #31

Merged
merged 1 commit into from
Dec 20, 2022
Merged

Upgrade from galactic to humble #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 5 additions & 4 deletions vda5050_connector/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ rosidl_generate_interfaces(${PROJECT_NAME}
"action/ProcessVDAAction.action"
"srv/GetState.srv"
"srv/SupportedActions.srv"
DEPENDENCIES vda5050_msgs
DEPENDENCIES vda5050_msgs tf2
ADD_LINTER_TESTS
)

Expand All @@ -54,9 +54,10 @@ target_include_directories(${library_adapter} PUBLIC
ament_target_dependencies(${library_adapter}
${cpp_dependencies}
${msg_dependencies}
tf2
)
rosidl_target_interfaces(${library_adapter}
${PROJECT_NAME} "rosidl_typesupport_cpp")
rosidl_get_typesupport_target(cpp_typesupport_target "${PROJECT_NAME}" "rosidl_typesupport_cpp")
target_link_libraries(${library_adapter} "${cpp_typesupport_target}")

# Causes the visibility macros to use dllexport rather than dllimport,
# which is appropriate when building the dll but not consuming it.
Expand All @@ -80,7 +81,7 @@ install(
)

## PYTHON MODULES
ament_python_install_package(${PROJECT_NAME})
ament_python_install_package(${PROJECT_NAME}_py)

## PYTHON EXECUTABLES
install(PROGRAMS
Expand Down
2 changes: 1 addition & 1 deletion vda5050_connector/launch/controller.launch.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
from launch import LaunchDescription
from launch_ros.actions import Node
from launch.substitutions import LaunchConfiguration
from vda5050_connector.rewritten_yaml import RewrittenYaml
from vda5050_connector_py.rewritten_yaml import RewrittenYaml


def generate_launch_description():
Expand Down
2 changes: 1 addition & 1 deletion vda5050_connector/launch/mqtt_bridge.launch.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
from launch import LaunchDescription
from launch_ros.actions import Node
from launch.substitutions import LaunchConfiguration
from vda5050_connector.rewritten_yaml import RewrittenYaml
from vda5050_connector_py.rewritten_yaml import RewrittenYaml


def generate_launch_description():
Expand Down
2 changes: 1 addition & 1 deletion vda5050_connector/scripts/mqtt_bridge.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
# POSSIBILITY OF SUCH DAMAGE.

import rclpy
from vda5050_connector.mqtt_bridge import MQTTBridge
from vda5050_connector_py.mqtt_bridge import MQTTBridge


def main(args=None):
Expand Down
2 changes: 1 addition & 1 deletion vda5050_connector/scripts/vda5050_controller.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
import rclpy
from rclpy.executors import MultiThreadedExecutor

from vda5050_connector.vda5050_controller import VDA5050Controller
from vda5050_connector_py.vda5050_controller import VDA5050Controller


def main(args=None):
Expand Down
8 changes: 4 additions & 4 deletions vda5050_connector/test/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,12 @@
import rclpy
from vda5050_connector.action import NavigateToNode
from vda5050_connector.action import ProcessVDAAction
from vda5050_connector.vda5050_controller import DEFAULT_NAV_TO_NODE_ACT_NAME
from vda5050_connector.vda5050_controller import DEFAULT_VDA_ACTION_ACT_NAME
from vda5050_connector_py.vda5050_controller import DEFAULT_NAV_TO_NODE_ACT_NAME
from vda5050_connector_py.vda5050_controller import DEFAULT_VDA_ACTION_ACT_NAME
from vda5050_connector.srv import GetState
from vda5050_connector.vda5050_controller import DEFAULT_GET_STATE_SVC_NAME
from vda5050_connector_py.vda5050_controller import DEFAULT_GET_STATE_SVC_NAME
from vda5050_connector.srv import SupportedActions
from vda5050_connector.vda5050_controller import DEFAULT_SUPPORTED_ACTIONS_SVC_NAME
from vda5050_connector_py.vda5050_controller import DEFAULT_SUPPORTED_ACTIONS_SVC_NAME
from rclpy.qos import qos_profile_action_status_default


Expand Down
8 changes: 4 additions & 4 deletions vda5050_connector/test/test_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@

import pytest

from vda5050_connector.utils import json_camel_to_snake_case
from vda5050_connector.utils import json_snake_to_camel_case
from vda5050_connector.utils import get_vda5050_mqtt_topic
from vda5050_connector.utils import get_vda5050_ros2_topic
from vda5050_connector_py.utils import json_camel_to_snake_case
from vda5050_connector_py.utils import json_snake_to_camel_case
from vda5050_connector_py.utils import get_vda5050_mqtt_topic
from vda5050_connector_py.utils import get_vda5050_ros2_topic


@pytest.mark.parametrize(
Expand Down
8 changes: 4 additions & 4 deletions vda5050_connector/test/test_vda5050_controller.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,10 @@

from uuid import uuid4

from vda5050_connector.vda5050_controller import VDA5050Controller
from vda5050_connector.vda5050_controller import OrderAcceptModes
from vda5050_connector.vda5050_controller import OrderRejectErrors
from vda5050_connector.utils import get_vda5050_ts
from vda5050_connector_py.vda5050_controller import VDA5050Controller
from vda5050_connector_py.vda5050_controller import OrderAcceptModes
from vda5050_connector_py.vda5050_controller import OrderRejectErrors
from vda5050_connector_py.utils import get_vda5050_ts
from vda5050_connector.action import NavigateToNode

from vda5050_msgs.msg import Order
Expand Down
4 changes: 2 additions & 2 deletions vda5050_connector/test/test_vda5050_controller_actions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@

from uuid import uuid4

from vda5050_connector.vda5050_controller import VDA5050Controller
from vda5050_connector.utils import get_vda5050_ts
from vda5050_connector_py.vda5050_controller import VDA5050Controller
from vda5050_connector_py.utils import get_vda5050_ts
from vda5050_connector.action import ProcessVDAAction

from vda5050_msgs.msg import Order
Expand Down
10 changes: 5 additions & 5 deletions vda5050_connector/test/test_vda5050_mqtt_bridge.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,11 @@
import pytest
import json

from vda5050_connector.utils import get_vda5050_ts
from vda5050_connector.mqtt_bridge import generate_vda_order_msg
from vda5050_connector.mqtt_bridge import generate_vda_instant_action_msg
from vda5050_connector.mqtt_bridge import MQTTBridge
from vda5050_connector.utils import convert_ros_message_to_json
from vda5050_connector_py.utils import get_vda5050_ts
from vda5050_connector_py.mqtt_bridge import generate_vda_order_msg
from vda5050_connector_py.mqtt_bridge import generate_vda_instant_action_msg
from vda5050_connector_py.mqtt_bridge import MQTTBridge
from vda5050_connector_py.utils import convert_ros_message_to_json

from vda5050_msgs.msg import Order
from vda5050_msgs.msg import Node
Expand Down
0 ...0_connector/vda5050_connector/__init__.py → ...onnector/vda5050_connector_py/__init__.py
View file
Open in desktop
File renamed without changes.
16 changes: 8 additions & 8 deletions ...onnector/vda5050_connector/mqtt_bridge.py → ...ector/vda5050_connector_py/mqtt_bridge.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,14 +42,14 @@
# ROS dependencies / utils
from rclpy.node import Node

from vda5050_connector.utils import get_vda5050_mqtt_topic
from vda5050_connector.utils import get_vda5050_ros2_topic
from vda5050_connector.utils import json_camel_to_snake_case
from vda5050_connector.utils import read_str_parameter, read_int_parameter
from vda5050_connector.utils import convert_ros_message_to_json
from vda5050_connector.utils import get_vda5050_ts

from vda5050_connector.vda5050_controller import DEFAULT_PROTOCOL_VERSION
from vda5050_connector_py.utils import get_vda5050_mqtt_topic
from vda5050_connector_py.utils import get_vda5050_ros2_topic
from vda5050_connector_py.utils import json_camel_to_snake_case
from vda5050_connector_py.utils import read_str_parameter, read_int_parameter
from vda5050_connector_py.utils import convert_ros_message_to_json
from vda5050_connector_py.utils import get_vda5050_ts

from vda5050_connector_py.vda5050_controller import DEFAULT_PROTOCOL_VERSION

# ROS msgs / srvs / actions
from vda5050_msgs.msg import Action as VDAAction
Expand Down
0 ...ector/vda5050_connector/rewritten_yaml.py → ...or/vda5050_connector_py/rewritten_yaml.py
View file
Open in desktop
File renamed without changes.
0 vda5050_connector/vda5050_connector/utils.py → ...0_connector/vda5050_connector_py/utils.py
View file
Open in desktop
File renamed without changes.
14 changes: 7 additions & 7 deletions ...r/vda5050_connector/vda5050_controller.py → ...da5050_connector_py/vda5050_controller.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,13 @@
from rclpy.node import Node
from rclpy.task import Future

from vda5050_connector.utils import get_vda5050_ros2_topic
from vda5050_connector.utils import get_vda5050_ts
from vda5050_connector.utils import read_bool_parameter
from vda5050_connector.utils import read_double_parameter
from vda5050_connector.utils import read_int_parameter
from vda5050_connector.utils import read_str_array_parameter
from vda5050_connector.utils import read_str_parameter
from vda5050_connector_py.utils import get_vda5050_ros2_topic
from vda5050_connector_py.utils import get_vda5050_ts
from vda5050_connector_py.utils import read_bool_parameter
from vda5050_connector_py.utils import read_double_parameter
from vda5050_connector_py.utils import read_int_parameter
from vda5050_connector_py.utils import read_str_array_parameter
from vda5050_connector_py.utils import read_str_parameter

# ROS msgs / srvs / actions
from vda5050_msgs.msg import Action as VDAAction
Expand Down