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

Fix various duty cycle bugs (#2047)

Browse Source
This commit is contained in:
Thad House
2019-11-06 14:05:25 -08:00
committed by Peter Johnson
parent 1f6850adf2
commit 384d00f9e6
4 changed files with 4 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
hal/src/main/native/athena/AnalogTrigger.cpp
View File

@@ -154,7 +154,7 @@ void HAL_SetAnalogTriggerLimitsDutyCycle(
trigger->trigger->writeLowerLimit(static_cast<int32_t>(scaleFactor * lower),
status);
trigger->trigger->writeLowerLimit(static_cast<int32_t>(scaleFactor * upper),
trigger->trigger->writeUpperLimit(static_cast<int32_t>(scaleFactor * upper),
status);
}

3
hal/src/main/native/athena/DutyCycle.cpp
View File

@@ -88,7 +88,8 @@ int32_t HAL_GetDutyCycleFrequency(HAL_DutyCycleHandle dutyCycleHandle,
double HAL_GetDutyCycleOutput(HAL_DutyCycleHandle dutyCycleHandle,
int32_t* status) {
return HAL_GetDutyCycleOutputRaw(dutyCycleHandle, status) / kScaleFactor;
return HAL_GetDutyCycleOutputRaw(dutyCycleHandle, status) /
static_cast<double>(kScaleFactor);
}
int32_t HAL_GetDutyCycleOutputRaw(HAL_DutyCycleHandle dutyCycleHandle,

18
hal/src/main/native/sim/AnalogTrigger.cpp
View File

@@ -179,25 +179,7 @@ void HAL_SetAnalogTriggerAveraged(HAL_AnalogTriggerHandle analogTriggerHandle,
: HALSIM_AnalogTriggerUnassigned;
triggerData->triggerMode = setVal;
}
void HAL_SetAnalogTriggerDutyCycle(HAL_AnalogTriggerHandle analogTriggerHandle,
HAL_Bool useDutyCycle, int32_t* status) {
auto trigger = analogTriggerHandles->Get(analogTriggerHandle);
if (trigger == nullptr) {
*status = HAL_HANDLE_ERROR;
return;
}
AnalogTriggerData* triggerData = &SimAnalogTriggerData[trigger->index];
if (triggerData->triggerMode.Get() != HALSIM_AnalogTriggerUnassigned) {
*status = INCOMPATIBLE_STATE;
return;
}
auto setVal = useDutyCycle ? HALSIM_AnalogTriggerDutyCycle
: HALSIM_AnalogTriggerUnassigned;
triggerData->triggerMode = setVal;
}
void HAL_SetAnalogTriggerFiltered(HAL_AnalogTriggerHandle analogTriggerHandle,
HAL_Bool useFilteredValue, int32_t* status) {
auto trigger = analogTriggerHandles->Get(analogTriggerHandle);