aboutsummaryrefslogtreecommitdiffstats
path: root/Java/com/phidgets/AdvancedServoPhidget.java
diff options
context:
space:
mode:
authorJonathan McCrohan <jmccrohan@gmail.com>2012-05-09 00:47:30 +0100
committerJonathan McCrohan <jmccrohan@gmail.com>2012-05-09 00:47:30 +0100
commit3d928d8dfe2d9af8b3d3ad2eb1d4b878d68704c4 (patch)
treeafd9aac45d87ca26cd83e5b176069195250a3d7f /Java/com/phidgets/AdvancedServoPhidget.java
parentd070ed533fe8afdc672c6f04875f2c73f478c196 (diff)
parent260123716172d33f44bdc0e4e5422554d139215c (diff)
downloadlibphidget21-3d928d8dfe2d9af8b3d3ad2eb1d4b878d68704c4.tar.gz
Merge tag 'upstream/2.1.8.20120507'
Upstream version 2.1.8.20120507
Diffstat (limited to '')
-rw-r--r--Java/com/phidgets/AdvancedServoPhidget.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/Java/com/phidgets/AdvancedServoPhidget.java b/Java/com/phidgets/AdvancedServoPhidget.java
index 1aa485a..db33e2a 100644
--- a/Java/com/phidgets/AdvancedServoPhidget.java
+++ b/Java/com/phidgets/AdvancedServoPhidget.java
@@ -314,7 +314,7 @@ public final class AdvancedServoPhidget extends Phidget
* Sets the speed ramping state.
* <p>
* Disable speed ramping to disable velocity and acceleration control. With speed ramping disabled, the servo will be sent to
- * the desired position immediately upon recieving the command. This is how the regular Phidget Servo Controller works.
+ * the desired position immediately upon receiving the command. This is how the regular Phidget Servo Controller works.
* <p>
* This is turned on by default.
*