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:
Noel Eck
2016-10-10 14:48:42 -07:00
parent 8624a07b77
commit bf425014ab
190 changed files with 1439 additions and 1234 deletions

View File

@ -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_t3311 as sensorObj
from upm import pyupm_t3311 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
@ -45,17 +46,17 @@ def main():
if (len(sys.argv) > 1):
defaultDev = sys.argv[1]
print "Initializing..."
print("Initializing...")
# Instantiate an T3311 instance, using MODBUS slave address 1, and
# default comm parameters (9600, 8, N, 2)
sensor = sensorObj.T3311(defaultDev, 1)
# output the serial number and firmware revision
print "Serial Number:", sensor.getSerialNumber()
print "Firmware Revision: {0}.{1}".format(sensor.getFirmwareMajor(),
sensor.getFirmwareMinor())
print
print("Serial Number:", sensor.getSerialNumber())
print("Firmware Revision: {0}.{1}".format(sensor.getFirmwareMajor(),
sensor.getFirmwareMinor()))
print()
# update and print available values every second
while (1):
@ -63,31 +64,31 @@ def main():
sensor.update()
# we show both C and F for temperature
print "Temperature:", sensor.getTemperature(), "C /",
print sensor.getTemperature(True), "F"
print("Temperature:", sensor.getTemperature(), "C /", end=' ')
print(sensor.getTemperature(True), "F")
print "Humidity:", sensor.getHumidity(), "%"
print("Humidity:", sensor.getHumidity(), "%")
# this value depends on the sensor configuration -- by default
# it is the dew point temperature
print "Computed Value:", sensor.getComputedValue()
print("Computed Value:", sensor.getComputedValue())
# with FW revisions > 2.44, extended computed data is available
if (sensor.extendedDataAvailable()):
print "Dew Point Temperature:", sensor.getDewPointTemperature(),
print "C /", sensor.getDewPointTemperature(True), "F"
print("Dew Point Temperature:", sensor.getDewPointTemperature(), end=' ')
print("C /", sensor.getDewPointTemperature(True), "F")
print "Absolute Humidity:", sensor.getAbsoluteHumidity(), "g/m3"
print("Absolute Humidity:", sensor.getAbsoluteHumidity(), "g/m3")
print "Specific Humidity:", sensor.getSpecificHumidity(),
print "g/kg"
print("Specific Humidity:", sensor.getSpecificHumidity(), end=' ')
print("g/kg")
print "Mixing Ratio:", sensor.getMixingRatio(), "g/kg"
print("Mixing Ratio:", sensor.getMixingRatio(), "g/kg")
print "Specific Enthalpy:", sensor.getSpecificEnthalpy(),
print "kJ/kg"
print("Specific Enthalpy:", sensor.getSpecificEnthalpy(), end=' ')
print("kJ/kg")
print
print()
time.sleep(1)
if __name__ == '__main__':