Fix SPI conflict

Author: pingswept

i2c.py

@@ -44,124 +44,124 @@ class i2c_smbus_ioctl_data(Structure):
                 ('data', POINTER(i2c_smbus_data))]
 
 def i2c_smbus_access(file, read_write, command, size, data):
-    try:
-        args = i2c_smbus_ioctl_data(read_write, command, size, data)
-        return fcntl.ioctl(file, I2C_SMBUS, args)
-    except IOError, e:
-        if debug: print '## i2c_smbus_access ##: IOError {0}'.format(e)
-        return -1
-    except IOError, e:
-        return -1
-    except Exception, e:
-        print '## i2c_smbus_access ## {0}'.format(e)
-        return -1
+    args = i2c_smbus_ioctl_data(read_write, command, size, data)
+    return fcntl.ioctl(file, I2C_SMBUS, args)
 
 def i2c_smbus_write_quick(file, mode):
-    if debug: print '## i2c_smbus_write_byte ##: mode 0x{0:00X}'.format(mode)
+    if debug: print '## i2c_smbus_write_quick ##: mode 0x{0:02X}'.format(mode)
     data = i2c_smbus_data(0)
-    return i2c_smbus_access(file, mode, 0, I2C_SMBUS_QUICK, pointer(data))
+    i2c_smbus_access(file, mode, 0, I2C_SMBUS_QUICK, pointer(data))
 
 def i2c_smbus_read_byte(file):
     if debug: print '## i2c_smbus_read_byte ##'
     data = i2c_smbus_data(0)
-    if (i2c_smbus_access(file, I2C_SMBUS_READ, 0, I2C_SMBUS_BYTE, pointer(data)) == 0):
-        return 0x0FF & data.byte
-    else:
-        return -1
+    i2c_smbus_access(file, I2C_SMBUS_READ, 0, I2C_SMBUS_BYTE, pointer(data))
+    return 0x0FF & data.byte
 
 def i2c_smbus_write_byte(file, daddr):
-    if debug: print '## i2c_smbus_write_byte ##: daddr 0x{0:00X}'.format(daddr)
+    if debug: print '## i2c_smbus_write_byte ##: daddr 0x{0:02X}'.format(daddr)
     data = i2c_smbus_data(0)
-    return i2c_smbus_access(file, I2C_SMBUS_WRITE, daddr, I2C_SMBUS_BYTE, pointer(data))
+    i2c_smbus_access(file, I2C_SMBUS_WRITE, daddr, I2C_SMBUS_BYTE, pointer(data))
 
 def i2c_smbus_read_byte_data(file, daddr):
-    if debug: print '## i2c_smbus_read_byte_data ##: daddr 0x{0:00X}'.format(daddr)
+    if debug: print '## i2c_smbus_read_byte_data ##: daddr 0x{0:02X}'.format(daddr)
     data = i2c_smbus_data(0)
-    if (i2c_smbus_access(file, I2C_SMBUS_READ, daddr, I2C_SMBUS_BYTE_DATA, pointer(data)) == 0):
-        return 0x0FF & data.byte
-    else:
-        return -1
+    i2c_smbus_access(file, I2C_SMBUS_READ, daddr, I2C_SMBUS_BYTE_DATA, pointer(data))
+    return 0x0FF & data.byte
 
 def i2c_smbus_write_byte_data(file, daddr, value):
-    if debug: print '## i2c_smbus_write_byte_data ##: daddr 0x{0:00X}, value=0x{1:00X}'.format(daddr, value)
+    if debug: print '## i2c_smbus_write_byte_data ##: daddr 0x{0:02X}, value=0x{1:02X}'.format(daddr, value)
     data = i2c_smbus_data(0)
     data.byte = value
-    return i2c_smbus_access(file, I2C_SMBUS_WRITE, daddr, I2C_SMBUS_BYTE_DATA, pointer(data))
+    i2c_smbus_access(file, I2C_SMBUS_WRITE, daddr, I2C_SMBUS_BYTE_DATA, pointer(data))
 
 def i2c_smbus_read_word_data(file, daddr):
-    if debug: print '## i2c_smbus_read_word_data ##: daddr 0x{0:00X}'.format(daddr)
+    if debug: print '## i2c_smbus_read_word_data ##: daddr 0x{0:02X}'.format(daddr)
     data = i2c_smbus_data(0)
-    if (i2c_smbus_access(file, I2C_SMBUS_READ, daddr, I2C_SMBUS_WORD_DATA, pointer(data)) == 0):
-        return 0x0FFFF & data.word
-    else:
-        return -1
+    i2c_smbus_access(file, I2C_SMBUS_READ, daddr, I2C_SMBUS_WORD_DATA, pointer(data))
+    return 0x0FFFF & data.word
 
 def i2c_smbus_write_word_data(file, daddr, value):
-    if debug: print '## i2c_smbus_write_word_data ##: daddr 0x{0:00X}, value=0x{1:0000X}'.format(daddr, value)
+    if debug: print '## i2c_smbus_write_word_data ##: daddr 0x{0:02X}, value=0x{1:04X}'.format(daddr, value)
     data = i2c_smbus_data(0)
     data.word = value
