[chronojump] Fixed getDisplacementInertial in RotaryFrictionInertialMovPulley

[Xavier Padullés <xpadulles src gnome org>]

commit bd4ef88bc07c57087c531d104034c9f55cc7eb25
Author: Xavier Padullés <x padulles gmail com>
Date:   Tue Mar 8 15:35:26 2016 +0100

    Fixed getDisplacementInertial in RotaryFrictionInertialMovPulley

 encoder/util.R |   13 +++++--------
 1 files changed, 5 insertions(+), 8 deletions(-)
---
diff --git a/encoder/util.R b/encoder/util.R
index 2028a6b..de431c4 100644
--- a/encoder/util.R
+++ b/encoder/util.R
@@ -948,18 +948,15 @@ getDisplacementInertial <- function(displacement, encoderConfigurationName, diam
                displacement = revolutionsPerMs * pi * diameter * 10 * gearedDown # Revolutions * perimeter * 
gearedDown  and converted cm -> mm
                
        } else if(encoderConfigurationName == "ROTARYFRICTIONSIDEINERTIAL" ||
-                encoderConfigurationName == "ROTARYFRICTIONSIDEINERTIALLATERAL"){
-               displacement = displacement * diameter / diameterExt #displacement of the axis
+                encoderConfigurationName == "ROTARYFRICTIONSIDEINERTIALLATERAL" ||
+                encoderConfigurationName == "ROTARYFRICTIONSIDEINERTIALMOVPULLEY"){
                
-       } else if(encoderConfigurationName == "ROTARYFRICTIONAXISINERTIALMOVPULLEY"){
-               #If force multiplier is 2 (gearedDown = 0.5) the displacement of the body is 
-               #half the the displacement at the perimeter of the axis
-               displacement = displacement / gearedDown #if gearedDown = 0.5 : Half the displacement of the 
axis
+               displacement = displacement * diameter * gearedDown / diameterExt #displacement of the axis
                
-       } else if(encoderConfigurationName == "ROTARYFRICTIONSIDEINERTIALMOVPULLEY"){
+       } else if(encoderConfigurationName == "ROTARYFRICTIONAXISINERTIALMOVPULLEY"){
                #If force multiplier is 2 (gearedDown = 0.5) the displacement of the body is 
                #half the the displacement at the perimeter of the axis
-               displacement = displacement * diameter /(gearedDown * diameterExt)
+               displacement = displacement * gearedDown
          
        }