Merge pull request #9 from ichiro-its/feature/color-detection

[ Enhancement ] Add Color Detection Msg
ichiro-its · Oct 7, 2022 · 9c851ef · 9c851ef
2 parents afa4e36 + 7dc2be9
commit 9c851ef
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 11 deletions.
diff --git a/.github/workflows/build-and-test-nightly.yml b/.github/workflows/build-and-test-nightly.yml
@@ -17,7 +17,7 @@ jobs:
       - name: Add nightly Debian repository and rosdep sources list
         run: |
           sudo apt update && sudo apt install curl
-          curl -s http://repository.ichiro-its.org/debian/setup-nightly.bash | bash -s
-          curl -s http://repository.ichiro-its.org/rosdep/setup.bash | bash -s
+          curl -s ${{ secrets.SERVER_BASE_URL }}/debian/setup-nightly.bash | bash -s
+          curl -s ${{ secrets.SERVER_BASE_URL }}/rosdep/setup.bash | bash -s
       - name: Build and test workspace
         uses: ichiro-its/ros2-build-and-test-action@main
diff --git a/.github/workflows/build-and-test-stable.yml b/.github/workflows/build-and-test-stable.yml
@@ -15,7 +15,7 @@ jobs:
       - name: Add stable Debian repository and rosdep sources list
         run: |
           sudo apt update && sudo apt install curl
-          curl -s http://repository.ichiro-its.org/debian/setup.bash | bash -s
-          curl -s http://repository.ichiro-its.org/rosdep/setup.bash | bash -s
+          curl -s ${{ secrets.SERVER_BASE_URL }}/debian/setup.bash | bash -s
+          curl -s ${{ secrets.SERVER_BASE_URL }}/rosdep/setup.bash | bash -s
       - name: Build and test workspace
         uses: ichiro-its/ros2-build-and-test-action@main
diff --git a/.github/workflows/build-debian-nightly.yml b/.github/workflows/build-debian-nightly.yml
@@ -15,8 +15,8 @@ jobs:
       - name: Add nightly Debian repository and rosdep sources list
         run: |
           sudo apt update && sudo apt install curl
-          curl -s http://repository.ichiro-its.org/debian/setup-nightly.bash | bash -s
-          curl -s http://repository.ichiro-its.org/rosdep/setup.bash | bash -s
+          curl -s ${{ secrets.SERVER_BASE_URL }}/debian/setup-nightly.bash | bash -s
+          curl -s ${{ secrets.SERVER_BASE_URL }}/rosdep/setup.bash | bash -s
       - name: Build nightly Debian package
         uses: ichiro-its/ros2-build-debian-action@main
         with:
@@ -41,6 +41,6 @@ jobs:
           username: ${{ secrets.SSH_USER }}
           password: ${{ secrets.SSH_PASS }}
           script: |
-            cd ~/repository/debian
+            cd ${{ secrets.SERVER_REPO_DIR }}/debian
             reprepro includedeb nightly ~/temp/nightly/ninshiki_interfaces/package/*.deb
             rm -rf ~/temp/nightly/ninshiki_interfaces/
diff --git a/.github/workflows/build-debian-stable.yml b/.github/workflows/build-debian-stable.yml
@@ -15,8 +15,8 @@ jobs:
       - name: Add stable Debian repository and rosdep sources list
         run: |
           sudo apt update && sudo apt install curl
-          curl -s http://repository.ichiro-its.org/debian/setup.bash | bash -s
-          curl -s http://repository.ichiro-its.org/rosdep/setup.bash | bash -s
+          curl -s ${{ secrets.SERVER_BASE_URL }}/debian/setup.bash | bash -s
+          curl -s ${{ secrets.SERVER_BASE_URL }}/rosdep/setup.bash | bash -s
       - name: Build stable Debian package
         uses: ichiro-its/ros2-build-debian-action@main
 
@@ -39,6 +39,6 @@ jobs:
           username: ${{ secrets.SSH_USER }}
           password: ${{ secrets.SSH_PASS }}
           script: |
-            cd ~/repository/debian
+            cd ${{ secrets.SERVER_REPO_DIR }}/debian
             reprepro includedeb stable ~/temp/stable/ninshiki_interfaces/package/*.deb
             rm -rf ~/temp/stable/ninshiki_interfaces/
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -19,7 +19,10 @@ find_package(rosidl_default_generators REQUIRED)
 
 rosidl_generate_interfaces(${PROJECT_NAME}
   "msg/DetectedObject.msg"
-  "msg/DetectedObjects.msg")
+  "msg/DetectedObjects.msg"
+  "msg/Point.msg"
+  "msg/Contour.msg"
+  "msg/Contours.msg")
 
 ament_export_dependencies(rosidl_default_runtime)
 ament_package()
diff --git a/msg/Contour.msg b/msg/Contour.msg
@@ -0,0 +1,2 @@
+string name
+Point[] contour
diff --git a/msg/Contours.msg b/msg/Contours.msg
@@ -0,0 +1 @@
+Contour[] contours
diff --git a/msg/Point.msg b/msg/Point.msg
@@ -0,0 +1,2 @@
+float32 x
+float32 y