[chronojump] Fixed getDisplacementInertial on MOVPULLEY configs



commit 206795f0fa0c3cc8c1a615827b9bfcb35cca257b
Author: Xavier Padullés <x padulles gmail com>
Date:   Tue Oct 27 12:57:37 2015 +0100

    Fixed getDisplacementInertial on MOVPULLEY configs

 encoder/util.R |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/encoder/util.R b/encoder/util.R
index 5cc6b7f..b010b0e 100644
--- a/encoder/util.R
+++ b/encoder/util.R
@@ -876,9 +876,9 @@ getDisplacementInertial <- function(displacement, encoderConfigurationName, diam
               encoderConfigurationName == "ROTARYFRICTIONSIDEINERTIALLATERAL"){
          displacement = displacement * diameter / diameterExt #displacement of the axis
        } else if(encoderConfigurationName == "ROTARYFRICTIONAXISINERTIALMOVPULLEY"){
-         displacement = 2 * displacement #twice the displacement of the axis
+         displacement = displacement / 2 #Half the displacement of the axis
        } else if(encoderConfigurationName == "ROTARYFRICTIONSIDEINERTIALMOVPULLEY"){
-         displacement = 2 * displacement * diameter / diameterExt #twice the displacement of the axis
+         displacement = displacement * diameter /(2 * diameterExt) #Half the displacement of the axis
        } else if(encoderConfigurationName == "ROTARYAXISINERTIALMOVPULLEY"){
          displacementMeters = displacement / 1000 #mm -> m
          diameterMeters = diameter / 100 #cm -> m


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]