Merged in the stuff most recently on the robot.
diff --git a/frc971/control_loops/python/claw.py b/frc971/control_loops/python/claw.py
index aacf31e..ca69a2b 100755
--- a/frc971/control_loops/python/claw.py
+++ b/frc971/control_loops/python/claw.py
@@ -23,6 +23,7 @@
# measured from CAD
self.J_top = 0.3
self.J_bottom = 0.9
+
# Resistance of the motor
self.R = 12.0 / self.stall_current
# Motor velocity constant
@@ -144,8 +145,8 @@
print "eigenvalues"
print numpy.linalg.eig(F)[0]
- self.rpl = .05
- self.ipl = 0.008
+ self.rpl = .02
+ self.ipl = 0.004
self.PlaceObserverPoles([self.rpl + 1j * self.ipl,
self.rpl + 1j * self.ipl,
self.rpl - 1j * self.ipl,