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_tb7300 as sensorObj
|
||||
from upm import pyupm_tb7300 as sensorObj
|
||||
|
||||
def main():
|
||||
## Exit handlers ##
|
||||
@ -32,7 +33,7 @@ def main():
|
||||
|
||||
# This function lets you run code on exit
|
||||
def exitHandler():
|
||||
print "Exiting..."
|
||||
print("Exiting...")
|
||||
sys.exit(0)
|
||||
|
||||
# Register exit handlers
|
||||
@ -50,8 +51,8 @@ def main():
|
||||
if (len(sys.argv) > 1):
|
||||
defaultDev = sys.argv[1]
|
||||
|
||||
print "Using device", defaultDev
|
||||
print "Initializing..."
|
||||
print("Using device", defaultDev)
|
||||
print("Initializing...")
|
||||
|
||||
# Instantiate an TB7300 object for an TB7300 device that has 73001
|
||||
# as it's unique Device Object Instance ID. NOTE: You will
|
||||
@ -69,20 +70,20 @@ def main():
|
||||
# sensor.setDebug(True);
|
||||
|
||||
# output the serial number and firmware revision
|
||||
print
|
||||
print "Device Name:", sensor.getDeviceName()
|
||||
print "Device Description:", sensor.getDeviceDescription()
|
||||
print "Device Location:", sensor.getDeviceLocation()
|
||||
print
|
||||
print()
|
||||
print("Device Name:", sensor.getDeviceName())
|
||||
print("Device Description:", sensor.getDeviceDescription())
|
||||
print("Device Location:", sensor.getDeviceLocation())
|
||||
print()
|
||||
|
||||
print "Fan Mode:", sensor.getMultiStateValueText(sensorObj.TB7300.MV_Fan_Mode)
|
||||
print "Fan Status:",
|
||||
print sensor.getMultiStateValueText(sensorObj.TB7300.MV_Fan_Status)
|
||||
print "System Mode:",
|
||||
print sensor.getMultiStateValueText(sensorObj.TB7300.MV_System_Mode)
|
||||
print "Service Alarm:",
|
||||
print sensor.getBinaryInputText(sensorObj.TB7300.BI_Service_Alarm)
|
||||
print
|
||||
print("Fan Mode:", sensor.getMultiStateValueText(sensorObj.TB7300.MV_Fan_Mode))
|
||||
print("Fan Status:", end=' ')
|
||||
print(sensor.getMultiStateValueText(sensorObj.TB7300.MV_Fan_Status))
|
||||
print("System Mode:", end=' ')
|
||||
print(sensor.getMultiStateValueText(sensorObj.TB7300.MV_System_Mode))
|
||||
print("Service Alarm:", end=' ')
|
||||
print(sensor.getBinaryInputText(sensorObj.TB7300.BI_Service_Alarm))
|
||||
print()
|
||||
|
||||
# update and print the room temperature every 5 seconds
|
||||
while (1):
|
||||
@ -90,10 +91,10 @@ def main():
|
||||
sensor.update();
|
||||
|
||||
# we show both C and F for temperature
|
||||
print "Temperature:", sensor.getTemperature(),
|
||||
print "C /", sensor.getTemperature(True), "F"
|
||||
print("Temperature:", sensor.getTemperature(), end=' ')
|
||||
print("C /", sensor.getTemperature(True), "F")
|
||||
|
||||
print
|
||||
print()
|
||||
time.sleep(5)
|
||||
|
||||
if __name__ == '__main__':
|
||||
|
Reference in New Issue
Block a user