husarion · delihus · Sep 11, 2023 · Oct 10, 2023 · Oct 10, 2023 · Oct 17, 2023
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -1,3 +1,3 @@
 # TODO: specify bump command and remove this description
 
-Bump version workflow is triggered when PR is closed, it bumps version and triggers docker build that will be tagged with version number. To use it you have to specify bump type, available commands: `bump::patch`, `bump::minor` and `bump::major` (simply leave one of them in PR description and remove this description).
+Bump version workflow is triggered when PR is closed, it bumps version and triggers docker build that will be tagged with version number. To use it you have to specify bump type, available commands: `bump::patch`, `bump::minor` and `bump::major` (simply leave one of them in PR description and remove this description).
diff --git a/.github/workflows/bump_version.yaml b/.github/workflows/bump_version.yaml
@@ -61,4 +61,4 @@ jobs:
           -H "Accept: application/vnd.github+json"
           -H "Authorization: Bearer ${{ secrets.GH_PAT }}"
           https://api.github.com/repos/husarion/rosbot-docker/dispatches
-          -d '{"event_type":"ros-package-update"}'
+          -d '{"event_type":"ros-package-update"}'
diff --git a/.github/workflows/industrial_ci.yaml b/.github/workflows/industrial_ci.yaml
@@ -19,4 +19,4 @@ jobs:
               vcs import . < ./rosbot/rosbot_simulation.repos
       - uses: ros-industrial/industrial_ci@master
         env:
-          ROS_DISTRO: ${{matrix.ROS_DISTRO}}
+          ROS_DISTRO: ${{matrix.ROS_DISTRO}}
diff --git a/.github/workflows/spellcheck.yaml b/.github/workflows/spellcheck.yaml
@@ -11,4 +11,4 @@ jobs:
     steps:
     - uses: actions/checkout@v3
     - uses: rojopolis/[email protected]
-      name: Spellcheck
+      name: Spellcheck
diff --git a/.gitignore b/.gitignore
@@ -1,8 +1,9 @@
-.vscode
+*.pyc
+
+# ROS 2 build folders
 build
 install
 log
-*.pyc
 
 # ROSbots submodules
 rosbot_hardware_interfaces/

diff --git a/.pyspelling.yaml b/.pyspelling.yaml
@@ -50,4 +50,4 @@ matrix:
     - .wordlist.txt
 
   pipeline:
-  - pyspelling.filters.xml
+  - pyspelling.filters.xml
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
@@ -0,0 +1,10 @@
+{
+    "recommendations": [
+        "ms-iot.vscode-ros",
+        "ms-python.black-formatter",
+        "streetsidesoftware.code-spell-checker",
+        "kevinrose.vsc-python-indent",
+        "ms-python.python",
+        "shardulm94.trailing-spaces"
+    ]
+}
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -0,0 +1,12 @@
+{
+    "cSpell.customDictionaries": {
+        "project-words": {
+            "name": "Workspace Dictionary for Github Action",
+            "path": "${workspaceRoot}/.wordlist.txt",
+            "addWords": true
+        },
+        "custom": true,
+        "internal-terms": false
+    },
+    "files.insertFinalNewline": true
+}
diff --git a/.wordlist.txt b/.wordlist.txt
@@ -117,4 +117,6 @@ Delicat
 Jakub
 Bence
 Palacios
-env
+env
+pids
+pgrep
diff --git a/README.md b/README.md
@@ -113,7 +113,7 @@ ros2 launch rosbot_gazebo simulation.launch.py
 colcon test
 ```
 
-> [!NOTE]  
+> [!NOTE]
 > Command `colcon test` does not build the code. Remember to build your code after changes.
 
 If tests finish with errors print logs:

diff --git a/rosbot/CMakeLists.txt b/rosbot/CMakeLists.txt
@@ -3,4 +3,4 @@ project(rosbot)
 
 find_package(ament_cmake REQUIRED)
 
-ament_package()
+ament_package()
diff --git a/rosbot/rosbot_hardware.repos b/rosbot/rosbot_hardware.repos
@@ -10,4 +10,4 @@ repositories:
   rosbot_controllers:
     type: git
     url: https://github.com/husarion/rosbot_controllers
-    version: main
+    version: main
diff --git a/rosbot_controller/config/mecanum_drive_controller.yaml b/rosbot_controller/config/mecanum_drive_controller.yaml
@@ -101,4 +101,4 @@ rosbot_base_controller:
         # min_velocity -  When unspecified, -max_velocity is used
         max_acceleration: 4.0 # rad/s^2
         # min_acceleration - When unspecified, -max_acceleration is used.
-        max_jerk: 0.0 # rad/s^3
+        max_jerk: 0.0 # rad/s^3
diff --git a/rosbot_controller/package.xml b/rosbot_controller/package.xml
@@ -53,4 +53,4 @@
   <export>
     <build_type>ament_python</build_type>
   </export>
-</package>
+</package>
diff --git a/rosbot_description/CMakeLists.txt b/rosbot_description/CMakeLists.txt
@@ -9,4 +9,4 @@ install(DIRECTORY
   DESTINATION share/${PROJECT_NAME}
 )
 
-ament_package()
+ament_package()
diff --git a/rosbot_description/package.xml b/rosbot_description/package.xml
@@ -20,4 +20,4 @@
   <export>
     <build_type>ament_cmake</build_type>
   </export>
-</package>
+</package>
diff --git a/rosbot_description/urdf/body.urdf.xacro b/rosbot_description/urdf/body.urdf.xacro
@@ -85,4 +85,4 @@
     <xacro:range_sensor.vl53lox parent="body_link" xyz="-0.0926 -0.05 0.0115" rpy="0.0 0.0 ${radians(192.5)}" prefix="rr" />
 
   </xacro:macro>
-</robot>
+</robot>
diff --git a/rosbot_description/urdf/components/vl53lox.urdf.xacro b/rosbot_description/urdf/components/vl53lox.urdf.xacro
@@ -49,4 +49,4 @@
     </xacro:if>
 
   </xacro:macro>
-</robot>
+</robot>
diff --git a/rosbot_description/urdf/rosbot.urdf.xacro b/rosbot_description/urdf/rosbot.urdf.xacro
@@ -24,4 +24,4 @@
     rpy="0.0 0.0 0.0"
     simulation_engine="$(arg simulation_engine)" />
 
-</robot>
+</robot>
diff --git a/rosbot_description/urdf/rosbot_macro.urdf.xacro b/rosbot_description/urdf/rosbot_macro.urdf.xacro
@@ -206,4 +206,4 @@
       </xacro:if>
     </xacro:if>
   </xacro:macro>
-</robot>
+</robot>
diff --git a/rosbot_description/urdf/wheel.urdf.xacro b/rosbot_description/urdf/wheel.urdf.xacro
@@ -105,4 +105,4 @@
     </gazebo>
 
   </xacro:macro>
-</robot>
+</robot>
diff --git a/rosbot_gazebo/package.xml b/rosbot_gazebo/package.xml
@@ -40,4 +40,4 @@
   <export>
     <build_type>ament_python</build_type>
   </export>
-</package>
+</package>
-Original file line number
+Diff line change
@@ Expand Up / @@ -117,4 +117,6 @@ Delicat @@
     Jakub
     Bence
     Palacios
-    env
+    env
+    pids
+    pgrep
Original file line number	Diff line number	Diff line change
Expand Up		@@ -3,4 +3,4 @@ project(rosbot)

		find_package(ament_cmake REQUIRED)

		ament_package()
		ament_package()