[chronojump] Fixed come comments
- From: Xavier Padullés <xpadulles src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] Fixed come comments
- Date: Fri, 19 Feb 2016 11:01:53 +0000 (UTC)
commit 5aa60628f1d9b67d4dc4f4c5901dad9b8f339b89
Author: Xavier Padullés <x padulles gmail com>
Date: Tue Feb 9 15:53:22 2016 +0100
Fixed come comments
encoder/tests/getDynamics2016/getDynamics.R | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
---
diff --git a/encoder/tests/getDynamics2016/getDynamics.R b/encoder/tests/getDynamics2016/getDynamics.R
index 4be555d..d57ae7b 100644
--- a/encoder/tests/getDynamics2016/getDynamics.R
+++ b/encoder/tests/getDynamics2016/getDynamics.R
@@ -5,17 +5,18 @@ getMovement <- function(
inverted, # The encoder is inverted if in concentric movement the signal is negative
#-1 (encoder inverted) or 1 (encoder NOT inverted).
gearedDown, # speed of person divided by speed of machine. Used in machines with moving pulleys
- encoderOnMachine, # TRUE if the encoder measures directly the movement of the body. FALSE the
encoder measures the movememt of the load
+ encoderOnMachine, # 1 if the encoder measures directly the movement of the machine. 0 if the
encoder measures the movememt of the body
encoderType,
diameterRope, # diameter where the rope of the machine is wrapped.
- diameterEncoder) # In encoders "LINEAR" or "ROTARYAXIS", diameter where the encoder are measuring.
- # If the encoder and the rope are attached to the same point diameterRope=diameterEncoder)
+ diameterEncoder) # In encoders "LINEAR" or "ROTARYAXISFRICTION", diameter where the encoder
are measuring.
+ # If the encoder and the rope are attached to the same point
diameterRope=diameterEncoder or
+ # If gravitatory, in most cases diameterRope = diameterEncoder
{
- # On LINEAR encoder movement = R * (signal/200) * (2*pi) = signal * D * pi / 200
+ # On AXIS encoder movement is R * (signal/200) * (2*pi) = signal * D * pi / 200
# We asume D / (200 / pi) = D / d ----> d = 200 / pi
- # It should be assignet in the interface if encoderType = "LINEAR"
- if(encoderType == "LINEAR"){
+ # It should be assignet in the interface if encoderType = "ROTARYAXIS"
+ if(encoderType == "ROTARYAXIS"){
diameterEncoder == 200 / pi
}
movementBody = (
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]