Ver código fonte

删除获取电流传感器信息并发布的话题代码

corvin rasp melodic 4 anos atrás
pai
commit
eb0dc081cd

+ 1 - 1
src/CMakeLists.txt

@@ -1 +1 @@
-/opt/ros/kinetic/catkin/cmake/toplevel.cmake
+/opt/ros/melodic/share/catkin/cmake/toplevel.cmake

+ 2 - 3
src/ros_arduino_bridge/ros_arduino_python/config/my_arduino_params.yaml

@@ -45,12 +45,12 @@ debugPID: False
 accel_limit: 0.05
 
 AWheel_Kp: 22
-AWheel_Kd: 34
+AWheel_Kd: 30
 AWheel_Ki: 0
 AWheel_Ko: 50
 
 BWheel_Kp: 22
-BWheel_Kd: 24
+BWheel_Kd: 30
 BWheel_Ki: 0
 BWheel_Ko: 50
 
@@ -63,6 +63,5 @@ CWheel_Ko: 50
 sensors: {
   GP2Y0A41: {pin: 0, type: GP2Y0A41, rate: 5, direction: input},
   batPercent: {pin: 0, type: BAT_PERCENT, rate: 0.1, direction: input},
-  CurrentValue: {pin: 0, type: CurrentValue, rate: 0.1, direction: input}
 }
 

+ 0 - 1
src/ros_arduino_bridge/ros_arduino_python/nodes/arduino_node.py

@@ -199,7 +199,6 @@ class ArduinoROS():
             pass
         finally:
             os._exit(0)
-    
 
 if __name__ == '__main__':
     try: