updated package.xml in rosbot_utils (#94)

* updated package.xml in rosbot_utils

* Added comment for flash script

Signed-off-by: Jakub Delicat <jakub.delicat@husarion.com>

* Updated worldlist

Signed-off-by: Jakub Delicat <jakub.delicat@husarion.com>

* removed gz tests

Signed-off-by: Jakub Delicat <jakub.delicat@husarion.com>

* updated setup.py

Signed-off-by: Jakub Delicat <jakub.delicat@husarion.com>

* Added firmware version

Signed-off-by: Jakub Delicat <jakub.delicat@husarion.com>

* Update flash_firmware.py

---------

Signed-off-by: Jakub Delicat <jakub.delicat@husarion.com>

Author: delihus

.wordlist.txt

@@ -148,4 +148,5 @@ stm
 ttyUSB
 subprocess
 cbus
+Dockerfile
 unbuffered

rosbot_utils/package.xml

@@ -3,10 +3,12 @@
 <package format="3">
   <name>rosbot_utils</name>
   <version>0.13.0</version>
-  <description>utilities for ROSbot 2R and 2 PRO</description>
-  <maintainer email="dominik.nwk@gmail.com">Dominik Nowak</maintainer>
+  <description>Utilities for ROSbot 2R and 2 PRO</description>
   <license>Apache License 2.0</license>
 
+  <author email="dominik.nwk@gmail.com">Dominik Nowak</author>
+  <maintainer email="support@husarion.com">Husarion</maintainer>
+
   <url type="website">https://husarion.com/</url>
   <url type="repository">https://github.com/husarion/rosbot_ros</url>
   <url type="bugtracker">https://github.com/husarion/rosbot_ros/issues</url>

rosbot_utils/rosbot_utils/flash-firmware.py

@@ -14,6 +14,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+
+# This file is deprecated but stays here for backward compatibility look here:
+# https://github.com/husarion/rosbot-docker/blob/ros2/Dockerfile.hardware#L82
+
 import sh
 import time
 import sys

rosbot_utils/rosbot_utils/flash_firmware.py

@@ -26,6 +26,8 @@
 # Global variable to hold the subprocess reference
 subproc = None
 
+firmware_version = "0.11.0"
+
 
 def signal_handler(sig, frame):
     global subproc
@@ -53,14 +55,14 @@ def find_firmware_file():
 
     # Construct the path to the firmware directory
     firmware_dir = os.path.join(package_install_directory, "firmware")
-    firmware_files = glob.glob(os.path.join(firmware_dir, "firmware*.bin"))
+    firmware_files = glob.glob(os.path.join(firmware_dir, f"firmware-{firmware_version}.bin"))
 
     if not firmware_files:
         firmware_url = (
             "https://github.com/husarion/rosbot_ros2_firmware/releases/"
-            "download/0.11.0/firmware.bin"
+            f"download/{firmware_version}/firmware.bin"
         )
-        firmware_path = os.path.join(firmware_dir, "firmware.bin")
+        firmware_path = os.path.join(firmware_dir, f"firmware-{firmware_version}.bin")
         print("Downloading firmware...")
         download_firmware(firmware_url, firmware_path)
         return firmware_path

rosbot_utils/setup.py

@@ -20,7 +20,7 @@
 
 setup(
     name=package_name,
-    version="0.0.0",
+    version="0.12.0",
     packages=find_packages(exclude=["test"]),
     data_files=[
         ("share/ament_index/resource_index/packages", ["resource/" + package_name]),
@@ -29,10 +29,10 @@
     ],
     install_requires=["setuptools"],
     zip_safe=True,
-    maintainer="dominik",
-    maintainer_email="dominik.nwk@gmail.com",
-    description="TODO: Package description",
-    license="TODO: License declaration",
+    maintainer="Husarion",
+    maintainer_email="support@husarion.com",
+    description="Utilities for ROSbot 2R and 2 PRO",
+    license="Apache License 2.0",
     tests_require=["pytest"],
     entry_points={
         "console_scripts": ["flash_firmware = rosbot_utils.flash_firmware:main"],