From 1cbb4d69b17c78451cf5bfdd0e911b0734c1b8db Mon Sep 17 00:00:00 2001 From: Wessel Tip Date: Thu, 25 Sep 2025 09:54:40 +0200 Subject: [PATCH] chore(interfaces): Make according to standard --- src/g2_2025_interfaces/CMakeLists.txt | 4 +++- src/g2_2025_interfaces/msg/Exam.msg | 1 + src/g2_2025_interfaces/msg/Student.msg | 1 + src/g2_2025_interfaces/package.xml | 2 ++ src/g2_2025_interfaces/srv/Exam.srv | 5 ----- src/g2_2025_interfaces/srv/Exams.srv | 7 +++++++ 6 files changed, 14 insertions(+), 6 deletions(-) delete mode 100644 src/g2_2025_interfaces/srv/Exam.srv create mode 100644 src/g2_2025_interfaces/srv/Exams.srv diff --git a/src/g2_2025_interfaces/CMakeLists.txt b/src/g2_2025_interfaces/CMakeLists.txt index 9bb5c01..a97f387 100644 --- a/src/g2_2025_interfaces/CMakeLists.txt +++ b/src/g2_2025_interfaces/CMakeLists.txt @@ -8,12 +8,14 @@ endif() # find dependencies find_package(ament_cmake REQUIRED) find_package(rosidl_default_generators REQUIRED) +find_package(builtin_interfaces REQUIRED) rosidl_generate_interfaces(${PROJECT_NAME} "msg/Student.msg" "msg/Exam.msg" - "srv/Exam.srv" + "srv/Exams.srv" "action/Retake.action" + DEPENDENCIES builtin_interfaces ) ament_export_dependencies(rosidl_default_runtime) diff --git a/src/g2_2025_interfaces/msg/Exam.msg b/src/g2_2025_interfaces/msg/Exam.msg index 67ad017..8d1beb9 100644 --- a/src/g2_2025_interfaces/msg/Exam.msg +++ b/src/g2_2025_interfaces/msg/Exam.msg @@ -1,2 +1,3 @@ string lecture_name int32 result +builtin_interfaces/Time timestamp diff --git a/src/g2_2025_interfaces/msg/Student.msg b/src/g2_2025_interfaces/msg/Student.msg index 566c1cc..fa576b2 100644 --- a/src/g2_2025_interfaces/msg/Student.msg +++ b/src/g2_2025_interfaces/msg/Student.msg @@ -1,2 +1,3 @@ string student_name string lecture_name +builtin_interfaces/Time timestamp diff --git a/src/g2_2025_interfaces/package.xml b/src/g2_2025_interfaces/package.xml index e596ef9..42e2940 100644 --- a/src/g2_2025_interfaces/package.xml +++ b/src/g2_2025_interfaces/package.xml @@ -10,7 +10,9 @@ ament_cmake rosidl_default_generators + builtin_interfaces rosidl_default_runtime + builtin_interfaces rosidl_interface_packages ament_lint_auto diff --git a/src/g2_2025_interfaces/srv/Exam.srv b/src/g2_2025_interfaces/srv/Exam.srv deleted file mode 100644 index 8e9945c..0000000 --- a/src/g2_2025_interfaces/srv/Exam.srv +++ /dev/null @@ -1,5 +0,0 @@ -# Request -string student_name -string lecture_name ---- -float32 result diff --git a/src/g2_2025_interfaces/srv/Exams.srv b/src/g2_2025_interfaces/srv/Exams.srv new file mode 100644 index 0000000..d5f62f3 --- /dev/null +++ b/src/g2_2025_interfaces/srv/Exams.srv @@ -0,0 +1,7 @@ +# Request +string student_name +string lecture_name +int32[] exam_grades +--- +# Response +int32 result # Final result