From 991c309653e4cbe5fc46a1da92f3397be8ec7596 Mon Sep 17 00:00:00 2001 From: BobLakensi Date: Sat, 17 Jun 2017 10:53:01 -0700 Subject: [PATCH] method to inti chrono readings now initDisplayChronoReadings --- SmartBlaster/SmartBlaster.cpp | 6 +++--- SmartBlaster/SmartBlaster.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/SmartBlaster/SmartBlaster.cpp b/SmartBlaster/SmartBlaster.cpp index 0d19352..198a1c2 100644 --- a/SmartBlaster/SmartBlaster.cpp +++ b/SmartBlaster/SmartBlaster.cpp @@ -143,7 +143,7 @@ void SmartBlaster::initDisplayAmmo (void) { displayValues(); } -void SmartBlaster::initDisplayChrono (double fps) { +void SmartBlaster::initDisplayChronoReadings (double fps) { if (fps == -1) { _chronoToPrint = ("ERR"); } else if (fps == -2) { @@ -189,14 +189,14 @@ void SmartBlaster::chrono(void) { //when tripped and expecting second value } else if ( (_tripTime != -10) && (_exitTime == -10) && (map(analogRead(_AMMO_COUNTING_INPUT_PIN), 0, 1023, 0, 100) < IR_MAP_TRIP_VAL) ) { exitTime = micros(); - initDisplayChronoValues(calculateChronoReadings(_tripTime, _exitTime)); + initDisplayChronoReadings(calculateChronoReadings(_tripTime, _exitTime)); countAmmo(); //when no second value within 1 second } else if ( (_tripTime != -10) && (_tripTime + 2000000) < micros() ) { resetChronoVals(); - initDisplayChronoValues(-1); + initDisplayChronoReadings(-1); } } diff --git a/SmartBlaster/SmartBlaster.h b/SmartBlaster/SmartBlaster.h index beaf288..23340f8 100644 --- a/SmartBlaster/SmartBlaster.h +++ b/SmartBlaster/SmartBlaster.h @@ -108,7 +108,7 @@ class SmartBlaster { //display stuff void displayValues(); void initDisplayAmmo(); - void initDisplayChrono(double); + void initDisplayChronoReadings(double); void initDisplayFireMode(); void initDisplayVoltage(double);