-    return i2c_smbus_access(file, I2C_SMBUS_WRITE, daddr, I2C_SMBUS_WORD_DATA, pointer(data))
+    i2c_smbus_access(file, I2C_SMBUS_WRITE, daddr, I2C_SMBUS_WORD_DATA, pointer(data))
+
+def i2c_smbus_read_i2c_block_data(file, daddr, length):
+    if debug: print '## i2c_smbus_read_i2c_block_data ##: daddr 0x{0:02X}, length 0x{1:02X}'.format(daddr, length)
+    data = i2c_smbus_data(0)
+    if length > 32:
+        length = 32
+    data.block[0] = length
+    i2c_smbus_access(file, I2C_SMBUS_READ, daddr,
+            I2C_SMBUS_I2C_BLOCK_BROKEN if length == 32 else I2C_SMBUS_I2C_BLOCK_DATA, pointer(data))
+    values = []
+    for i in range(data.block[0]):
+        values.append(data.block[i + 1])
+    return values
+
+def i2c_smbus_write_i2c_block_data(file, daddr, length, values):
+    if debug: print '## i2c_smbus_write_i2c_block_data ##: daddr 0x{0:02X}, length 0x{1:02X}'.format(daddr, length)
+    data = i2c_smbus_data(0)
+    if length > 32:
+        length = 32
+    data.block[0] = length
+    for i in range(length):
+        data.block[i + 1] = values[i]
+    i2c_smbus_access(file, I2C_SMBUS_WRITE, daddr, I2C_SMBUS_I2C_BLOCK_BROKEN, pointer(data))
 
 # Main entry points
-def _i2cRead(addr, reg = 0, size = ''):
-    if debug: print '## i2cRead ## addr={0}, reg={1}, size={2}'.format(addr, reg, size)
-    try:
-        file = os.open(RASCAL_I2C, os.O_RDWR)
-        try:
-            fcntl.ioctl(file, I2C_SLAVE, addr)
-            if size.upper() == 'W':
-                data = i2c_smbus_read_word_data(file, reg)
-            elif size.upper() == 'B':
-                data = i2c_smbus_read_byte_data(file, reg)
-            else:
-                data = i2c_smbus_read_byte(file)
-        except Exception, e:
-            if debug: print '## i2cRead ## Can\'t set slave addr {0}'.format(e)
-            data = -1
-        os.close(file)
-    except OSError:
-        if debug: print '## i2cRead ## Can\'t open {0}'.format(RASCAL_I2C)
-        data = -2
+def _i2cRead(addr, reg = 0, size = '', length = 0):
+    if debug: print '## i2cRead ## addr={0}, reg={1}, size={2}, length={3}'.format(addr, reg, size, length)
+    file = os.open(RASCAL_I2C, os.O_RDWR)
+    fcntl.ioctl(file, I2C_SLAVE, addr)
+    if size.upper() == 'I' and length > 0:
+        data = i2c_smbus_read_i2c_block_data(file, reg, length)
+    elif size.upper() == 'W':
+        data = i2c_smbus_read_word_data(file, reg)
+    elif size.upper() == 'B':
+        data = i2c_smbus_read_byte_data(file, reg)
+    else:
+        data = i2c_smbus_read_byte(file)
+    os.close(file)
     return data
 
 def _i2cWrite(addr, reg, value = '', size = 'B'):
     if value == '': size = 'C'; value = 0
     if debug: print '## i2cWrite ## addr=0x{0:02x}, reg=0x{1:02x}, value=0x{2:04X}, size={3}'.format(addr, reg, value, size)
-    try:
-        file = os.open(RASCAL_I2C, os.O_RDWR)
-        try:
-            fcntl.ioctl(file, I2C_SLAVE, addr)
-            if size.upper() == 'W':
-                data = i2c_smbus_write_word_data(file, reg, value)
-            elif size.upper() == 'B':
-                data = i2c_smbus_write_byte_data(file, reg, value)
-            else:
-                data = i2c_smbus_write_byte(file, reg)
-        except Exception, e:
-            if debug: print '## i2cWrite ## Can\'t set slave addr {0}'.format(e)
-            data = -1
-        os.close(file)
-    except OSError:
-        if debug: print '## i2cWrite ## Can\'t open {0}'.format(RASCAL_I2C)
-        data = -2
+    file = os.open(RASCAL_I2C, os.O_RDWR)
+    fcntl.ioctl(file, I2C_SLAVE, addr)
+    if size.upper() == 'I' and isinstance(value, list) and len(value) > 0:
+        data = i2c_smbus_write_i2c_block_data(file, reg, len(value), value)
+    elif size.upper() == 'W':
+        data = i2c_smbus_write_word_data(file, reg, value)
+    elif size.upper() == 'B':
+        data = i2c_smbus_write_byte_data(file, reg, value)
+    else:
+        data = i2c_smbus_write_byte(file, reg)
+    os.close(file)
     return data
 
 # Support for scanning i2C bus
 def probe_bus(file, addr):
     # Set slave address
     try:
         fcntl.ioctl(file, I2C_SLAVE, addr)
