Rebase from 'release/melodic/fadecandy_driver'

iron-ox · Jul 7, 2020 · 0227ec3 · 0227ec3
1 parent a60e81d
commit 0227ec3
Show file tree

Hide file tree

Showing 12 changed files with 26 additions and 102 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -2,6 +2,20 @@
 Changelog for package fadecandy_driver
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+0.1.2 (2020-07-06)
+------------------
+* Merge pull request `#10 <https://github.com/iron-ox/fadecandy_ros/issues/10>`_ from eurogroep/chore/log-io-error
+  chore: log IO error
+* Merge pull request `#9 <https://github.com/iron-ox/fadecandy_ros/issues/9>`_ from eurogroep/fix/rospy-shutdown
+  fix(shutdown): Shutdown gracefully when no connection was set-up
+* Contributors: Rein Appeldoorn
+
+0.1.1 (2020-06-03)
+------------------
+* Merge pull request `#7 <https://github.com/iron-ox/fadecandy_ros/issues/7>`_ from jonbinney/python3-fixes
+  Fixes for python3/noetic compatibility
+* Contributors: Jon Binney
+
 0.1.0 (2020-05-28)
 ------------------
 

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -7,7 +7,8 @@ catkin_python_setup()
 
 catkin_package()
 
-install(PROGRAMS
-  scripts/fadecandy_node
-  DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
-)
+catkin_install_python(
+    PROGRAMS
+    scripts/fadecandy_node
+    DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
+    )
diff --git a/debian/changelog.em b/debian/changelog.em
diff --git a/debian/compat.em b/debian/compat.em
diff --git a/debian/control.em b/debian/control.em
diff --git a/debian/copyright.em b/debian/copyright.em
diff --git a/debian/gbp.conf.em b/debian/gbp.conf.em
diff --git a/debian/rules.em b/debian/rules.em
diff --git a/debian/source/format.em b/debian/source/format.em
diff --git a/debian/source/options.em b/debian/source/options.em
diff --git a/package.xml b/package.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package format="3">
   <name>fadecandy_driver</name>
-  <version>0.1.0</version>
+  <version>0.1.2</version>
   <description>ROS driver for fadecandy LED controllers</description>
 
   <maintainer email="jon.binney@ironox.com">Jon Binney</maintainer>
@@ -12,6 +12,7 @@
 
   <exec_depend>diagnostic_updater</exec_depend>
   <exec_depend>fadecandy_msgs</exec_depend>
-  <exec_depend>python-usb</exec_depend>
+  <exec_depend condition="$ROS_PYTHON_VERSION == 2">python-usb</exec_depend>
+  <exec_depend condition="$ROS_PYTHON_VERSION == 3">python3-usb</exec_depend>
   <exec_depend>rospy</exec_depend>
 </package>
diff --git a/src/fadecandy_driver/fadecandy_node.py b/src/fadecandy_driver/fadecandy_node.py
@@ -11,12 +11,14 @@ def __init__(self):
         while not rospy.is_shutdown():
             try:
                 self._driver = FadecandyDriver()
-            except IOError:
-                rospy.logwarn_once('Failed to connect to Fadecandy device; will retry every second')
+            except IOError as e:
+                rospy.logwarn_once('Failed to connect to Fadecandy device: %s; will retry every second', e)
             else:
                 rospy.loginfo('Connected to Fadecandy device')
                 break
             connection_retry_rate.sleep()
+        else:
+            return
 
         self._set_leds_sub = rospy.Subscriber('set_leds', LEDArray, self._set_leds)