Merge "Clear error buffer total when clearing the buffer contents"

wpilibc/Athena/src/PIDController.cpp

@@ -352,6 +352,7 @@ void PIDController::SetSetpoint(float setpoint) {
 
     // Clear m_buf.
     m_buf = std::queue<double>();
+    m_bufTotal = 0;
   }
 
   if (m_table != nullptr) {

wpilibj/src/shared/java/edu/wpi/first/wpilibj/PIDController.java

@@ -510,6 +510,7 @@ public class PIDController implements PIDInterface, LiveWindowSendable, Controll
     }
 
     m_buf.clear();
+    m_bufTotal = 0;
 
     if (table != null)
       table.putNumber("setpoint", m_setpoint);