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:
@ -1,3 +1,4 @@
|
||||
from __future__ import print_function
|
||||
# Author: Mihai Tudor Panu <mihai.tudor.panu@intel.com>
|
||||
# Copyright (c) 2014 Intel Corporation.
|
||||
#
|
||||
@ -21,7 +22,7 @@
|
||||
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
|
||||
from time import sleep
|
||||
import pyupm_gas as TP401
|
||||
from upm import pyupm_gas as TP401
|
||||
|
||||
def main():
|
||||
# Give a qualitative meaning to the value from the sensor
|
||||
@ -36,11 +37,11 @@ def main():
|
||||
airSensor = TP401.TP401(0)
|
||||
|
||||
# Wait for sensor to warm up
|
||||
print "Sensor is warming up for 3 minutes..."
|
||||
print("Sensor is warming up for 3 minutes...")
|
||||
for i in range (1, 4):
|
||||
sleep(60)
|
||||
print i, "minute(s) passed."
|
||||
print "Sensor is ready!"
|
||||
print(i, "minute(s) passed.")
|
||||
print("Sensor is ready!")
|
||||
|
||||
# Loop indefinitely
|
||||
while True:
|
||||
@ -48,7 +49,7 @@ def main():
|
||||
value = airSensor.getSample()
|
||||
ppm = airSensor.getPPM()
|
||||
|
||||
print "raw: %4d" % value , " ppm: %5.2f " % ppm , airQuality(value)
|
||||
print("raw: %4d" % value , " ppm: %5.2f " % ppm , airQuality(value))
|
||||
|
||||
# Sleep for 2.5 s
|
||||
sleep(2.5)
|
||||
|
Reference in New Issue
Block a user