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_sm130 as sensorObj
|
||||
from upm import pyupm_sm130 as sensorObj
|
||||
|
||||
def main():
|
||||
# Instantiate a UART based SM130 RFID Module using defaults
|
||||
@ -35,7 +36,7 @@ def main():
|
||||
|
||||
# This function lets you run code on exit
|
||||
def exitHandler():
|
||||
print "Exiting"
|
||||
print("Exiting")
|
||||
sys.exit(0)
|
||||
|
||||
# Register exit handlers
|
||||
@ -44,24 +45,24 @@ def main():
|
||||
|
||||
# Set the baud rate, 19200 baud is the default.
|
||||
if (sensor.setBaudRate(19200)):
|
||||
print "Failed to set baud rate"
|
||||
print("Failed to set baud rate")
|
||||
sys.exit(0)
|
||||
|
||||
print "Resetting..."
|
||||
print("Resetting...")
|
||||
sensor.reset()
|
||||
|
||||
print "Firmware revision: " + sensor.getFirmwareVersion()
|
||||
print("Firmware revision: " + sensor.getFirmwareVersion())
|
||||
|
||||
print "Waiting up to 5 seconds for a tag..."
|
||||
print("Waiting up to 5 seconds for a tag...")
|
||||
|
||||
if (sensor.waitForTag(5000)):
|
||||
print "Found tag, UID:",
|
||||
print sensor.string2HexString(sensor.getUID())
|
||||
print "Tag Type:",
|
||||
print sensor.tag2String(sensor.getTagType())
|
||||
print("Found tag, UID:", end=' ')
|
||||
print(sensor.string2HexString(sensor.getUID()))
|
||||
print("Tag Type:", end=' ')
|
||||
print(sensor.tag2String(sensor.getTagType()))
|
||||
else:
|
||||
# error
|
||||
print "waitForTag failed: " + sensor.getLastErrorString()
|
||||
print("waitForTag failed: " + sensor.getLastErrorString())
|
||||
|
||||
if __name__ == '__main__':
|
||||
main()
|
||||
|
Reference in New Issue
Block a user