commit e06e25111d2b7ebdf3e1e2c2816620124628085d
author James Kuszmaul <james@james-HP-ubuntu.(none)> Sat Mar 02 15:04:53 2013 -0800
committer Austin Schuh <austin.linux@gmail.com> Tue Mar 05 21:34:45 2013 -0800
tree c53a5ab728292c9574664f7c56e7ac49ef9990d9
parent 6896171ae780545a2ea18f8c388a65b59977c99c

Renamed wrist constants.

frc971/control_loops/wrist.cc

diff --git a/frc971/control_loops/wrist.cc b/frc971/control_loops/wrist.cc
index de62580..5bdce25 100644
--- a/frc971/control_loops/wrist.cc
+++ b/frc971/control_loops/wrist.cc
@@ -25,22 +25,22 @@
 }
 
 bool WristMotor::FetchConstants() {
-  if (!constants::horizontal_lower_limit(&horizontal_lower_limit_)) {
-    LOG(ERROR, "Failed to fetch the horizontal lower limit constant.\n");
+  if (!constants::wrist_lower_limit(&wrist_lower_limit_)) {
+    LOG(ERROR, "Failed to fetch the wrist lower limit constant.\n");
     return false;
   }
-  if (!constants::horizontal_upper_limit(&horizontal_upper_limit_)) {
-    LOG(ERROR, "Failed to fetch the horizontal upper limit constant.\n");
+  if (!constants::wrist_upper_limit(&wrist_upper_limit_)) {
+    LOG(ERROR, "Failed to fetch the wrist upper limit constant.\n");
     return false;
   }
-  if (!constants::horizontal_hall_effect_start_angle(
-          &horizontal_hall_effect_start_angle_)) {
-    LOG(ERROR, "Failed to fetch the horizontal start angle constant.\n");
+  if (!constants::wrist_hall_effect_start_angle(
+          &wrist_hall_effect_start_angle_)) {
+    LOG(ERROR, "Failed to fetch the wrist start angle constant.\n");
     return false;
   }
-  if (!constants::horizontal_zeroing_speed(
-          &horizontal_zeroing_speed_)) {
-    LOG(ERROR, "Failed to fetch the horizontal zeroing speed constant.\n");
+  if (!constants::wrist_zeroing_speed(
+          &wrist_zeroing_speed_)) {
+    LOG(ERROR, "Failed to fetch the wrist zeroing speed constant.\n");
     return false;
   }
 
@@ -48,18 +48,18 @@
 }
 
 double WristMotor::ClipGoal(double goal) const {
-  return std::min(horizontal_upper_limit_,
-                  std::max(horizontal_lower_limit_, goal));
+  return std::min(wrist_upper_limit_,
+                  std::max(wrist_lower_limit_, goal));
 }
 
 const double kMaxZeroingVoltage = 5.0;
 
 void WristMotor::WristStateFeedbackLoop::CapU() {
   if (wrist_motor_->state_ == READY) {
-    if (Y(0, 0) >= wrist_motor_->horizontal_upper_limit_) {
+    if (Y(0, 0) >= wrist_motor_->wrist_upper_limit_) {
       U(0, 0) = std::min(0.0, U(0, 0));
     }
-    if (Y(0, 0) <= wrist_motor_->horizontal_lower_limit_) {
+    if (Y(0, 0) <= wrist_motor_->wrist_lower_limit_) {
       U(0, 0) = std::max(0.0, U(0, 0));
     }
   }
@@ -104,7 +104,7 @@
   double absolute_position;
   if (position) {
     absolute_position =
-        position->pos + horizontal_hall_effect_start_angle_;
+        position->pos + wrist_hall_effect_start_angle_;
     if (state_ == READY) {
       absolute_position -= zero_offset_;
     }
@@ -146,8 +146,8 @@
         state_ = ZEROING;
       } else {
         // Slowly creep off the sensor.
-        zeroing_position_ -= horizontal_zeroing_speed_ / 100;
-        loop_->R << zeroing_position_, -horizontal_zeroing_speed_;
+        zeroing_position_ -= wrist_zeroing_speed_ / 100;
+        loop_->R << zeroing_position_, -wrist_zeroing_speed_;
         break;
       }
     case ZEROING:
@@ -176,8 +176,8 @@
         }
       } else {
         // Slowly creep towards the sensor.
-        zeroing_position_ += horizontal_zeroing_speed_ / 100;
-        loop_->R << zeroing_position_, horizontal_zeroing_speed_;
+        zeroing_position_ += wrist_zeroing_speed_ / 100;
+        loop_->R << zeroing_position_, wrist_zeroing_speed_;
       }
       break;