mirror of
https://github.com/eclipse/upm.git
synced 2025-11-05 01:24:54 +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,8 +21,9 @@
|
||||
# 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_h3lis331dl as upmH3LIS331DL
|
||||
from upm import pyupm_h3lis331dl as upmH3LIS331DL
|
||||
|
||||
def main():
|
||||
# Instantiate an H3LIS331DL on I2C bus 0
|
||||
@@ -37,7 +38,7 @@ def main():
|
||||
|
||||
# This function lets you run code on exit, including functions from myDigitalAccelerometer
|
||||
def exitHandler():
|
||||
print "Exiting"
|
||||
print("Exiting")
|
||||
sys.exit(0)
|
||||
|
||||
# Register exit handlers
|
||||
@@ -63,7 +64,7 @@ def main():
|
||||
" Z = {2}").format(upmH3LIS331DL.intp_value(x),
|
||||
upmH3LIS331DL.intp_value(y),
|
||||
upmH3LIS331DL.intp_value(z))
|
||||
print outputStr
|
||||
print(outputStr)
|
||||
|
||||
myDigitalAccelerometer.getAcceleration(ax, ay, az)
|
||||
outputStr = ("Acceleration: AX = {0}"
|
||||
@@ -71,7 +72,7 @@ def main():
|
||||
" AZ = {2}").format(upmH3LIS331DL.floatp_value(ax),
|
||||
upmH3LIS331DL.floatp_value(ay),
|
||||
upmH3LIS331DL.floatp_value(az))
|
||||
print outputStr
|
||||
print(outputStr)
|
||||
time.sleep(.5)
|
||||
|
||||
if __name__ == '__main__':
|
||||
|
||||
Reference in New Issue
Block a user