Jason Cheers / analogAverager

Important changes to repositories hosted on mbed.com

Mbed hosted mercurial repositories are deprecated and are due to be permanently deleted in July 2026.

To keep a copy of this software download the repository Zip archive or clone locally using Mercurial.

It is also possible to export all your personal repositories from the account settings page.

Files at this revision

API Documentation at this revision

Revision 1:b645a3714368, committed 2019-10-07

Comitter:
masterkookus
Date:
Mon Oct 07 12:44:29 2019 +0000
Parent:
0:13ce3869e3dd
Commit message:
Added percent or value option

Changed in this revision

analogAverager.cpp Show annotated file Show diff for this revision Revisions of this file
analogAverager.h Show annotated file Show diff for this revision Revisions of this file 
diff -r 13ce3869e3dd -r b645a3714368 analogAverager.cpp
--- a/analogAverager.cpp	Wed Oct 02 19:14:45 2019 +0000
+++ b/analogAverager.cpp	Mon Oct 07 12:44:29 2019 +0000
@@ -1,12 +1,26 @@
 #include "analogAverager.h"
 
-analogAverager::analogAverager(float nominalVal, bool useMinLimit, float minPercent, bool useMaxLimit, float maxPercent)
+analogAverager::analogAverager(float nominalVal, bool useMinLimit, bool minIsPercent, float minSetVal, bool useMaxLimit, bool maxIsPercent, float maxSetVal)
 {
     nomVal = nominalVal;
     maxLim=useMinLimit;
     minLim=useMaxLimit;
-    minVal = nominalVal*minPercent;
-    maxVal = nominalVal*maxPercent;
+    if (minIsPercent)
+    {
+        minVal = nominalVal*minSetVal;
+    }
+    else
+    {
+        minVal = minSetVal;
+    }
+    if (maxIsPercent)
+    {
+        maxVal = nominalVal*maxSetVal;
+    }
+    else
+    {
+        maxVal = maxSetVal;
+    }
     sampleNum=0;
 }
 

diff -r 13ce3869e3dd -r b645a3714368 analogAverager.h
--- a/analogAverager.h	Wed Oct 02 19:14:45 2019 +0000
+++ b/analogAverager.h	Mon Oct 07 12:44:29 2019 +0000
@@ -13,7 +13,7 @@
         float nomVal;
         
     public:
-        analogAverager(float, bool, float, bool, float);
+        analogAverager(float, bool, bool, float, bool, bool, float);
         void putVal(float);
         float getAvg(void);
         void resetNum(void);