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_rgbringcoder as upmRGBRingCoder
|
||||
from upm import pyupm_rgbringcoder as upmRGBRingCoder
|
||||
|
||||
def main():
|
||||
# There are a lot of pins to hook up. These pins are valid for the
|
||||
@ -53,7 +54,7 @@ def main():
|
||||
# This function lets you run code on exit,
|
||||
# including functions from ringCoder
|
||||
def exitHandler():
|
||||
print "Exiting"
|
||||
print("Exiting")
|
||||
sys.exit(0)
|
||||
|
||||
# Register exit handlers
|
||||
@ -78,13 +79,13 @@ def main():
|
||||
# check button state
|
||||
bstate = ringCoder.getButtonState()
|
||||
if (bstate != oldState):
|
||||
print "Button state changed from", oldState, " to ", bstate
|
||||
print("Button state changed from", oldState, " to ", bstate)
|
||||
oldState = bstate
|
||||
|
||||
# check encoder position
|
||||
epos = ringCoder.getEncoderPosition()
|
||||
if (epos != oldPos):
|
||||
print "Encoder position changed from", oldPos, "to", epos
|
||||
print("Encoder position changed from", oldPos, "to", epos)
|
||||
oldPos = epos
|
||||
|
||||
time.sleep(0.1)
|
||||
|
Reference in New Issue
Block a user