Fixed read_pins argout typemap being sensitive to encoding.

[libftdi] / examples / python / complete.py

diff --git a/examples/python/complete.py b/examples/python/complete.py
index 3a765c8..afa59fa 100644 (file)
--- a/examples/python/complete.py
+++ b/examples/python/complete.py
@@ -9,21 +9,28 @@ of the swig generated python wrapper
 You need to build and install the wrapper first"""
 
 import os
+import sys
 import ftdi1 as ftdi
 import time
 
+# version
+print ( 'version: %s\n' % ftdi.__version__  )
+
 # initialize
 ftdic = ftdi.new()
 if ftdic == 0:
-    print( 'new failed: %d', ret )
+    print( 'new failed: %d' % ret )
     os._exit( 1 )
 
-# list all devices
-ret, devlist = ftdi.usb_find_all( ftdic, 0x0403, 0x6001 )
+# try to list ftdi devices 0x6010 or 0x6001
+ret, devlist = ftdi.usb_find_all( ftdic, 0x0403, 0x6010 )
+if ret <= 0:
+    ret, devlist = ftdi.usb_find_all( ftdic, 0x0403, 0x6001)
+
 if ret < 0:
     print( 'ftdi_usb_find_all failed: %d (%s)' % ( ret, ftdi.get_error_string( ftdic ) ) )
     os._exit( 1 )
-print( 'Number of FTDI devices found: %d\n' % ret )
+print( 'devices: %d' % ret )
 curnode = devlist
 i = 0
 while( curnode != None ):
@@ -31,7 +38,7 @@ while( curnode != None ):
     if ret < 0:
         print( 'ftdi_usb_get_strings failed: %d (%s)' % ( ret, ftdi.get_error_string( ftdic ) ) )
         os._exit( 1 )
-    print( 'Device #%d: manufacturer="%s" description="%s" serial="%s"\n' % ( i, manufacturer, description, serial ) )
+    print( '#%d: manufacturer="%s" description="%s" serial="%s"\n' % ( i, manufacturer, description, serial ) )
     curnode = curnode.next
     i += 1
 
@@ -59,20 +66,23 @@ for i in range( 8 ):
     ftdi.write_data( ftdic, chr(val), 1 )
     time.sleep ( 1 )
 ftdi.disable_bitbang( ftdic )
-print( '\n' )
+print( '' )
 
 
 # read pins
 ret, pins = ftdi.read_pins( ftdic )
-print( 'pins:\n' )
 if ( ret == 0 ):
-    print( '%02x' % ord( pins[0] ) )
-print( '\n' )
-
+    if sys.version_info[0] < 3: # python 2
+        pins = ord( pins )
+    else:
+        pins = pins[0]
+    print( 'pins: 0x%x' % pins )
+              
 
 # read chip id
 ret, chipid = ftdi.read_chipid( ftdic )
-print( 'FDTI chip id: %X\n' % chipid )
+if (ret==0):
+    print( 'chip id: %x\n' % chipid )
 
 
 # read eeprom
@@ -81,19 +91,25 @@ ret, eeprom_val = ftdi.read_eeprom_location( ftdic, eeprom_addr )
 if (ret==0):
     print( 'eeprom @ %d: 0x%04x\n' % ( eeprom_addr, eeprom_val ) )
 
-print( 'complete eeprom:' )
+print( 'eeprom:' )
 ret = ftdi.read_eeprom( ftdic )
 size = 128
 ret, eeprom = ftdi.get_eeprom_buf ( ftdic, size )
 if ( ret == 0 ):
     for i in range( size ):
-        print( '%02x' % ord( eeprom[i] ) )
+        octet = eeprom[i]
+        if sys.version_info[0] < 3: # python 2
+            octet = ord( octet )
+        sys.stdout.write( '%02x ' % octet )
         if ( i % 8 == 7 ):
-            print( '\n' )
-
+            print( '' )
+print( '' )
+            
 # close usb
 ret = ftdi.usb_close( ftdic )
 if ret < 0:
     print( 'unable to close ftdi device: %d (%s)' % ( ret, ftdi.get_error_string( ftdic ) ) )
     os._exit( 1 )
+    
+print ('device closed')    
 ftdi.free( ftdic )