From a1267204d5403a3fcd20f680be75cc6753366ca9 Mon Sep 17 00:00:00 2001 From: pyr0ball Date: Thu, 16 Jan 2020 11:22:18 -0800 Subject: [PATCH] changed error LED behavor to instead indicate a trigger event #featureadd --- .../src/Pyr0_Piezo_Sensor_V2.x.x.cpp | 6 ++--- .../src/pP_function.h | 27 ++++++++++++------- 2 files changed, 20 insertions(+), 13 deletions(-) diff --git a/firmware/AVR-Source/Pyr0_Piezo_Sensor_v2.x.x/src/Pyr0_Piezo_Sensor_V2.x.x.cpp b/firmware/AVR-Source/Pyr0_Piezo_Sensor_v2.x.x/src/Pyr0_Piezo_Sensor_V2.x.x.cpp index efbbcc2..a162727 100644 --- a/firmware/AVR-Source/Pyr0_Piezo_Sensor_v2.x.x/src/Pyr0_Piezo_Sensor_V2.x.x.cpp +++ b/firmware/AVR-Source/Pyr0_Piezo_Sensor_v2.x.x/src/Pyr0_Piezo_Sensor_V2.x.x.cpp @@ -183,11 +183,11 @@ void loop() { if (BlinkCount > 0) { BlinkState = !BlinkState; digitalWriteFast(ERR_LED, BlinkState); - digitalWriteFast(TRG_OUT, BlinkState); +// digitalWriteFast(TRG_OUT, BlinkState); --BlinkCount; - } else { +// } else { // Check for error state - checkError(); +// checkError(); } // Print state if debug is on diff --git a/firmware/AVR-Source/Pyr0_Piezo_Sensor_v2.x.x/src/pP_function.h b/firmware/AVR-Source/Pyr0_Piezo_Sensor_v2.x.x/src/pP_function.h index dd2fd54..7c66426 100644 --- a/firmware/AVR-Source/Pyr0_Piezo_Sensor_v2.x.x/src/pP_function.h +++ b/firmware/AVR-Source/Pyr0_Piezo_Sensor_v2.x.x/src/pP_function.h @@ -25,12 +25,19 @@ int inline analogReadFast(byte ADCpin) /*------------------------------------------------*/ +void doubleFlash() { + BlinkCount = 4 ; +} + +/*------------------------------------------------*/ + void pulse() { digitalWriteFast(TRG_OUT, LOGIC); sensorHReading = 1; delay(TRG_DUR); digitalWriteFast(TRG_OUT, !LOGIC); Serial.println("Trig'd!"); + doubleFlash(); } /*------------------------------------------------*/ @@ -164,16 +171,16 @@ void adjustGain() { /*------------------------------------------------*/ -void checkError () { - if (ERR_STATE == 1) { - digitalWriteFast(ERR_LED, BlinkState); - BlinkState = !BlinkState; - } - else if (ERR_STATE == 0) { - BlinkState = LOW; - digitalWriteFast(ERR_LED, BlinkState); - } -} +//void checkError () { +// if (ERR_STATE == 1) { +// digitalWriteFast(ERR_LED, BlinkState); +// BlinkState = !BlinkState; +// } +// else if (ERR_STATE == 0) { +// BlinkState = LOW; +// digitalWriteFast(ERR_LED, BlinkState); +// } +//} /*------------------------------------------------*/