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

Merge "Use either DO PWM A or B not A and B and update javadoc to reflect 6 generators (artf3698)"

Browse Source
This commit is contained in:
Brad Miller (WPI)
2014-10-24 12:10:42 -07:00
committed by Gerrit Code Review
parent 8ebf88b741 62790c0f47
commit 66b7a8b66e
3 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
hal/lib/Athena/Digital.cpp
View File

@@ -296,8 +296,10 @@ void setPWMDutyCycle(void* pwmGenerator, double dutyCycle, int32_t *status) {
// The resolution of the duty cycle drops close to the highest frequencies.
rawDutyCycle = rawDutyCycle / pow(2.0, 4 - pwmPeriodPower);
}
digitalSystem->writePWMDutyCycleA(id, (uint8_t)rawDutyCycle, status);
digitalSystem->writePWMDutyCycleB(id, (uint8_t)rawDutyCycle, status);
if(id < 4)
digitalSystem->writePWMDutyCycleA(id, (uint8_t)rawDutyCycle, status);
else
digitalSystem->writePWMDutyCycleB(id - 3, (uint8_t)rawDutyCycle, status);
}
}