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

Adds PWM to LoopTiming and CycleStart HAL calls (#693)

Browse Source
This commit is contained in:
Thad House
2017-10-27 19:44:40 -07:00
committed by Peter Johnson
parent f34332643a
commit 90f99dc571
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
hal/src/main/native/athena/PWM.cpp
View File

@@ -118,7 +118,7 @@ void HAL_SetPWMConfig(HAL_DigitalHandle pwmPortHandle, double max,
// calculate the loop time in milliseconds
double loopTime =
HAL_GetLoopTiming(status) / (kSystemClockTicksPerMicrosecond * 1e3);
HAL_GetPWMLoopTiming(status) / (kSystemClockTicksPerMicrosecond * 1e3);
if (*status != 0) return;
int32_t maxPwm = static_cast<int32_t>((max - kDefaultPwmCenter) / loopTime +
@@ -444,7 +444,7 @@ void HAL_SetPWMPeriodScale(HAL_DigitalHandle pwmPortHandle, int32_t squelchMask,
*
* @return The loop time
*/
int32_t HAL_GetLoopTiming(int32_t* status) {
int32_t HAL_GetPWMLoopTiming(int32_t* status) {
initializeDigital(status);
if (*status != 0) return 0;
return pwmSystem->readLoopTiming(status);
@@ -455,7 +455,7 @@ int32_t HAL_GetLoopTiming(int32_t* status) {
*
* @return The pwm cycle start time.
*/
uint64_t HAL_GetCycleStartTime(int32_t* status) {
uint64_t HAL_GetPWMCycleStartTime(int32_t* status) {
initializeDigital(status);
if (*status != 0) return 0;
uint64_t upper1 = pwmSystem->readCycleStartTimeUpper(status);