diff --git a/src/pubsub/pubsub/service_client.py b/src/pubsub/pubsub/service_client.py index ea7007a..022f876 100644 --- a/src/pubsub/pubsub/service_client.py +++ b/src/pubsub/pubsub/service_client.py @@ -5,7 +5,7 @@ from rclpy.node import Node from custom_interfaces.srv import CustomSrv1 # Service Minimal Host and Client -from pubsub.pubsub_library_v3 import MinimalServiceClientAsync +from pubsub.pubsub_library_v4 import MinimalServiceClientAsync def main(args=None): diff --git a/src/pubsub/pubsub/service_host.py b/src/pubsub/pubsub/service_host.py index 728ac75..d11f379 100644 --- a/src/pubsub/pubsub/service_host.py +++ b/src/pubsub/pubsub/service_host.py @@ -5,13 +5,13 @@ from rclpy.node import Node from custom_interfaces.srv import CustomSrv1 # Service Minimal Host and Client -import pubsub.pubsub_library_v3 as lib +from pubsub.pubsub_library_v4 import MinimalServiceProvider def main(args=None): rclpy.init(args=args) - minimal_service = lib.MinimalServiceProvider(NODE_NAME="Srv_host_test_node", SRV_NAME="test_srv", SRV_TYPE=CustomSrv1) + minimal_service = MinimalServiceProvider(NODE_NAME="Srv_host_test_node", SRV_NAME="test_srv", SRV_TYPE=CustomSrv1) while rclpy.ok(): try: diff --git a/src/pubsub/pubsub/statemachine_client_example.py b/src/pubsub/pubsub/statemachine_client_example.py index b539839..7b2b3c1 100644 --- a/src/pubsub/pubsub/statemachine_client_example.py +++ b/src/pubsub/pubsub/statemachine_client_example.py @@ -1,7 +1,7 @@ import rclpy from rclpy.node import Node -import pubsub.pubsub_library_v3 as lib +from pubsub.pubsub_library_v4 import MinimalServiceClientAsync # Service Type Files from custom_interfaces.srv import StateMachineSrv @@ -10,7 +10,7 @@ from custom_interfaces.srv import StateMachineSrv def main(args=None): rclpy.init(args=args) - client_cmd_srv = lib.MinimalServiceClientAsync(NODE_NAME="client_cmd_srv_node", SRV_NAME="cmd", SRV_TYPE=StateMachineSrv) + client_cmd_srv = MinimalServiceClientAsync(NODE_NAME="client_cmd_srv_node", SRV_NAME="cmd", SRV_TYPE=StateMachineSrv) # Create request srv_request = StateMachineSrv.Request() diff --git a/src/pubsub/pubsub/statemachine_host_example.py b/src/pubsub/pubsub/statemachine_host_example.py index 9e6779f..58b1ff1 100644 --- a/src/pubsub/pubsub/statemachine_host_example.py +++ b/src/pubsub/pubsub/statemachine_host_example.py @@ -1,7 +1,7 @@ import rclpy from rclpy.node import Node -from pubsub.pubsub_library_v3 import MinimalServiceProvider +from pubsub.pubsub_library_v4 import MinimalServiceProvider # Service Type Files from custom_interfaces.srv import StateMachineSrv diff --git a/src/pubsub/pubsub/topic_listener.py b/src/pubsub/pubsub/topic_listener.py index 03f8e70..258872a 100644 --- a/src/pubsub/pubsub/topic_listener.py +++ b/src/pubsub/pubsub/topic_listener.py @@ -18,7 +18,7 @@ import rclpy from rclpy.node import Node # Import Subscriber Library -from .pubsub_library_v3 import MinimalSubscriber +from pubsub.pubsub_library_v4 import MinimalSubscriber # Import Message Types from custom_interfaces.msg import CustomMsg1 diff --git a/src/pubsub/pubsub/topic_talker.py b/src/pubsub/pubsub/topic_talker.py index d3d80f5..58da515 100644 --- a/src/pubsub/pubsub/topic_talker.py +++ b/src/pubsub/pubsub/topic_talker.py @@ -18,7 +18,7 @@ import rclpy from rclpy.node import Node # Import Publisher Library (Python Library) -from .pubsub_library import MinimalPublisher +from pubsub.pubsub_library_v4 import MinimalPublisher # Import Message Types (Message Files) from custom_interfaces.msg import CustomMsg1