alexey.zholtikov/upm
1
0
Fork 0
mirror of https://github.com/eclipse/upm.git synced 2025-07-02 09:51:14 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

python: Added upm directory for python modules

Browse Source 
* 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:
Noel Eck
2016-10-10 14:48:42 -07:00
parent 8624a07b77
commit bf425014ab
190 changed files with 1439 additions and 1234 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
examples/python/aeotecsdg2.py
View File

@ -21,16 +21,17 @@
# 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 "Turning switch off and sleeping for 5 seconds..."
print("Turning switch off and sleeping for 5 seconds...")
sensor.off()
time.sleep(5)
print "Exiting"
print("Exiting")
sys.exit(0)
# Register exit handlers
@ -39,7 +40,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 Smart Dimmer Gen2 instance, on device node
# 9. You will almost certainly need to change this to reflect your
@ -52,17 +53,17 @@ 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")
# turn light on
print "Turning switch on, then sleeping for 5 secs"
print("Turning switch on, then sleeping for 5 secs")
sensor.on();
time.sleep(5);
print "Querying data..."
print("Querying data...")
dim = False;
while (True):
# put on a light show...
@ -75,25 +76,25 @@ def main():
sensor.update()
print "Current Level:",
print sensor.getLevel()
print("Current Level:", end=' ')
print(sensor.getLevel())
print "Volts:",
print sensor.getVolts(),
print "volts"
print("Volts:", end=' ')
print(sensor.getVolts(), end=' ')
print("volts")
print "Energy Consumption:",
print sensor.getEnergy(),
print "kWh"
print("Energy Consumption:", end=' ')
print(sensor.getEnergy(), end=' ')
print("kWh")
print "Watts:",
print sensor.getWatts()
print("Watts:", end=' ')
print(sensor.getWatts())
print "Current:",
print sensor.getCurrent(),
print "amps"
print("Current:", end=' ')
print(sensor.getCurrent(), end=' ')
print("amps")
print
print()
time.sleep(5)
if __name__ == '__main__':