[chronojump] minor change



commit 27f20e8947773702e8957611bab0430073c1549a
Author: Xavier Padullés <x padulles gmail com>
Date:   Thu Sep 28 14:54:27 2017 +0200

    minor change

 encoder/util.R |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/encoder/util.R b/encoder/util.R
index 70811ce..a864df7 100644
--- a/encoder/util.R
+++ b/encoder/util.R
@@ -827,7 +827,7 @@ getDynamicsNotInertial <- function(encoderConfigurationName, speed, accel,
 { 
   force = NULL
   if(encoderConfigurationName == "LINEARONPLANEWEIGHTDIFFANGLE") {
-    force <- massBody*(accel + g*sin(anglePush * pi / 180)) + massExtra*(g*sin(angleWeight * pi / 180) + 
accel)
+    force <- massBody*(accel + g*sin(anglePush * pi / 180)) + massExtra*(accel + g*sin(angleWeight * pi / 
180))
     } else if(encoderConfigurationName == "LINEARONPLANEWEIGHTDIFFANGLEMOVPULLEY") {
       force <- massBody*(accel + g*sin(anglePush * pi / 180)) + massExtra*(g*sin(angleWeight * pi / 180) + 
accel) / gearedDown
     } else if(encoderConfigurationName == "LINEARONPLANE"){


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