Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-21 01:01:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "DigitalOutput: Fix enablePWM()."

Browse Source
This commit is contained in:
Thomas Clark (WPI)
2014-10-07 07:18:19 -07:00
committed by Gerrit Code Review
parent a4e8d65b71 f27df43b5b
commit ace43a6a12
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
wpilibj/wpilibJavaDevices/src/main/java/edu/wpi/first/wpilibj/DigitalOutput.java
View File

@@ -162,7 +162,7 @@ public class DigitalOutput extends DigitalSource implements LiveWindowSendable {
* The duty-cycle to start generating. [0..1]
*/
public void enablePWM(double initialDutyCycle) {
if (m_pwmGenerator == null)
if (m_pwmGenerator != null)
return;
ByteBuffer status = ByteBuffer.allocateDirect(4);
// set the byte order
@@ -181,6 +181,8 @@ public class DigitalOutput extends DigitalSource implements LiveWindowSendable {
* Free up one of the 4 DO PWM generator resources that were in use.
*/
public void disablePWM() {
if (m_pwmGenerator == null)
return;
// Disable the output by routing to a dead bit.
ByteBuffer status = ByteBuffer.allocateDirect(4);
// set the byte order
@@ -201,6 +203,8 @@ public class DigitalOutput extends DigitalSource implements LiveWindowSendable {
* The duty-cycle to change to. [0..1]
*/
public void updateDutyCycle(double dutyCycle) {
if (m_pwmGenerator == null)
return;
ByteBuffer status = ByteBuffer.allocateDirect(4);
// set the byte order
status.order(ByteOrder.LITTLE_ENDIAN);