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,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_dfrec as sensorObj
|
||||
from upm import pyupm_dfrec as sensorObj
|
||||
|
||||
def main():
|
||||
# Instantiate a DFRobot EC sensor on analog pin A0, with a ds18b20
|
||||
@ -38,7 +39,7 @@ def main():
|
||||
|
||||
# This function lets you run code on exit
|
||||
def exitHandler():
|
||||
print "Exiting"
|
||||
print("Exiting")
|
||||
sys.exit(0)
|
||||
|
||||
# Register exit handlers
|
||||
@ -49,10 +50,10 @@ def main():
|
||||
while (True):
|
||||
sensor.update()
|
||||
|
||||
print "EC =", sensor.getEC(), "ms/cm"
|
||||
print "Volts =", sensor.getVolts(),
|
||||
print ", Temperature = ", sensor.getTemperature(), "C"
|
||||
print
|
||||
print("EC =", sensor.getEC(), "ms/cm")
|
||||
print("Volts =", sensor.getVolts(), end=' ')
|
||||
print(", Temperature = ", sensor.getTemperature(), "C")
|
||||
print()
|
||||
|
||||
time.sleep(2)
|
||||
|
||||
|
Reference in New Issue
Block a user