From b0a370b65dd2ac4d81c7c557a71ca373cc288e8b Mon Sep 17 00:00:00 2001 From: Christopher Herr Date: Sat, 25 Mar 2023 15:45:55 +0100 Subject: [PATCH] first commit to new branch --- src/custom_interfaces/CMakeLists.txt | 8 +------- src/custom_interfaces/action/TestACT.action | 8 ++++++++ src/custom_interfaces/package.xml | 4 ++++ src/pubsub/setup.py | 5 ++++- 4 files changed, 17 insertions(+), 8 deletions(-) create mode 100644 src/custom_interfaces/action/TestACT.action diff --git a/src/custom_interfaces/CMakeLists.txt b/src/custom_interfaces/CMakeLists.txt index e50f122..826b226 100644 --- a/src/custom_interfaces/CMakeLists.txt +++ b/src/custom_interfaces/CMakeLists.txt @@ -36,13 +36,7 @@ rosidl_generate_interfaces(${PROJECT_NAME} "msg/CustomMsg1.msg" "msg/CustomMsg2.msg" "srv/CustomSrv1.srv" - "srv/StateMachineSrv.srv" - "srv/InclineControlSRV.srv" - "srv/MosfetControlSRV.srv" - "srv/PitchControlSRV.srv" - "srv/RotationControlSRV.srv" - "srv/SensorSRV.srv" - "srv/WatchdogSRV.srv" + "action/TestACT.action" DEPENDENCIES builtin_interfaces ) diff --git a/src/custom_interfaces/action/TestACT.action b/src/custom_interfaces/action/TestACT.action new file mode 100644 index 0000000..0e4659c --- /dev/null +++ b/src/custom_interfaces/action/TestACT.action @@ -0,0 +1,8 @@ +#Goal +int8 number +--- +#Response/Result +bool success +--- +#Feedback +int8 current_number diff --git a/src/custom_interfaces/package.xml b/src/custom_interfaces/package.xml index 8c22c2a..b519677 100644 --- a/src/custom_interfaces/package.xml +++ b/src/custom_interfaces/package.xml @@ -13,10 +13,14 @@ + builtin_interfaces rosidl_default_generators + rosidl_default_generators + action_msgs + builtin_interfaces rosidl_default_runtime diff --git a/src/pubsub/setup.py b/src/pubsub/setup.py index f7f03ec..69249af 100644 --- a/src/pubsub/setup.py +++ b/src/pubsub/setup.py @@ -25,7 +25,10 @@ setup( 'srvhost = pubsub.service_host:main', 'srvclient = pubsub.service_client:main', 'smhost = pubsub.statemachine_host_example:main', - 'smclient = pubsub.statemachine_client_example:main' + 'smclient = pubsub.statemachine_client_example:main', + 'actclient = just_ros_test_stuff.client_example:main', + 'actserver = just_ros_test_stuff.server_example:main', + 'actsub = just_ros_test_stuff.sub:main', ], }, )