Change the msg name for motors

ryuichiueda · Oct 14, 2016 · 73d3fd8 · 73d3fd8
1 parent d005c18
commit 73d3fd8
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -48,7 +48,7 @@ add_message_files(
   FILES
   LightSensorValues.msg
   Switches.msg
-  LeftRightFreqs.msg
+  MotorFreqs.msg
 )
 
 # Generate services in the 'srv' folder

diff --git a/msg/LeftRightFreqs.msg → msg/MotorFreqs.msg b/msg/LeftRightFreqs.msg → msg/MotorFreqs.msg
diff --git a/scripts/check_driver_io.py b/scripts/check_driver_io.py
@@ -19,10 +19,10 @@ def switch_motors(onoff):
         return False
 
 def raw_control(left_hz,right_hz):
-    pub = rospy.Publisher('/raspimouse/motor_raw', LeftRightFreqs, queue_size=10)
+    pub = rospy.Publisher('/raspimouse/motor_raw', MotorFreqs, queue_size=10)
 
     if not rospy.is_shutdown():
-        d = LeftRightFreqs()
+        d = MotorFreqs()
         d.left = left_hz
         d.right = right_hz
         pub.publish(d)

diff --git a/scripts/rtmotor.py b/scripts/rtmotor.py
@@ -3,7 +3,7 @@
 import rospy
 from raspimouse_ros.srv import PutMotorFreqs
 from raspimouse_ros.srv import SwitchMotors
-from raspimouse_ros.msg import LeftRightFreqs
+from raspimouse_ros.msg import MotorFreqs
 from std_msgs.msg import Bool
 
 def callback_motor_sw(message):
@@ -49,7 +49,7 @@ def callback_put_freqs(message):
 
 def listner():
     rospy.init_node('rtmotor')
-    sub = rospy.Subscriber('motor_raw', LeftRightFreqs, callback_motor_raw)
+    sub = rospy.Subscriber('motor_raw', MotorFreqs, callback_motor_raw)
     srv = rospy.Service('switch_motors', SwitchMotors, callback_motor_sw)
     srv = rospy.Service('put_motor_freqs', PutMotorFreqs, callback_put_freqs)
     rospy.spin()

diff --git a/test/travis_test.bash b/test/travis_test.bash
@@ -5,7 +5,7 @@ sleep 20
 
 #publishing
 rostopic pub -1 /raspimouse/buzzer std_msgs/UInt16 -- 10
-rostopic pub -1 /raspimouse/motor_raw raspimouse_ros/LeftRightFreqs '123' '456'
+rostopic pub -1 /raspimouse/motor_raw raspimouse_ros/MotorFreqs '123' '456'
 
 #service call
 rosservice call /raspimouse/put_motor_freqs 'left: -300