diff options
author | Jonathan McCrohan <jmccrohan@gmail.com> | 2013-03-03 20:04:36 +0000 |
---|---|---|
committer | Jonathan McCrohan <jmccrohan@gmail.com> | 2013-03-03 20:04:36 +0000 |
commit | 571d570e1be6f783a2e8ef0dafa838e9d82f923e (patch) | |
tree | 9b18682751acba56d650129922ecc4c5f12a3469 /Java/com/phidgets/AccelerometerPhidget.java | |
parent | 62172377c57ff85bce35a43e0ca3e76f67a473ad (diff) | |
parent | 4e6290d8e2dc4dcd784102bdab18d7e1854e11c0 (diff) | |
download | libphidget21-squeeze-backports.tar.gz |
Merge branch 'master' into squeeze-backportssqueeze-backports
Conflicts:
debian/changelog
Diffstat (limited to '')
-rw-r--r-- | Java/com/phidgets/AccelerometerPhidget.java | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/Java/com/phidgets/AccelerometerPhidget.java b/Java/com/phidgets/AccelerometerPhidget.java index 062ea6f..c0c82ae 100644 --- a/Java/com/phidgets/AccelerometerPhidget.java +++ b/Java/com/phidgets/AccelerometerPhidget.java @@ -1,6 +1,6 @@ /* - * Copyright 2012 Phidgets Inc. All rights reserved. + * Copyright 2006 Phidgets Inc. All rights reserved. */ package com.phidgets; @@ -11,10 +11,9 @@ import com.phidgets.event.*; * This class represents a Phidget Accelerometer. All methods to read * acceleration data from an Accelerometer are implemented in this class. <p> - * The Phidget Accelerometer provides 2 or 3 axes of acceleration data, at anywhere from 2g to 10g - * sensitivity, depending on the specific revision. See your device's User Guide for more specific API details, - * technical information, and revision details. The User Guide, along with other resources, can be found on - * the product page for your device. + The Phidget Accelerometer provides 2 or 3 axes of acceleration data, at anywhere from 2g to 10g + sensitivity, depending on the specific revision. See your hardware documetation for more information. + They can measure both static (gravity) and dynamic acceleration. * @author Phidgets Inc. */ |