From e64143d1ea4ce61ad1c3c7d314489e198d29e9e9 Mon Sep 17 00:00:00 2001 From: Patrick McDonagh Date: Tue, 11 Jul 2017 17:13:00 -0500 Subject: [PATCH] Fix for multiple shiftright functions --- .../UserInterfaceState.xcuserstate | Bin 52621 -> 52675 bytes src/AnalogIn.cpp | 4 ++-- src/Measurement.cpp | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/POCpp.xcodeproj/project.xcworkspace/xcuserdata/patrickjmcd.xcuserdatad/UserInterfaceState.xcuserstate b/POCpp.xcodeproj/project.xcworkspace/xcuserdata/patrickjmcd.xcuserdatad/UserInterfaceState.xcuserstate index b2786a6164e3a10b2ab31f1858f98803c53e70df..13357af75a38db3a2004ab3fb6dc3cda8810e645 100644 GIT binary patch delta 12813 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 delta 12649 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 diff --git a/src/AnalogIn.cpp b/src/AnalogIn.cpp index 116642a..584de3d 100644 --- a/src/AnalogIn.cpp +++ b/src/AnalogIn.cpp @@ -28,7 +28,7 @@ AnalogIn::AnalogIn(int channel, double rawMin, double rawMax, double euMin, doub m = (euMax - euMin) / (rawMax - rawMin); b = euMax - m * (rawMax); } -void shiftright (double myarray[], int size) +void ainShiftRight (double myarray[], int size) { double temp; @@ -61,7 +61,7 @@ double AnalogIn::setValue(int value){ double pv = m * rawValue + b; lastValue = pv; //TODO: lastStored = Instant.now(); - shiftright(history, 100); + ainShiftRight(history, 100); history[0] = lastValue; return pv; } diff --git a/src/Measurement.cpp b/src/Measurement.cpp index 615e759..1ca5dcc 100644 --- a/src/Measurement.cpp +++ b/src/Measurement.cpp @@ -22,7 +22,7 @@ Measurement::Measurement(std::string tagName){ } -void shiftright (double myarray[], int size) +void measShiftRight (double myarray[], int size) { double temp; @@ -144,8 +144,8 @@ int Measurement::update(double value){ return reportValue; } void Measurement::endOfDay(){ - shiftright(totalHistory, 100); - shiftright(averageHistory, 100); + measShiftRight(totalHistory, 100); + measShiftRight(averageHistory, 100); totalHistory[0] = total; averageHistory[0] = average;