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,13 +21,14 @@
|
||||
# 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_ozw as sensorObj
|
||||
from upm import pyupm_ozw as sensorObj
|
||||
|
||||
def main():
|
||||
# This function lets you run code on exit
|
||||
def exitHandler():
|
||||
print "Exiting"
|
||||
print("Exiting")
|
||||
sys.exit(0)
|
||||
|
||||
# Register exit handlers
|
||||
@ -36,7 +37,7 @@ def main():
|
||||
defaultDev = "/dev/ttyACM0"
|
||||
if (len(sys.argv) > 1):
|
||||
defaultDev = sys.argv[1]
|
||||
print "Using device", defaultDev
|
||||
print("Using device", defaultDev)
|
||||
|
||||
# Instantiate an Aeotec Door/Window 2nd Edition sensor instance, on
|
||||
# device node 10. You will almost certainly need to change this to
|
||||
@ -49,32 +50,32 @@ def main():
|
||||
sensor.optionsLock()
|
||||
|
||||
# Next, initialize it.
|
||||
print "Initializing, this may take awhile depending on your ZWave network"
|
||||
print("Initializing, this may take awhile depending on your ZWave network")
|
||||
|
||||
sensor.init(defaultDev)
|
||||
print "Initialization complete"
|
||||
print("Initialization complete")
|
||||
|
||||
print "Querying data..."
|
||||
print("Querying data...")
|
||||
|
||||
while (True):
|
||||
if (sensor.isDeviceAvailable()):
|
||||
print "Alarm status:",
|
||||
print sensor.isAlarmTripped()
|
||||
print("Alarm status:", end=' ')
|
||||
print(sensor.isAlarmTripped())
|
||||
|
||||
print "Tamper Switch status:",
|
||||
print sensor.isTamperTripped()
|
||||
print("Tamper Switch status:", end=' ')
|
||||
print(sensor.isTamperTripped())
|
||||
|
||||
print "Battery Level:",
|
||||
print sensor.getBatteryLevel(),
|
||||
print "%"
|
||||
print("Battery Level:", end=' ')
|
||||
print(sensor.getBatteryLevel(), end=' ')
|
||||
print("%")
|
||||
|
||||
print
|
||||
print()
|
||||
else:
|
||||
print "Device has not yet responded to probe."
|
||||
print "Try waking it, or wait until it wakes itself if ",
|
||||
print "configured to do so."
|
||||
print("Device has not yet responded to probe.")
|
||||
print("Try waking it, or wait until it wakes itself if ", end=' ')
|
||||
print("configured to do so.")
|
||||
|
||||
print
|
||||
print()
|
||||
|
||||
time.sleep(1)
|
||||
|
||||
|
Reference in New Issue
Block a user