From 39f46ceab67d241110855f727f0da7c96a7c09c9 Mon Sep 17 00:00:00 2001 From: Thad House Date: Tue, 5 Nov 2019 20:42:01 -0800 Subject: [PATCH] Don't allow rising and falling values to be read from AnalogTrigger (#2039) They can't be caught from user code --- hal/src/main/native/athena/AnalogTrigger.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/hal/src/main/native/athena/AnalogTrigger.cpp b/hal/src/main/native/athena/AnalogTrigger.cpp index 99a0d68a86..421b7794b9 100644 --- a/hal/src/main/native/athena/AnalogTrigger.cpp +++ b/hal/src/main/native/athena/AnalogTrigger.cpp @@ -254,10 +254,9 @@ HAL_Bool HAL_GetAnalogTriggerOutput(HAL_AnalogTriggerHandle analogTriggerHandle, result = trigger->trigger->readOutput_OverLimit(trigger->index, status); break; case HAL_Trigger_kRisingPulse: - result = trigger->trigger->readOutput_Rising(trigger->index, status); - break; case HAL_Trigger_kFallingPulse: - result = trigger->trigger->readOutput_Falling(trigger->index, status); + *status = ANALOG_TRIGGER_PULSE_OUTPUT_ERROR; + return false; break; } return result;