Merge branch 'master' of https://git.runcible.io/ros/simple_example

4 years ago · ee167b0742
parent 3e43bfc16b 37b2adbedc
commit ee167b0742
1 changed files with 5 additions and 0 deletions
--- a/scripts/NeopixelDriver.py
+++ b/scripts/NeopixelDriver.py
@ -17,8 +17,13 @@ class NeopixelDriverNode:
        self.serial = Serial(self.port, 115200, timeout=1)

    def listen(self):
+<<<<<<< HEAD
        rospy.init_node("light_ctrl", anonymous=True)
        rospy.Subscriber("/neopixel", self._msg, self.neopixel_ctrl_callback)
+=======
+        rospy.init_node("light_ctrl", anonymous=True, log_level=rospy.INFO)
+        rospy.Subscriber("/neopixel", Neopixels, self.neopixel_ctrl_callback)
+>>>>>>> 37b2adbedcf87e091d5ebd6efde78e86c64171d8
        rate = rospy.spin()

    def neopixel_ctrl_callback(self, data):