Diff: analogMinMax.cpp

Revision:

1:4c3825c62e96

Parent:

0:cdaabb616422

diff -r cdaabb616422 -r 4c3825c62e96 analogMinMax.cpp
--- a/analogMinMax.cpp	Wed Oct 02 19:14:53 2019 +0000
+++ b/analogMinMax.cpp	Mon Oct 07 12:44:34 2019 +0000
@@ -1,12 +1,26 @@
 #include "analogMinMax.h"
 
-analogMinMax::analogMinMax(float nominalVal, bool useMinLimit, float minPercent, bool useMaxLimit, float maxPercent)
+analogMinMax::analogMinMax(float nominalVal, bool useMinLimit, bool minIsPercent, float minSetVal, bool useMaxLimit, bool maxIsPercent, float maxSetVal)
 {
     nomVal = nominalVal;
     maxLim=useMinLimit;
     minLim=useMaxLimit;
-    minLimVal = nominalVal*minPercent;
-    maxLimVal = nominalVal*maxPercent;
+    if (minIsPercent)
+    {
+        minLimVal = nominalVal*minSetVal;
+    }
+    else
+    {
+        minLimVal = minSetVal;
+    }
+    if (maxIsPercent)
+    {
+        maxLimVal = nominalVal*maxSetVal;
+    }
+    else
+    {
+        maxLimVal = maxSetVal;
+    }
 }
 
 void analogMinMax::putVal(float newval)