mirror of
https://github.com/eclipse/upm.git
synced 2025-07-02 09:51:14 +03:00
python: Added upm directory for python modules
* Grouped UPM python modules into upm directory, for example: /usr/local/lib/python2.7/dist-packages/upm * Updated UPM example import statements * Removed unused RPATH statements from UPM src CMakeLists.txt, currently build collateral contains an explicit RPATH which is stripped from the install collateral. * Converted python examples to work on both python2 AND python3 * Added ctest for loading examples w/python3 * Removed returns from swig macros * UPM python module use will change... Before: import pyupm_dfrph After: from upm import pyupm_dfrph or import upm.pyupm_dfrph etc... * This commit fixes #468 Signed-off-by: Noel Eck <noel.eck@intel.com>
This commit is contained in:
@ -21,14 +21,15 @@
|
||||
# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
||||
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
|
||||
from __future__ import print_function
|
||||
import time, sys, signal, atexit
|
||||
import pyupm_adxl335 as upmAdxl335
|
||||
from upm import pyupm_adxl335 as upmAdxl335
|
||||
|
||||
def main():
|
||||
myAnalogAccel = upmAdxl335.ADXL335(0, 1, 2)
|
||||
|
||||
print "Please make sure the sensor is completely still."
|
||||
print "Sleeping for 2 seconds"
|
||||
print("Please make sure the sensor is completely still.")
|
||||
print("Sleeping for 2 seconds")
|
||||
time.sleep(2)
|
||||
|
||||
## Exit handlers ##
|
||||
@ -39,14 +40,14 @@ def main():
|
||||
# This function lets you run code on exit,
|
||||
# including functions from myAnalogAccel
|
||||
def exitHandler():
|
||||
print "Exiting"
|
||||
print("Exiting")
|
||||
sys.exit(0)
|
||||
|
||||
# Register exit handlers
|
||||
atexit.register(exitHandler)
|
||||
signal.signal(signal.SIGINT, SIGINTHandler)
|
||||
|
||||
print "Calibrating..."
|
||||
print("Calibrating...")
|
||||
myAnalogAccel.calibrate()
|
||||
|
||||
x = upmAdxl335.new_intPointer()
|
||||
@ -62,7 +63,7 @@ def main():
|
||||
outputStr = "Raw Values: X: {0} Y: {1} Z: {2}".format(
|
||||
upmAdxl335.intPointer_value(x), upmAdxl335.intPointer_value(y),
|
||||
upmAdxl335.intPointer_value(z))
|
||||
print outputStr
|
||||
print(outputStr)
|
||||
|
||||
myAnalogAccel.acceleration(aX, aY, aZ)
|
||||
outputStr = ("Acceleration: X: {0}g\n"
|
||||
@ -70,9 +71,9 @@ def main():
|
||||
"Acceleration: Z: {2}g").format(upmAdxl335.floatPointer_value(aX),
|
||||
upmAdxl335.floatPointer_value(aY),
|
||||
upmAdxl335.floatPointer_value(aZ))
|
||||
print outputStr
|
||||
print(outputStr)
|
||||
|
||||
print " "
|
||||
print(" ")
|
||||
|
||||
time.sleep(.2)
|
||||
|
||||
|
Reference in New Issue
Block a user