[chronojump] Fixed last util.R commit



commit 3504c08164bfc947f49d8dc4823c37683fea5260
Author: Xavier de Blas <xaviblas gmail com>
Date:   Wed Mar 1 14:13:27 2017 +0100

    Fixed last util.R commit

 encoder/util.R |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/encoder/util.R b/encoder/util.R
index 6f6b679..84b760c 100644
--- a/encoder/util.R
+++ b/encoder/util.R
@@ -803,8 +803,8 @@ getDynamics <- function(encoderConfigurationName,
           encoderConfigurationName == "WEIGHTEDMOVPULLEYLINEARONPERSON2" ||
           encoderConfigurationName == "WEIGHTEDMOVPULLEYLINEARONPERSON2INV" ||
           encoderConfigurationName == "WEIGHTEDMOVPULLEYROTARYFRICTION" ||
-          encoderConfigurationName == "WEIGHTEDMOVPULLEYROTARYAXIS" ) ||
-          encoderConfigurationName == "LINEARONPLANEWEIGHTDIFFANGLEMOVPULLEY"
+          encoderConfigurationName == "WEIGHTEDMOVPULLEYROTARYAXIS" ||
+          encoderConfigurationName == "LINEARONPLANEWEIGHTDIFFANGLEMOVPULLEY")
        {
                massExtra = getMass(massExtra, gearedDown, anglePush)
        } 


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