Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-07-02 02:51:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Feed motor safety when StopMotor is called. Fixes artf1687 on FirstForge."

Browse Source
This commit is contained in:
Brad Miller (WPI)
2014-11-28 08:29:27 -08:00
committed by Gerrit Code Review
parent a9d30c0389 6e0c84d942
commit d62d82b28b
2 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
wpilibc/wpilibC++Devices/src/RobotDrive.cpp
View File

@@ -735,4 +735,5 @@ void RobotDrive::StopMotor()
if (m_frontRightMotor != NULL) m_frontRightMotor->Disable();
if (m_rearLeftMotor != NULL) m_rearLeftMotor->Disable();
if (m_rearRightMotor != NULL) m_rearRightMotor->Disable();
m_safetyHelper->Feed();
}

1
wpilibj/wpilibJavaDevices/src/main/java/edu/wpi/first/wpilibj/RobotDrive.java
View File

@@ -739,6 +739,7 @@ public class RobotDrive implements MotorSafety {
if (m_rearRightMotor != null) {
m_rearRightMotor.set(0.0);
}
if (m_safetyHelper != null) m_safetyHelper.feed();
}
private void setupMotorSafety() {