[chronojump] Fixed massExtra on new mode: LINEARONPLANEWEIGHTDIFFANGLEMOVPULLEY



commit 65c6e3e7794c819c5ba5e5b2ffe5208066b4c6fa
Author: Xavier de Blas <xaviblas gmail com>
Date:   Tue Mar 14 12:48:18 2017 +0100

    Fixed massExtra on new mode: LINEARONPLANEWEIGHTDIFFANGLEMOVPULLEY

 encoder/util.R |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)
---
diff --git a/encoder/util.R b/encoder/util.R
index c4cee51..6fd6564 100644
--- a/encoder/util.R
+++ b/encoder/util.R
@@ -804,8 +804,7 @@ getDynamics <- function(encoderConfigurationName,
           encoderConfigurationName == "WEIGHTEDMOVPULLEYLINEARONPERSON2" ||
           encoderConfigurationName == "WEIGHTEDMOVPULLEYLINEARONPERSON2INV" ||
           encoderConfigurationName == "WEIGHTEDMOVPULLEYROTARYFRICTION" ||
-          encoderConfigurationName == "WEIGHTEDMOVPULLEYROTARYAXIS" ||
-          encoderConfigurationName == "LINEARONPLANEWEIGHTDIFFANGLEMOVPULLEY")
+          encoderConfigurationName == "WEIGHTEDMOVPULLEYROTARYAXIS")
        {
                massExtra = getMass(massExtra, gearedDown, anglePush)
        } 
@@ -836,7 +835,7 @@ getDynamicsNotInertial <- function(encoderConfigurationName, speed, accel,
       force <- massTotal*(accel+g)     #g:9.81 (used when movement is against gravity)
     }
   power <- force*speed
-  
+
   return(list(mass=massTotal, force=force, power=power))
 }
 


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