Cleaned up variable names for std::lock_guard and their associated mutexes (#759)

wpilibc/src/main/native/cpp/PIDController.cpp

@@ -136,7 +136,7 @@ void PIDController::Calculate() {
   PIDOutput* pidOutput;
 
   {
-    std::lock_guard<wpi::mutex> sync(m_mutex);
+    std::lock_guard<wpi::mutex> lock(m_mutex);
     pidInput = m_pidInput;
     pidOutput = m_pidOutput;
     enabled = m_enabled;
@@ -148,7 +148,7 @@ void PIDController::Calculate() {
   if (enabled) {
     double feedForward = CalculateFeedForward();
 
-    std::lock_guard<wpi::mutex> sync(m_mutex);
+    std::lock_guard<wpi::mutex> lock(m_mutex);
     double input = pidInput->PIDGet();
     double result;
     PIDOutput* pidOutput;
@@ -219,7 +219,7 @@ double PIDController::CalculateFeedForward() {
  */
 void PIDController::SetPID(double p, double i, double d) {
   {
-    std::lock_guard<wpi::mutex> sync(m_mutex);
+    std::lock_guard<wpi::mutex> lock(m_mutex);
     m_P = p;
     m_I = i;
     m_D = d;
@@ -242,7 +242,7 @@ void PIDController::SetPID(double p, double i, double d) {
  */
 void PIDController::SetPID(double p, double i, double d, double f) {
   {
-    std::lock_guard<wpi::mutex> sync(m_mutex);
+    std::lock_guard<wpi::mutex> lock(m_mutex);
     m_P = p;
     m_I = i;
     m_D = d;
@@ -261,7 +261,7 @@ void PIDController::SetPID(double p, double i, double d, double f) {
  * @return proportional coefficient
  */
 double PIDController::GetP() const {
-  std::lock_guard<wpi::mutex> sync(m_mutex);
+  std::lock_guard<wpi::mutex> lock(m_mutex);
   return m_P;
 }
 
@@ -271,7 +271,7 @@ double PIDController::GetP() const {
  * @return integral coefficient
  */
 double PIDController::GetI() const {
-  std::lock_guard<wpi::mutex> sync(m_mutex);
+  std::lock_guard<wpi::mutex> lock(m_mutex);
   return m_I;
 }
 
@@ -281,7 +281,7 @@ double PIDController::GetI() const {
  * @return differential coefficient
  */
 double PIDController::GetD() const {
-  std::lock_guard<wpi::mutex> sync(m_mutex);
+  std::lock_guard<wpi::mutex> lock(m_mutex);
   return m_D;
 }
 
@@ -291,7 +291,7 @@ double PIDController::GetD() const {
  * @return Feed forward coefficient
  */
 double PIDController::GetF() const {
-  std::lock_guard<wpi::mutex> sync(m_mutex);
+  std::lock_guard<wpi::mutex> lock(m_mutex);
   return m_F;
 }
 
@@ -303,7 +303,7 @@ double PIDController::GetF() const {
  * @return the latest calculated output
  */
 double PIDController::Get() const {
-  std::lock_guard<wpi::mutex> sync(m_mutex);
+  std::lock_guard<wpi::mutex> lock(m_mutex);
   return m_result;
 }
 
@@ -317,7 +317,7 @@ double PIDController::Get() const {
  * @param continuous true turns on continuous, false turns off continuous
  */
 void PIDController::SetContinuous(bool continuous) {
-  std::lock_guard<wpi::mutex> sync(m_mutex);
+  std::lock_guard<wpi::mutex> lock(m_mutex);
   m_continuous = continuous;
 }
 
@@ -329,7 +329,7 @@ void PIDController::SetContinuous(bool continuous) {
  */
 void PIDController::SetInputRange(double minimumInput, double maximumInput) {
   {
-    std::lock_guard<wpi::mutex> sync(m_mutex);
+    std::lock_guard<wpi::mutex> lock(m_mutex);
     m_minimumInput = minimumInput;
     m_maximumInput = maximumInput;
   }
@@ -344,7 +344,7 @@ void PIDController::SetInputRange(double minimumInput, double maximumInput) {
  * @param maximumOutput the maximum value to write to the output
  */
 void PIDController::SetOutputRange(double minimumOutput, double maximumOutput) {
-  std::lock_guard<wpi::mutex> sync(m_mutex);
+  std::lock_guard<wpi::mutex> lock(m_mutex);
   m_minimumOutput = minimumOutput;
   m_maximumOutput = maximumOutput;
 }
@@ -356,7 +356,7 @@ void PIDController::SetOutputRange(double minimumOutput, double maximumOutput) {
  */
 void PIDController::SetSetpoint(double setpoint) {
   {
-    std::lock_guard<wpi::mutex> sync(m_mutex);
+    std::lock_guard<wpi::mutex> lock(m_mutex);
 
     if (m_maximumInput > m_minimumInput) {
       if (setpoint > m_maximumInput)
@@ -379,7 +379,7 @@ void PIDController::SetSetpoint(double setpoint) {
  * @return the current setpoint
  */
 double PIDController::GetSetpoint() const {
-  std::lock_guard<wpi::mutex> sync(m_mutex);
+  std::lock_guard<wpi::mutex> lock(m_mutex);
   return m_setpoint;
 }
 
@@ -389,7 +389,7 @@ double PIDController::GetSetpoint() const {
  * @return the change in setpoint over time
  */
 double PIDController::GetDeltaSetpoint() const {
-  std::lock_guard<wpi::mutex> sync(m_mutex);
+  std::lock_guard<wpi::mutex> lock(m_mutex);
   return (m_setpoint - m_prevSetpoint) / m_setpointTimer.Get();
 }
 
@@ -401,7 +401,7 @@ double PIDController::GetDeltaSetpoint() const {
 double PIDController::GetError() const {
   double setpoint = GetSetpoint();
   {
-    std::lock_guard<wpi::mutex> sync(m_mutex);
+    std::lock_guard<wpi::mutex> lock(m_mutex);
     return GetContinuousError(setpoint - m_pidInput->PIDGet());
   }
 }
@@ -438,7 +438,7 @@ PIDSourceType PIDController::GetPIDSourceType() const {
  * @param percentage error which is tolerable
  */
 void PIDController::SetTolerance(double percent) {
-  std::lock_guard<wpi::mutex> sync(m_mutex);
+  std::lock_guard<wpi::mutex> lock(m_mutex);
   m_toleranceType = kPercentTolerance;
   m_tolerance = percent;
 }
@@ -450,7 +450,7 @@ void PIDController::SetTolerance(double percent) {
  * @param percentage error which is tolerable
  */
 void PIDController::SetAbsoluteTolerance(double absTolerance) {
-  std::lock_guard<wpi::mutex> sync(m_mutex);
+  std::lock_guard<wpi::mutex> lock(m_mutex);
   m_toleranceType = kAbsoluteTolerance;
   m_tolerance = absTolerance;
 }
@@ -462,7 +462,7 @@ void PIDController::SetAbsoluteTolerance(double absTolerance) {
  * @param percentage error which is tolerable
  */
 void PIDController::SetPercentTolerance(double percent) {
-  std::lock_guard<wpi::mutex> sync(m_mutex);
+  std::lock_guard<wpi::mutex> lock(m_mutex);
   m_toleranceType = kPercentTolerance;
   m_tolerance = percent;
 }
@@ -478,7 +478,7 @@ void PIDController::SetPercentTolerance(double percent) {
  * @param bufLength Number of previous cycles to average. Defaults to 1.
  */
 void PIDController::SetToleranceBuffer(int bufLength) {
-  std::lock_guard<wpi::mutex> sync(m_mutex);
+  std::lock_guard<wpi::mutex> lock(m_mutex);
 
   // Create LinearDigitalFilter with original source as its source argument
   m_filter = LinearDigitalFilter::MovingAverage(m_origSource, bufLength);
@@ -499,7 +499,7 @@ void PIDController::SetToleranceBuffer(int bufLength) {
 bool PIDController::OnTarget() const {
   double error = GetError();
 
-  std::lock_guard<wpi::mutex> sync(m_mutex);
+  std::lock_guard<wpi::mutex> lock(m_mutex);
   switch (m_toleranceType) {
     case kPercentTolerance:
       return std::fabs(error) <
@@ -520,7 +520,7 @@ bool PIDController::OnTarget() const {
  */
 void PIDController::Enable() {
   {
-    std::lock_guard<wpi::mutex> sync(m_mutex);
+    std::lock_guard<wpi::mutex> lock(m_mutex);
     m_enabled = true;
   }
 
@@ -532,7 +532,7 @@ void PIDController::Enable() {
  */
 void PIDController::Disable() {
   {
-    std::lock_guard<wpi::mutex> sync(m_mutex);
+    std::lock_guard<wpi::mutex> lock(m_mutex);
     m_pidOutput->PIDWrite(0);
     m_enabled = false;
   }
@@ -544,7 +544,7 @@ void PIDController::Disable() {
  * Return true if PIDController is enabled.
  */
 bool PIDController::IsEnabled() const {
-  std::lock_guard<wpi::mutex> sync(m_mutex);
+  std::lock_guard<wpi::mutex> lock(m_mutex);
   return m_enabled;
 }
 
@@ -554,7 +554,7 @@ bool PIDController::IsEnabled() const {
 void PIDController::Reset() {
   Disable();
 
-  std::lock_guard<wpi::mutex> sync(m_mutex);
+  std::lock_guard<wpi::mutex> lock(m_mutex);
   m_prevError = 0;
   m_totalError = 0;
   m_result = 0;
@@ -583,7 +583,7 @@ void PIDController::InitTable(std::shared_ptr<nt::NetworkTable> subtable) {
     m_pListener = m_pEntry.AddListener(
         [=](const nt::EntryNotification& event) {
           if (!event.value->IsDouble()) return;
-          std::lock_guard<wpi::mutex> sync(m_mutex);
+          std::lock_guard<wpi::mutex> lock(m_mutex);
           m_P = event.value->GetDouble();
         },
         NT_NOTIFY_NEW | NT_NOTIFY_UPDATE);
@@ -591,7 +591,7 @@ void PIDController::InitTable(std::shared_ptr<nt::NetworkTable> subtable) {
     m_iListener = m_iEntry.AddListener(
         [=](const nt::EntryNotification& event) {
           if (!event.value->IsDouble()) return;
-          std::lock_guard<wpi::mutex> sync(m_mutex);
+          std::lock_guard<wpi::mutex> lock(m_mutex);
           m_I = event.value->GetDouble();
         },
         NT_NOTIFY_NEW | NT_NOTIFY_UPDATE);
@@ -599,7 +599,7 @@ void PIDController::InitTable(std::shared_ptr<nt::NetworkTable> subtable) {
     m_dListener = m_dEntry.AddListener(
         [=](const nt::EntryNotification& event) {
           if (!event.value->IsDouble()) return;
-          std::lock_guard<wpi::mutex> sync(m_mutex);
+          std::lock_guard<wpi::mutex> lock(m_mutex);
           m_D = event.value->GetDouble();
         },
         NT_NOTIFY_NEW | NT_NOTIFY_UPDATE);
@@ -607,7 +607,7 @@ void PIDController::InitTable(std::shared_ptr<nt::NetworkTable> subtable) {
     m_fListener = m_fEntry.AddListener(
         [=](const nt::EntryNotification& event) {
           if (!event.value->IsDouble()) return;
-          std::lock_guard<wpi::mutex> sync(m_mutex);
+          std::lock_guard<wpi::mutex> lock(m_mutex);
           m_F = event.value->GetDouble();
         },
         NT_NOTIFY_NEW | NT_NOTIFY_UPDATE);