Revision 6:78279e66b1a0, committed 2018-05-01

Comitter:

lalexander37

Date:

Tue May 01 15:59:08 2018 +0000

Parent:

5:d9520bf7eb9e

Commit message:

WhoStoletheCookie ECE 4018 Final Project

Changed in this revision

diff -r d9520bf7eb9e -r 78279e66b1a0 FSR.cpp
--- a/FSR.cpp	Thu Oct 22 17:06:17 2015 +0000
+++ b/FSR.cpp	Tue May 01 15:59:08 2018 +0000
@@ -23,12 +23,14 @@
     float rfsr = _r * 1 / read - _r;
     float slope = (4 - 2) / (log10(6.2) - log10(0.25));
     float a = log10(rfsr);
-    if (a < log10(6.2))
-    {
-        return pow(10, ((log10(6.2) - a) * slope + 2));
-    }
-    else
-    {
-        return 0;
-    }
+    return pow(10, ((log10(6.2) - a) * slope + 2));
+    
+    //if (a < log10(6.2))
+//    {
+//        return pow(10, ((log10(6.2) - a) * slope + 2));
+//    }
+//    else
+//    {
+//        return 0;
+//    }
 }
\ No newline at end of file