FSG / System

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.

Dependents:   7_21_17_FSG 7_26_17_FSG

Fork of System_ by FSG

Diff: conversions.cpp

Revision:
5:26c9083b1bf2
Parent:
4:66f2b18a16a4
Child:
6:8764d841a892
diff -r 66f2b18a16a4 -r 26c9083b1bf2 conversions.cpp
--- a/conversions.cpp	Mon Jul 17 14:24:41 2017 +0000
+++ b/conversions.cpp	Fri Jul 21 13:29:36 2017 +0000
@@ -2,11 +2,11 @@
 
 float counts_to_dist(int count)
 {
-    //float conv = 0.001220703*(107.39*count-6.8854)-6; //MELISSA
+    float conv = 0.001220703*(-105.98*count)+388.51; //MELISSA
     //float conv = .13109129517*count-6; // TRENT
     
     //TROY
-    float conv = -0.1243 * count + 378.31;  //created on 7/13/2017 by reading from extended (0 mm) end of piston
+    //float conv = -0.1243 * count + 378.31;  //created on 7/13/2017 by reading from extended (0 mm) end of piston
     return conv;
 
 };