Fix hang on getMotors()

bbot · Jun 1, 2016 · b9615b7 · b9615b7
1 parent 32258db
commit b9615b7
Showing 1 changed file with 11 additions and 27 deletions.
diff --git a/neato_driver/src/neato_driver/neato_driver.py b/neato_driver/src/neato_driver/neato_driver.py
@@ -63,36 +63,20 @@
                 "RSIDEBIT",
                 "RFRONTBIT" ]
 
-xv11_motor_info = [ "Brush_MaxPWM",
-                "Brush_PWM",
-                "Brush_mVolts",
-                "Brush_Encoder",
-                "Brush_RPM",
-                "Vacuum_MaxPWM",
-                "Vacuum_PWM",
-                "Vacuum_CurrentInMA",
-                "Vacuum_Encoder",
+xv11_motor_info = [ "Brush_RPM",
+                "Brush_mA",
                 "Vacuum_RPM",
-                "LeftWheel_MaxPWM",
-                "LeftWheel_PWM",
-                "LeftWheel_mVolts",
-                "LeftWheel_Encoder",
-                "LeftWheel_PositionInMM",
+                "Vacuum_mA",
                 "LeftWheel_RPM",
-                "RightWheel_MaxPWM",
-                "RightWheel_PWM",
-                "RightWheel_mVolts",
-                "RightWheel_Encoder",
-                "RightWheel_PositionInMM",
+                "LeftWheel_Load%",
+                "LeftWheel_PositionInMM",
+                "LeftWheel_Speed",
                 "RightWheel_RPM",
-                "Laser_MaxPWM",
-                "Laser_PWM",
-                "Laser_mVolts",
-                "Laser_Encoder",
-                "Laser_RPM",
-                "Charger_MaxPWM",
-                "Charger_PWM",
-                "Charger_mAH" ]
+                "RightWheel_Load%",
+                "RightWheel_PositionInMM",
+                "RightWheel_Speed",
+                "Charger_mAH",
+		"SideBrush_mA", ]
 
 xv11_charger_info = [ "FuelPercent",
                 "BatteryOverTemp",