|
@@ -18,6 +18,7 @@ from ros_arduino_python.arduino_sensors import *
|
|
|
from ros_arduino_python.arduino_driver import Arduino
|
|
|
from ros_arduino_python.base_controller import BaseController
|
|
|
|
|
|
+
|
|
|
class ArduinoROS():
|
|
|
def __init__(self):
|
|
|
rospy.init_node('mobilebase_arduino_node', log_level=rospy.INFO)
|
|
@@ -110,10 +111,6 @@ class ArduinoROS():
|
|
|
sensor = AnalogSensor(self.controller, name, params['pin'], params['rate'], self.base_frame, direction=params['direction'])
|
|
|
elif params['type'] == 'BAT_PERCENT':
|
|
|
sensor = BatPercent(self.controller, name, params['pin'], params['rate'], self.base_frame)
|
|
|
- elif params['type'] == 'MotorTotalCurrent':
|
|
|
- sensor = MotorTotalCurrent(self.controller, name, params['pin'], params['rate'], self.base_frame)
|
|
|
- elif params['type'] == 'CurrentValue':
|
|
|
- sensor = CurrentValue(self.controller, name, params['pin'], params['rate'], self.base_frame)
|
|
|
|
|
|
try:
|
|
|
self.mySensors.append(sensor)
|
|
@@ -170,12 +167,12 @@ class ArduinoROS():
|
|
|
return GripperControlResponse()
|
|
|
|
|
|
def GripperAngleHandler(self, req):
|
|
|
- self.controller.gripper_angle(req.servoID, req.angle)
|
|
|
+ self.controller.gripper_angle(req.servoID, req.angle, req.delay)
|
|
|
return GripperAngleResponse()
|
|
|
|
|
|
def GetInfraredDistanceHandler(self, req):
|
|
|
value = self.controller.detect_distance()
|
|
|
- return GetInfraredDistanceResponse(value[0]/100.0,value[1]/100.0,value[2]/100.0)
|
|
|
+ return GetInfraredDistanceResponse(value[0]/100.0, value[1]/100.0, value[2]/100.0)
|
|
|
|
|
|
def DynamicPIDHandler(self, req):
|
|
|
self.controller.update_pid(req.A_kp, req.A_kd, 0, 10,
|