-        if ((addr >= 0x30 and addr <= 0x37) or (addr >= 0x50 and addr <= 0x5F)):
-            res = i2c_smbus_read_byte(file)
-        else:
-            res = i2c_smbus_write_quick(file, I2C_SMBUS_WRITE)
-        if res < 0:
-            return I2C_SCAN_NODEV
-        else:
+        try:
+            if ((addr >= 0x30 and addr <= 0x37) or (addr >= 0x50 and addr <= 0x5F)):
+                res = i2c_smbus_read_byte(file)
+            else:
+                res = i2c_smbus_write_quick(file, I2C_SMBUS_WRITE)
             return addr
-    except Exception, e:
+        except IOError:
+            return I2C_SCAN_NODEV
+        except Exception as e:
+            print '## probe_bus ## Unexpected exception: probe address {0}'.format(e)
+    except IOError:
         return I2C_SCAN_BUSY
-    
+    except Exception as e:
+        print '## probe_bus ## Unexpected exception: set slave address {0}'.format(e)
+        
 # Address status: 0=out of range, -1=not present, -2=busy, otherwise device address
 def scanBus(first = 0x03, last = 0x77):
     file = os.open(RASCAL_I2C, os.O_RDWR)
@@ -178,6 +178,3 @@ def scanBus(first = 0x03, last = 0x77):
         scan[i] = row
     os.close(file)
     return scan
-
-
-

pytronics.py

@@ -27,14 +27,8 @@ def decode_pin_name(pin):
         '3': 70, # PB6
         '4': 73, # PB9
         '5': 72, # PB8
-        '6': 55, # PA23
-        '7': 56, # PA24
-        '8': 100, # PC4
-        '9': 101, # PC5
-        '10': 67, # PB3
-        '11': 65, # PB1
-        '12': 64, # PB0
-        '13': 66, # PB2
+        '6': 75, # PB11 Rascal 1.2
+        '7': 74, # PB10 Rascal 1.2
         'A0': 96, # PC0
         'A1': 97, # PC1
         'A2': 98, # PC2
@@ -62,8 +56,11 @@ def analogWrite():
 def digitalRead(pin):
     pin = decode_pin_name(pin)
     with open('/sys/class/gpio/gpio' + str(pin) + '/value', 'r') as f:
-        reading = f.read()
-    return reading.strip()
+        reading = f.read().strip()
+        if (reading == '1'):
+            return 1
+        else:
+            return 0
 
 # Write a HIGH or LOW value to a digital pin
 # E.g. digitalWrite('11', 'HIGH')
@@ -101,13 +98,19 @@ def readPins(pinlist):
             print ('## readPins ## Cannot access pin {0} ({1})'.format(pin, syspin))
     return pins
 
-def i2cRead(addr, reg = 0, size = 'B'):
+def readWeatherBoard():
+    from sh import read_ftdi
+    names = ['header', 'temperature', 'humidity', 'dewpoint', 'pressure', 'light', 'wind_speed', 'wind_direction', 'rainfall', 'voltage', 'trailer']
+    readings = read_ftdi().split(',')
+    return dict(zip(names, readings))
+
+def i2cRead(addr, reg = 0, size = 'B', length = 0):
     from i2c import _i2cRead
-    return _i2cRead(addr, reg, size)
+    return _i2cRead(addr, reg, size, length)
 
 def i2cWrite(addr, reg, val = '', size = 'B'):
     from i2c import _i2cWrite
-    return _i2cWrite(addr, reg, val, size)
+    _i2cWrite(addr, reg, val, size)
 
 def serialRead():
     pass
@@ -129,8 +132,11 @@ def toggle(pin):
     else:
         digitalWrite(pin, 'HIGH')
 
-def spiRead():
-    pass
+def spiRead(bytes, cs='0'):
+    with open('/dev/spidev1.' + str(cs), 'r') as f:
+        data = f.read(min(bytes, 8191))
+        f.close()
+    return data
 
 def spiWrite(val, cs='0'):
     with open('/dev/spidev1.' + str(cs), 'w') as f:
@@ -147,4 +153,17 @@ def spiGetSpeed(channel='0'):
 def spiSetSpeed(speed, channel='0'):
     import array, fcntl
     with open('/dev/spidev1.' + str(channel), 'w') as f:
-        return fcntl.ioctl(f, 0x40046B04, array.array('i', [int(speed)]))
+        return fcntl.ioctl(f, 0x40046B04, array.array('i', [int(speed)]))
+
+def dmxWrite(data): # expects a list of up to 512 integers in range 0-255
+    import serial
+
+    dmxPacket = chr(0x00) + ''.join(chr(element) for element in data)
+
+    # slow transmission is a hack to send break and mark-after-break signals
+    slow = serial.Serial('/dev/ttyS1', 19200)
+    slow.write(chr(0x00))
+    slow.close()
+    fast = serial.Serial('/dev/ttyS1', 250000, stopbits=serial.STOPBITS_TWO)
+    fast.write(dmxPacket)
+    fast.close()