Diff: main.cpp

Revision:

54:8ee11c9ecd8a

Parent:

52:80480b2fafba

Child:

55:f24d70f519cd

diff -r 80480b2fafba -r 8ee11c9ecd8a main.cpp
--- a/main.cpp	Thu Jun 18 23:34:37 2015 +0000
+++ b/main.cpp	Sat Jun 27 18:06:21 2015 +0000
@@ -30,23 +30,26 @@
 //UPAS0012 CALIBRATION TRANSFER FUNCTION COEFFICIENTS FROM 'UPAS v2 OSU-calibration primary flow data.xlsx'
 //mass flow sensor output signal (x) vs. mass flow (y)
 //y = -0.9198x4 + 4.995x3 - 9.0171x2 + 8.1039x - 2.1758
-float MF4 = -0.9198;
-float MF3 = 4.995;
-float MF2 = -9.0171;
-float MF1 = 8.1039;
-float MF0 = -2.1758;
+float MF4 = -0.9507;
+float MF3 = 5.1495;
+float MF2 = -9.2983;
+float MF1 = 8.3236;
+float MF0 = -2.2377;
+
 //Mass flow sensor polynomial deviation limits
-float omronVMin = 0.500; //V
-float omronVMax = 2.437; //V
-float omronMFMin = 0.189; //g/L
-float omronMFMax = 3.873; //g/L
+float omronVMin = 0.435; //V
+float omronVMax = 1.7997; //V
+float omronMFMin = 0.013; //g/L
+float omronMFMax = 2.669; //g/L
+
 //DIGITAL POTENTIOSTAT dig-pot vs m_dot POLYNOMIAL TRANSFER FUNCTION COEFFICIENTS FROM 'UPAS v2 OSU-calibration primary flow data.xlsx'
 //y = 6.2912x4 - 56.643x3 + 195.7x2 - 329.36x + 245.2
-float DP4 = 6.2912;
-float DP3 = -56.643;
-float DP2 = 195.7;
-float DP1 = -329.36;
-float DP0 = 245.2;
+float DP4 = 6.0986;
+float DP3 = -55.372;
+float DP2 = 192.76;
+float DP1 = -326.6;
+float DP0 = 244.32;
+
 
 float press;
 float temp;