[chronojump] encoder ec speed is shown in abs



commit 960d9ef578e7a1bc0188989405aab62abbdc9080
Author: Xavier de Blas <xaviblas gmail com>
Date:   Thu May 14 18:01:14 2015 +0200

    encoder ec speed is shown in abs

 encoder/util.R |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/encoder/util.R b/encoder/util.R
index f89a595..06ab863 100644
--- a/encoder/util.R
+++ b/encoder/util.R
@@ -539,10 +539,12 @@ pafGenerate <- function(eccon, kinematics, massBody, massExtra, laterality, iner
        maxSpeed <- max(abs(kinematics$speedy))
        maxSpeedT <- min(which(abs(kinematics$speedy) == maxSpeed))
 
-       if(eccon == "c")
-               meanPower <- mean(kinematics$power)
-       else
+       meanPower <- mean(kinematics$power)
+       
+       if(eccon != "c") {
+               meanSpeed <- mean(abs(kinematics$speedy))
                meanPower <- mean(abs(kinematics$power))
+       }
 
        #print(c("eccon meanPowerSigned meanPowerABS",eccon, mean(kinematics$power), 
mean(abs(kinematics$power))))
        #print("kinematics$power")
@@ -745,6 +747,8 @@ getDisplacement <- function(encoderConfigurationName, displacement, diameter, di
 #This is solved by the function getDisplacementInertialBody
 getDisplacementInertial <- function(displacement, encoderConfigurationName, diameter, diameterExt)
 {
+       write("at getDisplacementInertial", stderr())
+
        #scanned displacement is ticks of rotary axis encoder
        #now convert it to mm of body displacement
        if(encoderConfigurationName == "ROTARYAXISINERTIAL" ||


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