From 8b7178b534cbb3754e24bb12c3c23cf3806b55bf Mon Sep 17 00:00:00 2001 From: mprice Date: Sun, 30 Sep 2012 16:00:28 -0700 Subject: [PATCH 01/79] Added ColorEightByEight class and example program for Adafruit Bicolor LED Square Pixel Matrix with I2C Backpack Added note about possible pixel indexing bug in the non-color version. I don't have the non-color version to test with. Added note about possible unintentional color "blending" bug in the Arduino color version. --- Adafruit_LEDBackpack/ex_8x8_color_pixels.py | 31 +++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 Adafruit_LEDBackpack/ex_8x8_color_pixels.py diff --git a/Adafruit_LEDBackpack/ex_8x8_color_pixels.py b/Adafruit_LEDBackpack/ex_8x8_color_pixels.py new file mode 100644 index 00000000..6b6744d9 --- /dev/null +++ b/Adafruit_LEDBackpack/ex_8x8_color_pixels.py @@ -0,0 +1,31 @@ +#!/usr/bin/python + +import time +import datetime +from Adafruit_8x8 import ColorEightByEight + +# =========================================================================== +# 8x8 Pixel Example +# =========================================================================== +grid = ColorEightByEight(address=0x70) + +print "Press CTRL+Z to exit" + +iter = 0 + +# Continually update the 8x8 display one pixel at a time +while(True): + iter += 1 + + print (iter % 4) + + for x in range(0, 8): + for y in range(0, 8): + grid.setPixel(x, y, iter%4 ) + time.sleep(0.02) + +# I think there is another bug here that drawing red or green after yellow doesn't clear the other component until you draw a blank + +# time.sleep(0.5) +# grid.clear() +# time.sleep(0.5) From 5f84a1b8b55c893d31017e2d51d952081fa9c09c Mon Sep 17 00:00:00 2001 From: mprice Date: Sun, 30 Sep 2012 16:04:32 -0700 Subject: [PATCH 02/79] (borked previous commit, probably will again..) Added ColorEightByEight class and example program for Adafruit Bicolor LED Square Pixel Matrix with I2C Backpack Added note about possible pixel indexing bug in the non-color version. I don't have the non-color version to test with. Added note about possible unintentional color "blending" bug in the Arduino color version. --- Adafruit_LEDBackpack/Adafruit_8x8.py | 30 +++++++++++++++++++-- Adafruit_LEDBackpack/ex_8x8_color_pixels.py | 10 +------ 2 files changed, 29 insertions(+), 11 deletions(-) diff --git a/Adafruit_LEDBackpack/Adafruit_8x8.py b/Adafruit_LEDBackpack/Adafruit_8x8.py index c9f54d1b..df966dc9 100644 --- a/Adafruit_LEDBackpack/Adafruit_8x8.py +++ b/Adafruit_LEDBackpack/Adafruit_8x8.py @@ -33,8 +33,8 @@ def setPixel(self, x, y, color=1): if (x >= 8): return if (y >= 8): - return - x += 7 + return + x += 7 # ATTN: This might be a bug? On the color matrix, this causes x=0 to draw on the last line instead of the first. x %= 8 # Set the appropriate pixel buffer = self.disp.getBuffer() @@ -47,3 +47,29 @@ def clear(self): "Clears the entire display" self.disp.clear() +class ColorEightByEight(EightByEight): + def setPixel(self, x, y, color=1): + "Sets a single pixel" + if (x >= 8): + return + if (y >= 8): + return + + x %= 8 + + # Set the appropriate pixel + buffer = self.disp.getBuffer() + + # TODO : Named color constants? + # ATNN : This code was mostly taken from the arduino code, but with the addition of clearing the other bit when setting red or green. + # The arduino code does not do that, and might have the bug where if you draw red or green, then the other color, it actually draws yellow. + # The bug doesn't show up in the examples because it's always clearing. + + if (color == 1): + self.disp.setBufferRow(y, (buffer[y] | (1 << x)) & ~(1 << (x+8)) ) + elif (color == 2): + self.disp.setBufferRow(y, (buffer[y] | 1 << (x+8)) & ~(1 << x) ) + elif (color == 3): + self.disp.setBufferRow(y, buffer[y] | (1 << (x+8)) | (1 << x) ) + else: + self.disp.setBufferRow(y, buffer[y] & ~(1 << x) & ~(1 << (x+8)) ) diff --git a/Adafruit_LEDBackpack/ex_8x8_color_pixels.py b/Adafruit_LEDBackpack/ex_8x8_color_pixels.py index 6b6744d9..978db826 100644 --- a/Adafruit_LEDBackpack/ex_8x8_color_pixels.py +++ b/Adafruit_LEDBackpack/ex_8x8_color_pixels.py @@ -17,15 +17,7 @@ while(True): iter += 1 - print (iter % 4) - for x in range(0, 8): for y in range(0, 8): - grid.setPixel(x, y, iter%4 ) + grid.setPixel(x, y, iter % 4 ) time.sleep(0.02) - -# I think there is another bug here that drawing red or green after yellow doesn't clear the other component until you draw a blank - -# time.sleep(0.5) -# grid.clear() -# time.sleep(0.5) From 5b3f89f239c3c4a01fb01d2efbaae5c21b435fda Mon Sep 17 00:00:00 2001 From: mprice Date: Sun, 30 Sep 2012 16:04:32 -0700 Subject: [PATCH 03/79] Added ColorEightByEight class and example program for Adafruit Bicolor LED Square Pixel Matrix with I2C Backpack Added note about possible pixel indexing bug in the non-color version. I don't have the non-color version to test with. Added note about possible unintentional color "blending" bug in the Arduino color version. --- Adafruit_LEDBackpack/Adafruit_8x8.py | 30 +++++++++++++++++++-- Adafruit_LEDBackpack/ex_8x8_color_pixels.py | 10 +------ 2 files changed, 29 insertions(+), 11 deletions(-) diff --git a/Adafruit_LEDBackpack/Adafruit_8x8.py b/Adafruit_LEDBackpack/Adafruit_8x8.py index c9f54d1b..df966dc9 100644 --- a/Adafruit_LEDBackpack/Adafruit_8x8.py +++ b/Adafruit_LEDBackpack/Adafruit_8x8.py @@ -33,8 +33,8 @@ def setPixel(self, x, y, color=1): if (x >= 8): return if (y >= 8): - return - x += 7 + return + x += 7 # ATTN: This might be a bug? On the color matrix, this causes x=0 to draw on the last line instead of the first. x %= 8 # Set the appropriate pixel buffer = self.disp.getBuffer() @@ -47,3 +47,29 @@ def clear(self): "Clears the entire display" self.disp.clear() +class ColorEightByEight(EightByEight): + def setPixel(self, x, y, color=1): + "Sets a single pixel" + if (x >= 8): + return + if (y >= 8): + return + + x %= 8 + + # Set the appropriate pixel + buffer = self.disp.getBuffer() + + # TODO : Named color constants? + # ATNN : This code was mostly taken from the arduino code, but with the addition of clearing the other bit when setting red or green. + # The arduino code does not do that, and might have the bug where if you draw red or green, then the other color, it actually draws yellow. + # The bug doesn't show up in the examples because it's always clearing. + + if (color == 1): + self.disp.setBufferRow(y, (buffer[y] | (1 << x)) & ~(1 << (x+8)) ) + elif (color == 2): + self.disp.setBufferRow(y, (buffer[y] | 1 << (x+8)) & ~(1 << x) ) + elif (color == 3): + self.disp.setBufferRow(y, buffer[y] | (1 << (x+8)) | (1 << x) ) + else: + self.disp.setBufferRow(y, buffer[y] & ~(1 << x) & ~(1 << (x+8)) ) diff --git a/Adafruit_LEDBackpack/ex_8x8_color_pixels.py b/Adafruit_LEDBackpack/ex_8x8_color_pixels.py index 6b6744d9..978db826 100644 --- a/Adafruit_LEDBackpack/ex_8x8_color_pixels.py +++ b/Adafruit_LEDBackpack/ex_8x8_color_pixels.py @@ -17,15 +17,7 @@ while(True): iter += 1 - print (iter % 4) - for x in range(0, 8): for y in range(0, 8): - grid.setPixel(x, y, iter%4 ) + grid.setPixel(x, y, iter % 4 ) time.sleep(0.02) - -# I think there is another bug here that drawing red or green after yellow doesn't clear the other component until you draw a blank - -# time.sleep(0.5) -# grid.clear() -# time.sleep(0.5) From 52fe8044822e6453acc7dc3316d96c356c02f20f Mon Sep 17 00:00:00 2001 From: marcoschwartz Date: Fri, 11 Jan 2013 15:33:16 +0000 Subject: [PATCH 04/79] first commit for VCNL4000 code --- Adafruit_VCNL4000/Adafruit_I2C.py | 95 ++++++++++++++++++ Adafruit_VCNL4000/Adafruit_I2C.pyc | Bin 0 -> 4470 bytes Adafruit_VCNL4000/Adafruit_VCNL4000.py | 54 ++++++++++ Adafruit_VCNL4000/Adafruit_VCNL4000.pyc | Bin 0 -> 1829 bytes .../Adafruit_VCNL4000_example.py | 17 ++++ 5 files changed, 166 insertions(+) create mode 100755 Adafruit_VCNL4000/Adafruit_I2C.py create mode 100644 Adafruit_VCNL4000/Adafruit_I2C.pyc create mode 100755 Adafruit_VCNL4000/Adafruit_VCNL4000.py create mode 100644 Adafruit_VCNL4000/Adafruit_VCNL4000.pyc create mode 100755 Adafruit_VCNL4000/Adafruit_VCNL4000_example.py diff --git a/Adafruit_VCNL4000/Adafruit_I2C.py b/Adafruit_VCNL4000/Adafruit_I2C.py new file mode 100755 index 00000000..dd2dfa76 --- /dev/null +++ b/Adafruit_VCNL4000/Adafruit_I2C.py @@ -0,0 +1,95 @@ +#!/usr/bin/python + +import smbus + +# =========================================================================== +# Adafruit_I2C Base Class +# =========================================================================== + +class Adafruit_I2C : + + def __init__(self, address, bus=smbus.SMBus(0), debug=False): + self.address = address + self.bus = bus + self.debug = debug + + def reverseByteOrder(self, data): + "Reverses the byte order of an int (16-bit) or long (32-bit) value" + # Courtesy Vishal Sapre + dstr = hex(data)[2:].replace('L','') + byteCount = len(dstr[::2]) + val = 0 + for i, n in enumerate(range(byteCount)): + d = data & 0xFF + val |= (d << (8 * (byteCount - i - 1))) + data >>= 8 + return val + + def write8(self, reg, value): + "Writes an 8-bit value to the specified register/address" + try: + self.bus.write_byte_data(self.address, reg, value) + if (self.debug): + print("I2C: Wrote 0x%02X to register 0x%02X" % (value, reg)) + except IOError, err: + print "Error accessing 0x%02X: Check your I2C address" % self.address + return -1 + + def writeList(self, reg, list): + "Writes an array of bytes using I2C format" + try: + self.bus.write_i2c_block_data(self.address, reg, list) + except IOError, err: + print "Error accessing 0x%02X: Check your I2C address" % self.address + return -1 + + def readU8(self, reg): + "Read an unsigned byte from the I2C device" + try: + result = self.bus.read_byte_data(self.address, reg) + if (self.debug): + print "I2C: Device 0x%02X returned 0x%02X from reg 0x%02X" % (self.address, result & 0xFF, reg) + return result + except IOError, err: + print "Error accessing 0x%02X: Check your I2C address" % self.address + return -1 + + def readS8(self, reg): + "Reads a signed byte from the I2C device" + try: + result = self.bus.read_byte_data(self.address, reg) + if (self.debug): + print "I2C: Device 0x%02X returned 0x%02X from reg 0x%02X" % (self.address, result & 0xFF, reg) + if (result > 127): + return result - 256 + else: + return result + except IOError, err: + print "Error accessing 0x%02X: Check your I2C address" % self.address + return -1 + + def readU16(self, reg): + "Reads an unsigned 16-bit value from the I2C device" + try: + hibyte = self.bus.read_byte_data(self.address, reg) + result = (hibyte << 8) + self.bus.read_byte_data(self.address, reg+1) + if (self.debug): + print "I2C: Device 0x%02X returned 0x%04X from reg 0x%02X" % (self.address, result & 0xFFFF, reg) + return result + except IOError, err: + print "Error accessing 0x%02X: Check your I2C address" % self.address + return -1 + + def readS16(self, reg): + "Reads a signed 16-bit value from the I2C device" + try: + hibyte = self.bus.read_byte_data(self.address, reg) + if (hibyte > 127): + hibyte -= 256 + result = (hibyte << 8) + self.bus.read_byte_data(self.address, reg+1) + if (self.debug): + print "I2C: Device 0x%02X returned 0x%04X from reg 0x%02X" % (self.address, result & 0xFFFF, reg) + return result + except IOError, err: + print "Error accessing 0x%02X: Check your I2C address" % self.address + return -1 diff --git a/Adafruit_VCNL4000/Adafruit_I2C.pyc b/Adafruit_VCNL4000/Adafruit_I2C.pyc new file mode 100644 index 0000000000000000000000000000000000000000..0ab5c836596ad8d9caa637cd14676cf2c9aa4f9e GIT binary patch literal 4470 zcmdT{U2hXd6uq-+J9aQoRR{utW?N`$9zsHjAVn1o1WJ+8fYzl6Q7dcX9VeUEyXnlD zVl`2#hCcPBKcX-F5&ch<`UB{>ch`v%IijLXqz3Qh?#%3b+;i@k8TYS~qklMmK50_^ z=i>iaJoYk7h@YZ1(J~x|!UBaZy(HQpdbX^%u3jsmUGxfn3uzVZ-7sjGZj?42P0#J? z^d5KGfYInqk#=a^>*|wl?L0 zm99;BxuIU^uGYBcl#SKxmd~I0Jdn>VYj`qa>+mMml8&C-j3zgG=~@y`_JcIx2X=Es z8`GP35=}gj%89uo)VnPjU(GGd-E=#K`!7lAMwCzxeSY-GL6hFIk9u2nvP?5F^^kRV!04x@vLOFi- zzqw6c<5N_ZIHZ7Nc6)@j&;*FVK}?G@23*F@+_9Cu4!+jmufFDp*CL9@`Bil;?%2Mzd5lIrB_kmwUc<&t9>+`6+92xT^;d)Q-)w3 zs|0?6fAk7&#BqqYN|-7*uIU$otcuLqvLKzn;_MKvUE?nNUAV&_ z4FvblrbfQuDbFR{IF+6-BbiDhHWnM!(8UoG;w_9|vPj;;gdTGUxy-U5_o6zlN@`q< zstf9rYBEcCNz7-V2&ZOmhBILuKS`2xumX-lJ1!}%aLL?a`f%zfYB_ZF;pZ{YV(d`? zA=wxuvrG!KQ6Lw8AT7YM`clY<^I-NC%%X`>;0<(V7)DP}^wLBaU^jI$YDGHqj9!gw zs?B7ch4u=*1^;h*izWe0re3^1HNC{&^;_me_8J;KFa~r9noZF23V=HW=Rq!=7b1hfetO=&=kTN|5n`t1uPej;u)-fdoGW z{5jcWzB3o$*;6p&xIn$4&Z^U@It26kXwtiMIOZ9!t^oUK4s4$pfF2+NSfDEruvgLB z9v+N9#iV~DNvvJ7^7O&D$e_i z0##LZ257+C-rb1#tk#PTrvdU^(H#~7{Q7Fl$18` z2=|~$`~q4OuyY?y3(otT76USo9nJDBe284^oxuK)aNJnRG-psaaF9DHhKQ`lmLeMj zqqY{Y@*OK#_@=><_VoJAhj8uNFd18}9F&ZGT=^Z%dOy8}E35`LL=7C8!C^m^yAP-_ zj6{WlB--XXz#fTk&fmAy93ateIf-xs5Z>`Aq0HJ+fwu78XD49}Xv=FEw5t>UCocK# z@k)PRn~?#-ge^sRo%;JBgb73K<6--Dso?PNUID!fu;inP#@rzwy?; zxR>93KMUGc`;s**Y5oN^m)Ll0-eq%{%@vrv6P9>Kbr<$A6!B3@HrkRiR;*Mjqm^>y iMCDYanoWWaTE6US-1wL#CK3K5i|HM{8(5x3we&X(F6o^B literal 0 HcmV?d00001 diff --git a/Adafruit_VCNL4000/Adafruit_VCNL4000.py b/Adafruit_VCNL4000/Adafruit_VCNL4000.py new file mode 100755 index 00000000..4ebc3a20 --- /dev/null +++ b/Adafruit_VCNL4000/Adafruit_VCNL4000.py @@ -0,0 +1,54 @@ +#!/usr/bin/python + +import time +from Adafruit_I2C import Adafruit_I2C + +# =========================================================================== +# VCNL4000 Class +# =========================================================================== + +# Address of the sensor +VCNL4000_ADDRESS = 0x13 + +# Commands +VCNL4000_COMMAND = 0x80 +VCNL4000_PRODUCTID = 0x81 +VCNL4000_IRLED = 0x83 +VCNL4000_AMBIENTPARAMETER = 0x84 +VCNL4000_AMBIENTDATA = 0x85 +VCNL4000_PROXIMITYDATA = 0x87 +VCNL4000_SIGNALFREQ = 0x89 +VCNL4000_PROXINITYADJUST = 0x8A + +VCNL4000_3M125 = 0 +VCNL4000_1M5625 = 1 +VCNL4000_781K25 = 2 +VCNL4000_390K625 = 3 + +VCNL4000_MEASUREAMBIENT = 0x10 +VCNL4000_MEASUREPROXIMITY = 0x08 +VCNL4000_AMBIENTREADY = 0x40 +VCNL4000_PROXIMITYREADY = 0x20 + +class VCNL4000 : + i2c = None + + # Constructor + def __init__(self, address=0x13): + self.i2c = Adafruit_I2C(address) + + self.address = address + + # Write proximity adjustement register + self.i2c.write8(VCNL4000_PROXINITYADJUST, 0x81); + + # Read data from proximity sensor + def read_proximity(self): + self.i2c.write8(VCNL4000_COMMAND, VCNL4000_MEASUREPROXIMITY) + while True: + result = self.i2c.readU8(VCNL4000_COMMAND) + if (result and VCNL4000_PROXIMITYREADY): + return self.i2c.readU16(VCNL4000_PROXIMITYDATA) + time.sleep(0.001) + + diff --git a/Adafruit_VCNL4000/Adafruit_VCNL4000.pyc b/Adafruit_VCNL4000/Adafruit_VCNL4000.pyc new file mode 100644 index 0000000000000000000000000000000000000000..6a36ebe081ef8728a7b6fec2fec6e9b97ae58cd3 GIT binary patch literal 1829 zcmcgsU2hXd6g{&}>^O10A;4P^0=W;t`6x6<2w3bbGGrHb?383)R*q*wHnL;0I}tyJ^AC*KeZMHPln$2XrzA< zX!;ju1FCO3XbW@%lz`9~Cd3q21t2fY9_54{Mr0DTU63Hm(V0dIjFwa69Kix;T6_&<7r zq9D^02wdIVOO9d_R@ch$B0Ichc*8(v5mOAr?-@QY{Lb(P0}aF+Cw3T^gLsZ%g5e&+ z4+Ms%zm*dPwM>rQO|6qC zO-+{U=Sgg$4Revq;YGrle7s!^s*N4D@^Gu(umLFtl@qo1Bu6UJ=tH_qR%yT6iAue= z)H^o&-NVw5_+{Bld%IDR952`6<(l1GE_Zb_@(71Xzh1dc!IN?fw7{HLT8zVYW=>vsOi-eRd*h%zV)K=yGIC8) z+U9%pafZ@z)nPB`zKA=qIlj(y@sAW@QRKyfD2O=`6m5O|t{*l#Q5c#@atXsuS0A-` z$~*_%!>G?Xt644(e7T6V{#R8>R^DYAR*hMa%@p$e{O7owSq2(s<|EhoE=GnEMH&!3f+9{c@-&%RZj;BOBkolk@ndgM(Pevc^ nu%;!;z>@ksyJ){HxBI%f!{4;@8Ud*=m(5U5PyRWB+35WlG_rSM literal 0 HcmV?d00001 diff --git a/Adafruit_VCNL4000/Adafruit_VCNL4000_example.py b/Adafruit_VCNL4000/Adafruit_VCNL4000_example.py new file mode 100755 index 00000000..36baa422 --- /dev/null +++ b/Adafruit_VCNL4000/Adafruit_VCNL4000_example.py @@ -0,0 +1,17 @@ +#!/usr/bin/python + +from Adafruit_VCNL4000 import VCNL4000 +import time + +# =========================================================================== +# Example Code +# =========================================================================== + +# Initialise the VNCL4000 sensor +vcnl = VCNL4000(0x13) + +# Print proximity sensor data every 100 ms +while True: + + print "Data from proximity sensor", vcnl.read_proximity() + time.sleep(0.1) From 15faea44b5438c9afba0b6c3fc0e9aa3683862fd Mon Sep 17 00:00:00 2001 From: Derk Muenchhausen Date: Sat, 9 Feb 2013 13:36:45 +0100 Subject: [PATCH 05/79] Update Adafruit_MCP230xx/Adafruit_MCP230xx.py removed unreachable code --- Adafruit_MCP230xx/Adafruit_MCP230xx.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/Adafruit_MCP230xx/Adafruit_MCP230xx.py b/Adafruit_MCP230xx/Adafruit_MCP230xx.py index 42565d8d..60bb8fff 100755 --- a/Adafruit_MCP230xx/Adafruit_MCP230xx.py +++ b/Adafruit_MCP230xx/Adafruit_MCP230xx.py @@ -109,9 +109,6 @@ def output(self, pin, value): return self.outputvalue - - self.outputvalue = self._readandchangepin(MCP23017_IODIRA, pin, value, self.outputvalue) - return self.outputvalue def input(self, pin): assert pin >= 0 and pin < self.num_gpios, "Pin number %s is invalid, only 0-%s are valid" % (pin, self.num_gpios) From 8f4f12d2cbfb5eba6eb92ec0bc1addf2c2bd53a1 Mon Sep 17 00:00:00 2001 From: Phillip Burgess Date: Wed, 27 Feb 2013 20:18:42 -0800 Subject: [PATCH 06/79] Ported LCD createChar() method from Arduino lib --- Adafruit_CharLCDPlate/Adafruit_CharLCDPlate.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Adafruit_CharLCDPlate/Adafruit_CharLCDPlate.py b/Adafruit_CharLCDPlate/Adafruit_CharLCDPlate.py index 12e4cdf8..c8515b6d 100644 --- a/Adafruit_CharLCDPlate/Adafruit_CharLCDPlate.py +++ b/Adafruit_CharLCDPlate/Adafruit_CharLCDPlate.py @@ -211,6 +211,12 @@ def noAutoscroll(self): self.displaymode &= ~self.LCD_ENTRYSHIFTINCREMENT self.write4bits(self.LCD_ENTRYMODESET | self.displaymode) + def createChar(self, location, bitmap): + self.write4bits(self.LCD_SETCGRAMADDR | ((location & 7) << 3)) + for i in range(8): + self.write4bits(bitmap[i], True) + self.write4bits(self.LCD_SETDDRAMADDR) + def write4bits(self, bits, char_mode=False): """ Send command to LCD """ #self.delayMicroseconds(1000) # 1000 microsecond sleep From fc1fbe99be613e4232eb4cee471fbbabdaf783a3 Mon Sep 17 00:00:00 2001 From: Phillip Burgess Date: Tue, 12 Mar 2013 12:42:39 -0700 Subject: [PATCH 07/79] Manual merge of changes from bbkiwi --- .../Adafruit_CharLCDPlate.py | 313 ++++++---- Adafruit_CharLCDPlate/NewLCDTest.py | 566 ++++++++++++++++++ Adafruit_MCP230xx/Adafruit_MCP230xx.py | 99 +-- 3 files changed, 814 insertions(+), 164 deletions(-) create mode 100644 Adafruit_CharLCDPlate/NewLCDTest.py diff --git a/Adafruit_CharLCDPlate/Adafruit_CharLCDPlate.py b/Adafruit_CharLCDPlate/Adafruit_CharLCDPlate.py index c8515b6d..98dbbf7c 100644 --- a/Adafruit_CharLCDPlate/Adafruit_CharLCDPlate.py +++ b/Adafruit_CharLCDPlate/Adafruit_CharLCDPlate.py @@ -4,7 +4,7 @@ # based on code from lrvick and LiquidCrystal # lrvic - https://github.com/lrvick/raspi-hd44780/blob/master/hd44780.py # LiquidCrystal - https://github.com/arduino/Arduino/blob/master/libraries/LiquidCrystal/LiquidCrystal.cpp -# + from time import sleep from Adafruit_I2C import Adafruit_I2C @@ -35,57 +35,57 @@ class Adafruit_CharLCDPlate: LEFT = 4 # commands - LCD_CLEARDISPLAY = 0x01 - LCD_RETURNHOME = 0x02 - LCD_ENTRYMODESET = 0x04 - LCD_DISPLAYCONTROL = 0x08 - LCD_CURSORSHIFT = 0x10 - LCD_FUNCTIONSET = 0x20 - LCD_SETCGRAMADDR = 0x40 - LCD_SETDDRAMADDR = 0x80 + LCD_CLEARDISPLAY = 0x01 + LCD_RETURNHOME = 0x02 + LCD_ENTRYMODESET = 0x04 + LCD_DISPLAYCONTROL = 0x08 + LCD_CURSORSHIFT = 0x10 + LCD_FUNCTIONSET = 0x20 + LCD_SETCGRAMADDR = 0x40 + LCD_SETDDRAMADDR = 0x80 # flags for display entry mode - LCD_ENTRYRIGHT = 0x00 - LCD_ENTRYLEFT = 0x02 - LCD_ENTRYSHIFTINCREMENT = 0x01 - LCD_ENTRYSHIFTDECREMENT = 0x00 + LCD_ENTRYRIGHT = 0x00 + LCD_ENTRYLEFT = 0x02 + LCD_ENTRYSHIFTINCREMENT = 0x01 + LCD_ENTRYSHIFTDECREMENT = 0x00 # flags for display on/off control - LCD_DISPLAYON = 0x04 - LCD_DISPLAYOFF = 0x00 - LCD_CURSORON = 0x02 - LCD_CURSOROFF = 0x00 - LCD_BLINKON = 0x01 - LCD_BLINKOFF = 0x00 + LCD_DISPLAYON = 0x04 + LCD_DISPLAYOFF = 0x00 + LCD_CURSORON = 0x02 + LCD_CURSOROFF = 0x00 + LCD_BLINKON = 0x01 + LCD_BLINKOFF = 0x00 # flags for display/cursor shift - LCD_DISPLAYMOVE = 0x08 - LCD_CURSORMOVE = 0x00 + LCD_DISPLAYMOVE = 0x08 + LCD_CURSORMOVE = 0x00 # flags for display/cursor shift - LCD_DISPLAYMOVE = 0x08 - LCD_CURSORMOVE = 0x00 - LCD_MOVERIGHT = 0x04 - LCD_MOVELEFT = 0x00 + LCD_DISPLAYMOVE = 0x08 + LCD_CURSORMOVE = 0x00 + LCD_MOVERIGHT = 0x04 + LCD_MOVELEFT = 0x00 # flags for function set - LCD_8BITMODE = 0x10 - LCD_4BITMODE = 0x00 - LCD_2LINE = 0x08 - LCD_1LINE = 0x00 - LCD_5x10DOTS = 0x04 - LCD_5x8DOTS = 0x00 + LCD_8BITMODE = 0x10 + LCD_4BITMODE = 0x00 + LCD_2LINE = 0x08 + LCD_1LINE = 0x00 + LCD_5x10DOTS = 0x04 + LCD_5x8DOTS = 0x00 - def __init__(self, busnum=0, pin_rs=15, pin_e=13, pins_db=[12, 11, 10, 9], pin_rw=14): + def __init__(self, busnum=1, pin_rs=15, pin_e=13, pins_db=[12, 11, 10, 9], pin_rw=14): self.pin_rs = pin_rs self.pin_e = pin_e self.pin_rw = pin_rw self.pins_db = pins_db - self.mcp = Adafruit_MCP230XX(busnum = busnum, address = 0x20, num_gpios = 16) + self.mcp = Adafruit_MCP230XX(busnum = busnum, address = 0x20, num_gpios = 16) self.mcp.config(self.pin_e, self.OUTPUT) self.mcp.config(self.pin_rs, self.OUTPUT) @@ -96,40 +96,40 @@ def __init__(self, busnum=0, pin_rs=15, pin_e=13, pins_db=[12, 11, 10, 9], pin_r for pin in self.pins_db: self.mcp.config(pin, self.OUTPUT) - self.write4bits(0x33) # initialization - self.write4bits(0x32) # initialization - self.write4bits(0x28) # 2 line 5x7 matrix - self.write4bits(0x0C) # turn cursor off 0x0E to enable cursor - self.write4bits(0x06) # shift cursor right + self.write4bits(0x33) # initialization + self.write4bits(0x32) # initialization + self.write4bits(0x28) # 2 line 5x8 matrix + self.write4bits(0x0C) # turn cursor off 0x0E to enable cursor + self.write4bits(0x06) # set cursor incrementing and no shift of display - self.displaycontrol = self.LCD_DISPLAYON | self.LCD_CURSOROFF | self.LCD_BLINKOFF + self.displaycontrol = self.LCD_DISPLAYON | self.LCD_CURSOROFF | self.LCD_BLINKOFF - self.displayfunction = self.LCD_4BITMODE | self.LCD_1LINE | self.LCD_5x8DOTS - self.displayfunction |= self.LCD_2LINE + self.displayfunction = self.LCD_4BITMODE | self.LCD_1LINE | self.LCD_5x8DOTS + self.displayfunction |= self.LCD_2LINE - """ Initialize to default text direction (for romance languages) """ - self.displaymode = self.LCD_ENTRYLEFT | self.LCD_ENTRYSHIFTDECREMENT - self.write4bits(self.LCD_ENTRYMODESET | self.displaymode) # set the entry mode + """ Initialize to default text direction (for romance languages) """ + self.displaymode = self.LCD_ENTRYLEFT | self.LCD_ENTRYSHIFTDECREMENT + self.write4bits(self.LCD_ENTRYMODESET | self.displaymode) # set the entry mode - # turn on backlights! - self.mcp.config(6, self.mcp.OUTPUT) - self.mcp.config(7, self.mcp.OUTPUT) - self.mcp.config(8, self.mcp.OUTPUT) - self.mcp.output(6, 0) # red - self.mcp.output(7, 0) # green - self.mcp.output(8, 0) # blue + # turn on backlights! + self.mcp.config(6, self.mcp.OUTPUT) + self.mcp.config(7, self.mcp.OUTPUT) + self.mcp.config(8, self.mcp.OUTPUT) + self.mcp.output(6, 0) # red + self.mcp.output(7, 0) # green + self.mcp.output(8, 0) # blue - # turn on pullups + # turn on pullups self.mcp.pullup(self.SELECT, True) self.mcp.pullup(self.LEFT, True) self.mcp.pullup(self.RIGHT, True) self.mcp.pullup(self.UP, True) self.mcp.pullup(self.DOWN, True) - self.mcp.config(self.SELECT, self.mcp.INPUT) - self.mcp.config(self.LEFT, self.mcp.INPUT) - self.mcp.config(self.RIGHT, self.mcp.INPUT) - self.mcp.config(self.DOWN, self.mcp.INPUT) - self.mcp.config(self.UP, self.mcp.INPUT) + self.mcp.config(self.SELECT, self.mcp.INPUT) + self.mcp.config(self.LEFT, self.mcp.INPUT) + self.mcp.config(self.RIGHT, self.mcp.INPUT) + self.mcp.config(self.DOWN, self.mcp.INPUT) + self.mcp.config(self.UP, self.mcp.INPUT) def begin(self, cols, lines): if (lines > 1): @@ -140,16 +140,17 @@ def begin(self, cols, lines): def home(self): self.write4bits(self.LCD_RETURNHOME) # set cursor position to zero - self.delayMicroseconds(2000) # this command takes a long time! + self.waitBFlow() #wait for Busy flag low + def clear(self): self.write4bits(self.LCD_CLEARDISPLAY) # command to clear display - self.delayMicroseconds(2000) # 2000 microsecond sleep, clearing the display takes a long time - + self.waitBFlow() #wait for Busy flag low + def setCursor(self, col, row): self.row_offsets = [ 0x00, 0x40, 0x14, 0x54 ] if ( row > self.numlines ): - row = self.numlines - 1 # we count rows starting w/0 + row = self.numlines - 1 # we count rows starting w/0 self.write4bits(self.LCD_SETDDRAMADDR | (col + self.row_offsets[row])) def noDisplay(self): @@ -163,60 +164,67 @@ def display(self): self.write4bits(self.LCD_DISPLAYCONTROL | self.displaycontrol) def noCursor(self): - """ Turns the underline cursor on/off """ + """ underline cursor off """ self.displaycontrol &= ~self.LCD_CURSORON self.write4bits(self.LCD_DISPLAYCONTROL | self.displaycontrol) def cursor(self): - """ Cursor On """ + """ underline Cursor On """ self.displaycontrol |= self.LCD_CURSORON self.write4bits(self.LCD_DISPLAYCONTROL | self.displaycontrol) - def noBlink(self): - """ Turn on and off the blinking cursor """ - self.displaycontrol &= ~self.LCD_BLINKON + def ToggleCursor(self): + """ Toggles the underline cursor On/Off bb""" + self.displaycontrol ^= self.LCD_CURSORON + self.delayMicroseconds(200000) self.write4bits(self.LCD_DISPLAYCONTROL | self.displaycontrol) def noBlink(self): - """ Turn on and off the blinking cursor """ + """ Turn off the blinking cursor """ self.displaycontrol &= ~self.LCD_BLINKON self.write4bits(self.LCD_DISPLAYCONTROL | self.displaycontrol) + def blink(self): + """ Turn on the blinking cursor""" + self.displaycontrol |= self.LCD_BLINKON + self.write4bits(self.LCD_DISPLAYCONTROL | self.displaycontrol) + + def ToggleBlink(self): + """ Toggles the blinking cursor""" + self.displaycontrol ^= self.LCD_BLINKON + self.delayMicroseconds(200000) + self.write4bits(self.LCD_DISPLAYCONTROL | self.displaycontrol) + + def DisplayLeft(self): """ These commands scroll the display without changing the RAM """ self.write4bits(self.LCD_CURSORSHIFT | self.LCD_DISPLAYMOVE | self.LCD_MOVELEFT) def scrollDisplayRight(self): - """ These commands scroll the display without changing the RAM """ + """ These commands scroll the display without changing the RAM """ self.write4bits(self.LCD_CURSORSHIFT | self.LCD_DISPLAYMOVE | self.LCD_MOVERIGHT); def leftToRight(self): - """ This is for text that flows Left to Right """ + """ This is for text that flows Left to Right """ self.displaymode |= self.LCD_ENTRYLEFT self.write4bits(self.LCD_ENTRYMODESET | self.displaymode); def rightToLeft(self): - """ This is for text that flows Right to Left """ + """ This is for text that flows Right to Left """ self.displaymode &= ~self.LCD_ENTRYLEFT self.write4bits(self.LCD_ENTRYMODESET | self.displaymode) def autoscroll(self): - """ This will 'right justify' text from the cursor """ + """ This will 'right justify' text from the cursor """ self.displaymode |= self.LCD_ENTRYSHIFTINCREMENT self.write4bits(self.LCD_ENTRYMODESET | self.displaymode) def noAutoscroll(self): - """ This will 'left justify' text from the cursor """ + """ This will 'left justify' text from the cursor """ self.displaymode &= ~self.LCD_ENTRYSHIFTINCREMENT self.write4bits(self.LCD_ENTRYMODESET | self.displaymode) - def createChar(self, location, bitmap): - self.write4bits(self.LCD_SETCGRAMADDR | ((location & 7) << 3)) - for i in range(8): - self.write4bits(bitmap[i], True) - self.write4bits(self.LCD_SETDDRAMADDR) - def write4bits(self, bits, char_mode=False): """ Send command to LCD """ #self.delayMicroseconds(1000) # 1000 microsecond sleep @@ -236,74 +244,145 @@ def write4bits(self, bits, char_mode=False): else: self.mcp.output(self.pins_db[::-1][i-4], False) self.pulseEnable() + + #See pg. 24 and 58 HD44780.pdf and http://www.avrbeginners.net/ Standard LCD bit mode + def read4bits(self, char_mode=False): + """ Get Data from LCD, when char_mode = 0 get Busy Flag and Address Counter, else get RAM data """ +# print "First:", bin(self.mcp.direction)[2:].zfill(16) + self.mcp.output(self.pin_rs, char_mode) # when char_mode = 0 get Busy Flag and Address Counter, else get RAM data + self.mcp.output(self.pin_rw, 1) #set rw to 1 + # Configure pins for input + makeinput=True + if makeinput: + for pin in self.pins_db: + self.mcp.config(pin, self.INPUT) + self.mcp.output(self.pin_e, True) # set Enable high and keep while read first nibble + bits = range(8) + # get the pins values + for i in range(4): + bt = self.mcp.input(self.pins_db[::-1][i], makeinput) # if makeinput is False, pin direction checking is supressed in input + bits[i]=bt + #print i,bt,bits[i] + self.mcp.output(self.pin_e, False) # set Enable low to finish first nibble + self.mcp.output(self.pin_e, True) # set Enable high and keep while read 2nd nibble + # get the pins values + for i in range(4,8): + bt = self.mcp.input(self.pins_db[::-1][i-4],makeinput) + bits[i]=bt + #print i,bt,bits[i] + self.mcp.output(self.pin_e, False) # set Enable low to finish 2nd nibble + # restore the pins to output and rw to 0 + for pin in self.pins_db: + self.mcp.config(pin, self.OUTPUT) + self.mcp.output(self.pin_rw, 0) # return rw to 0 +# print "Last :", bin(self.mcp.direction)[2:].zfill(16) + return bits; + + def readBF(self): + """ Get Data from LCD, when char_mode = 0 get Busy Flag and Address Counter, else get RAM data """ +# print "First:", bin(self.mcp.direction)[2:].zfill(16) + self.mcp.output(self.pin_rs, 0) # when char_mode = 0 get Busy Flag and Address Counter, else get RAM data + self.mcp.output(self.pin_rw, 1) #set rw to 1 + # Configure pins for input + makeinput=True + self.mcp.config(self.pins_db[::-1][1], self.INPUT) + self.mcp.output(self.pin_e, True) # set Enable high and keep while read first nibble + # get the pins values + bt = self.mcp.input(self.pins_db[::-1][1], makeinput) # if makeinput is False, pin direction checking is supressed in input + self.mcp.output(self.pin_e, False) # set Enable low to finish first nibble + self.pulseEnable() # one more pulse to get (but ingore the 2nd nibble) + # restore the pins to output and rw to 0 + self.mcp.config(self.pins_db[::-1][1], self.OUTPUT) + self.mcp.output(self.pin_rw, 0) # return rw to 0 + return bt==1 + + def waitBFlow(self): + for cnt in range(100000): + if not self.readBF(): + #print cnt + return + print "timed out of waitBFlow" def delayMicroseconds(self, microseconds): - seconds = microseconds / 1000000 # divide microseconds by 1 million for seconds + seconds = microseconds / 1000000 # divide microseconds by 1 million for seconds sleep(seconds) def pulseEnable(self): self.mcp.output(self.pin_e, True) - self.delayMicroseconds(1) # 1 microsecond pause - enable pulse must be > 450ns + self.delayMicroseconds(1) # 1 microsecond pause - enable pulse must be > 450ns self.mcp.output(self.pin_e, False) - #self.delayMicroseconds(1) # commands need > 37us to settle + #self.delayMicroseconds(1) # commands need > 37us to settle def message(self, text): """ Send string to LCD. Newline wraps to second line""" for char in text: if char == '\n': - self.write4bits(0xC0) # next line + self.write4bits(0xC0) # set DDRAM address 0x40 start of second line else: self.write4bits(ord(char),True) def backlight(self, color): - self.mcp.output(6, not color & 0x01) - self.mcp.output(7, not color & 0x02) - self.mcp.output(8, not color & 0x04) + self.mcp.output(6, not color & 0x01) + self.mcp.output(7, not color & 0x02) + self.mcp.output(8, not color & 0x04) def buttonPressed(self, buttonname): - if (buttonname > self.LEFT): - return false + if (buttonname > self.LEFT): + return false - return not self.mcp.input(buttonname) + return not self.mcp.input(buttonname) if __name__ == '__main__': - lcd = Adafruit_CharLCDPlate(busnum = 0) + lcd = Adafruit_CharLCDPlate(busnum = 1) lcd.clear() lcd.message("Adafruit RGB LCD\nPlate w/Keypad!") sleep(1) - while 1: - if (lcd.buttonPressed(lcd.LEFT)): - lcd.backlight(lcd.RED) - if (lcd.buttonPressed(lcd.UP)): - lcd.backlight(lcd.BLUE) + print " Cycle thru backlight colors 3 times " + + for i in range(3): + print "red" + lcd.backlight(lcd.RED) + sleep(1) + print "yellow" + lcd.backlight(lcd.YELLOW) + sleep(1) + print "green" + lcd.backlight(lcd.GREEN) + sleep(1) + print "teal" + lcd.backlight(lcd.TEAL) + sleep(1) + print "blue" + lcd.backlight(lcd.BLUE) + sleep(1) + print "violet" + lcd.backlight(lcd.VIOLET) + sleep(1) + print "off" + lcd.backlight(lcd.OFF) + sleep(1) + print "on" + lcd.backlight(lcd.ON) + sleep(1) + + print " Try buttons on plate" + + while 1: + if (lcd.buttonPressed(lcd.LEFT)): + lcd.backlight(lcd.RED) - if (lcd.buttonPressed(lcd.DOWN)): - lcd.backlight(lcd.GREEN) + if (lcd.buttonPressed(lcd.UP)): + lcd.backlight(lcd.BLUE) - if (lcd.buttonPressed(lcd.RIGHT)): - lcd.backlight(lcd.VIOLET) + if (lcd.buttonPressed(lcd.DOWN)): + lcd.backlight(lcd.GREEN) - if (lcd.buttonPressed(lcd.SELECT)): - lcd.backlight(lcd.ON) + if (lcd.buttonPressed(lcd.RIGHT)): + lcd.backlight(lcd.VIOLET) + if (lcd.buttonPressed(lcd.SELECT)): + lcd.backlight(lcd.ON) - while 1: - lcd.backlight(lcd.RED) - sleep(1) - lcd.backlight(lcd.YELLOW) - sleep(1) - lcd.backlight(lcd.GREEN) - sleep(1) - lcd.backlight(lcd.TEAL) - sleep(1) - lcd.backlight(lcd.BLUE) - sleep(1) - lcd.backlight(lcd.VIOLET) - sleep(1) - lcd.backlight(lcd.ON) - sleep(1) - lcd.backlight(lcd.OFF) - sleep(1) diff --git a/Adafruit_CharLCDPlate/NewLCDTest.py b/Adafruit_CharLCDPlate/NewLCDTest.py new file mode 100644 index 00000000..7210de6b --- /dev/null +++ b/Adafruit_CharLCDPlate/NewLCDTest.py @@ -0,0 +1,566 @@ +#!/usr/bin/python +# mod by bb 29 Jan 2013 + +from time import sleep +from random import randint +from Adafruit_I2C import Adafruit_I2C +from Adafruit_MCP230xx import Adafruit_MCP230XX +from Adafruit_CharLCDPlate import Adafruit_CharLCDPlate +#from Adafruit_MCP230xx import MCP23017_GPIOB, MCP23017_IODIRB +MCP23017_IODIRA = 0x00 +MCP23017_IODIRB = 0x01 +MCP23017_GPIOA = 0x12 +MCP23017_GPIOB = 0x13 +MCP23017_GPPUA = 0x0C +MCP23017_GPPUB = 0x0D +MCP23017_OLATA = 0x14 +MCP23017_OLATB = 0x15 +import smbus + + +def binfill(num,len=8): + return bin(num)[2:].zfill(len) + +ReverseNib = [0,8,4,12,2,10,6,14,1,9,5,13,3,11,7,15] + +def cur_right(num=1): # note num = 40 in 2 lines mode moves up/down to other line + for cnt in range(num): + lcd.mcp.write8(0x30, MCP23017_GPIOB) #RS=0, R/W=0, E=1, high nibble of lcd command reversed, 0. Going high sends this to LCD as hi bits of instruction code + lcd.mcp.write8(0x04, MCP23017_GPIOB) #RS=0, R/W=0, E=0, low nibble of lcd command reversed, 0 + lcd.mcp.write8(0x24, MCP23017_GPIOB) #same with E=1 so going high sends this nibble to LCD as low bits of instruction code + lcd.mcp.write8(0x04, MCP23017_GPIOB) #same as line two to send E low to finish + +def cur_left(num=1): + for cnt in range(num): + lcd.mcp.write8(0x30, MCP23017_GPIOB) #RS=0, R/W=0, E=1, high nibble of lcd command reversed, 0. Going high sends this to LCD as hi bits of instruction code + lcd.mcp.write8(0x00, MCP23017_GPIOB) #RS=0, R/W=0, E=0, low nibble of lcd command reversed, 0 + lcd.mcp.write8(0x20, MCP23017_GPIOB) #same with E=1 so going high sends this nibble to LCD as low bits of instruction code + lcd.mcp.write8(0x00, MCP23017_GPIOB) #same as line two to send E low to finish + +def display_right(num=1): # note num = 40 in 2 lines mode moves up/down to other line + for cnt in range(num): + lcd.mcp.write8(0x30, MCP23017_GPIOB) #RS=0, R/W=0, E=1, high nibble of lcd command reversed, 0. Going high sends this to LCD as hi bits of instruction code + lcd.mcp.write8(0x06, MCP23017_GPIOB) #RS=0, R/W=0, E=0, low nibble of lcd command reversed, 0 + lcd.mcp.write8(0x26, MCP23017_GPIOB) #same with E=1 so going high sends this nibble to LCD as low bits of instruction code + lcd.mcp.write8(0x06, MCP23017_GPIOB) #same as line two to send E low to finish + +def cur_pos(num=0): +# i.e. Set DDRAM address - the cursor will move to this address +# Note +# in two line mode DDRAM 0 to 39 is first line +# DDRAM 64 to 39+64 is second line +# using num from 40 till 63 will set DDRAM to 64 +# using num from above 39+64 will set DDRAM to 0 +# in one line mode DDRAM goes from 0 to 79 and setting above will go to 0 + # make num become the instruction code for Set DDRAM address + num &= 0x7f # truncate num to 7 bits + num |= 0x80 # make highest bit 1 + # make first byte to send which contains the reverse high nibble of num + hinum = (num & 0xf0) >> 4 + byte1 = 0x20 | (ReverseNib[hinum] << 1) # RS=0, R/W = 0, E = 1, high nibble of lcd command reversed, 0. + lonum = (num & 0xf) + byte2 = (ReverseNib[lonum] << 1) # RS=0, R/W = 0, E = 0, low nibble of lcd command reversed, 0. + #print "num = ", bin8(num), "hinum = ", bin8(hinum), "lonum = ", bin8(lonum) + #print "byte1 = ", bin8(byte1), "byte2 = ", bin8(byte2) + lcd.mcp.write8(byte1, MCP23017_GPIOB) #Going high sends this to LCD as hi bits of instruction code + lcd.mcp.write8(byte2, MCP23017_GPIOB) # E goes low + lcd.mcp.write8(0x20 | byte2, MCP23017_GPIOB) # going high sends this nibble to LCD as low bits of instruction code + lcd.mcp.write8(byte2, MCP23017_GPIOB) # send E low to finish + +def setCGRAMadd(num=0): +# i.e. Set CGRAM address - Write/Read Data from RAM after this will use Character Graphic RAM + # make num become the instruction code for Set CGRAM address + num &= 0x3f # truncate num to 6 bits + num |= 0x40 # make 2nd to highest bit 1 + # make first byte to send which contains the reverse high nibble of num + hinum = (num & 0xf0) >> 4 + byte1 = 0x20 | (ReverseNib[hinum] << 1) # RS=0, R/W = 0, E = 1, high nibble of lcd command reversed, 0. + lonum = (num & 0xf) + byte2 = (ReverseNib[lonum] << 1) # RS=0, R/W = 0, E = 0, low nibble of lcd command reversed, 0. + print "num = ", binfill(num), "hinum = ", binfill(hinum), "lonum = ", binfill(lonum) + print "byte1 = ", binfill(byte1), "byte2 = ", binfill(byte2) + lcd.mcp.write8(byte1, MCP23017_GPIOB) #Going high sends this to LCD as hi bits of instruction code + lcd.mcp.write8(byte2, MCP23017_GPIOB) # E goes low + lcd.mcp.write8(0x20 | byte2, MCP23017_GPIOB) # going high sends this nibble to LCD as low bits of instruction code + lcd.mcp.write8(byte2, MCP23017_GPIOB) # send E low to finish + +def general_cmd(cmd,RS=0,RW=0,debug=0): +# execute a general command for the LCD TC1602A-01T +# cmd are the 8 bits of instuction code from table pg. 11 +# if cmd is a read command (RW = 1) the value read is returned + # make first byte to send which contains the reverse high nibble of cmd + RSbit=0x80 if RS else 0x00 + RWbit=0x40 if RW else 0x00 + Ebit = 0x20 + hicmd = (cmd & 0xf0) >> 4 + byte1 = RSbit | RWbit | Ebit | (ReverseNib[hicmd] << 1) # RS,RW, E = 1, high nibble of lcd command reversed, 0. + locmd = (cmd & 0xf) + byte2 = RSbit | RWbit | (ReverseNib[locmd] << 1) # RS,RW, E = 0, low nibble of lcd command reversed, 0. + if debug: + print "cmd = ", binfill(cmd), "hinum = ", binfill(hicmd), "locmd = ", binfill(locmd) + print "byte1 = ", binfill(byte1), "byte2 = ", binfill(byte2) + lcd.mcp.write8(byte1, MCP23017_GPIOB) #Going high sends this to LCD as hi bits of instruction code + if RW: + currentiodir = lcd.mcp.readU8(MCP23017_IODIRB) # save entering state of input/output for pins from 8-15 + lcd.mcp.write8(0b00011110 | currentiodir, MCP23017_IODIRB) # configure input for pins 9-12 which are 4-7 in GPB + num = lcd.mcp.readU8(MCP23017_GPIOB) # get input which will contain reversed high nibble from LCD + hinum = ReverseNib[(num & 0b00011110) >> 1] # extract the 4 bits and reverse + lcd.mcp.write8(byte2, MCP23017_GPIOB) # E goes low + lcd.mcp.write8(Ebit | byte2, MCP23017_GPIOB) # going high sends this nibble to LCD as low bits of instruction code + if RW: + num = lcd.mcp.readU8(MCP23017_GPIOB) # get input which will contain reversed low nibble from LCD + lonum = ReverseNib[(num & 0b00011110) >> 1] # extract the 4 bits and reverse + if RW: + lcd.mcp.write8(currentiodir, MCP23017_IODIRB) # restore pins input/output to state upon entering this routine + lcd.mcp.write8(0x00, MCP23017_GPIOB) # send all low to finish and be compatible with other CarLCDPlate routines + if RW: + return (hinum << 4) | lonum + +def readfast(ram=False): +# read BF and AC or RAM Data + if ram: + cmdhi = 0xe0 + cmdlo = 0xc0 + else: + cmdhi = 0x60 + cmdlo = 0x40 + lcd.mcp.write8(0b00011111, MCP23017_IODIRB) # configure so input on pins 9-12 which are 4-7 in GPB + lcd.mcp.write8(cmdhi, MCP23017_GPIOB) #Going high prepares to record first nibble info + num = lcd.mcp.readU8(MCP23017_GPIOB) # get input which will contain reversed high nibble from LCD + hinum = ReverseNib[(num & 0b00011110) >> 1] # extract the 4 bits and reverse# extract the 4 bits and reverse + lcd.mcp.write8(cmdlo, MCP23017_GPIOB) # E goes low + lcd.mcp.write8(cmdhi, MCP23017_GPIOB) # going high prepares to recond second nibble info + num = lcd.mcp.readU8(MCP23017_GPIOB) # get input which will contain reversed low nibble from LCD + lonum = ReverseNib[(num & 0b00011110) >> 1] # extract the 4 bits and reverse + lcd.mcp.write8(0x0, MCP23017_GPIOB) # send E low to finish and set RS, RW and all to zero + lcd.mcp.write8(0b00000001, MCP23017_IODIRB) # configure so all approrpriate pins are output again + return (hinum << 4) | lonum + +def DumpMCP23017Regs(regs_to_use=[0x0,18,20]): +# Dump MCP23017 registers see MCP2301721952b.pdf specifications but show first B then A +# Default is to dump only IODIR, GPIO and OLATA +# will show B bank followed by A bank i.e. IODIRB, IODIRA so +# the output corresponds to 'pins' 15,14,...,0 +# to dump all use regs_to_use = range(0x0,0x15,0x2) + RegName = ["IODIR","IPOL","GPINTEN","DEFVAL","INTCON","IOCON","GPPU","INTF","INTCAP","GPIO","OLATA"] + print "B bank then A bank so Pins 15, 14, ..., 0" + print binfill(lcd.mcp.direction,16), " lcd.mcp.direction" #ideally should be same as IODIR + for reg in regs_to_use: + str = binfill(lcd.mcp.readU16(reg),16) + # interchange bytes B reg then A reg so 'pins' are from left to right are 15,14,13,...,0 + print str[8:]+str[:8]," ", RegName[reg/2] + +def home_fast(): +# fast return home + lcd.mcp.write8(0x20, MCP23017_GPIOB) #same with E=1 so going high sends this nibble to LCD as hi bits of instruction code + lcd.mcp.write8(0x08, MCP23017_GPIOB) #RS=0, R/W=0, E=0, low nibble of lcd command reversed, 0 + lcd.mcp.write8(0x28, MCP23017_GPIOB) #same with E=1 so going high sends this nibble to LCD as low bits of instruction code + lcd.mcp.write8(0x08, MCP23017_GPIOB) #same as line three to send E low to finish + +def clear_fast(): +# fast clear + lcd.mcp.write8(0x20, MCP23017_GPIOB) #same with E=1 so going high sends this nibble to LCD as hi bits of instruction code + lcd.mcp.write8(0x10, MCP23017_GPIOB) #RS=0, R/W=0, E=0, low nibble of clear display reversed, 0 + lcd.mcp.write8(0x30, MCP23017_GPIOB) #same with E=1 so going high sends this nibble to LCD as low bits of instruction code + lcd.mcp.write8(0x10, MCP23017_GPIOB) #same as line three to send E low to finish + +def dim_light(on=.5,time=1,nforsec=50): +# dimming routine doesnt work very well +# flashes display on and off over interval time +# on is fraction of time on during the interval + assert 0 <= on and on <= 1, "bad value for on" + ontime = float(on)/nforsec + offtime = (1.0-on)/nforsec + maxct = int(nforsec*time) + print ontime, offtime, maxct + for ct in range(maxct): + lcd.write4bits(0x8) # display off + sleep(offtime) + lcd.write4bits(0xc) # display on + sleep(ontime) + +def dispall(delay=.1): + for i in range(256): + general_cmd(i,1) + sleep(delay) + +def cycle(seq, n): +# cyclic premutation of seq shifting left n + n = n % len(seq) + return seq[n:] + seq[:n] + +def cyclerange(DDRAMrange=range(40), amount=1): +# cyclically shift characters in a range of DDRAM addresses by amount +# DDRAMrange default is line 1 in 2 line mode i.e. 0...39 + # get DDRAM address to be restored + add = general_cmd(0,0,1) + lenrange = len(DDRAMrange) + startadd = DDRAMrange[0] + # get data in DDRAMrange + # set DDRAM address to startadd + general_cmd(0b10000000 + startadd) + win = [0]*lenrange + for i in range(lenrange): #read DDRAM beginning at startadd + win[i] = general_cmd(0,1,1) + win = cycle(win,amount) + general_cmd(0b10000000 + startadd) + for i in range(lenrange): #write shifted values back in DDRAM starting at startadd + general_cmd(win[i],1,0) + # restore DDRAM address + general_cmd(add | 0x80) + +def scrollrange(DDRAMrange=range(40), num=1, delay=.01): + num = num*len(DDRAMrange) + for i in range(num): + cyclerange(DDRAMrange,1) + #sleep(delay) + +def shiftwithinrange(textstart,textlen,DDRAMrange=range(40)): +# cyclically shift characters in a range of DDRAM addresses by one position +# this code maybe faster than cyclerange code +# DDRAMrange default is line 1 in 2 line mode i.e. 0...39 + # if have string of text can shift it to the right one place within a range (say top line) + # assuming this string is surrounded by blanks in the rest of the range + # assuming LCD set in increment mode (rather than decrement mode) + # get DDRAM address to be restored + add = general_cmd(0,0,1) + startrange = DDRAMrange[0] + endrange = DDRAMrange[-1] + lenrange = len(DDRAMrange) + #print startrange, endrange, lenrange + for i in range(textstart+textlen-1,textstart-1,-1): # go thru in reverse + add = i + if i > endrange: + add = i - lenrange + startrange + #print "moving from ", add + # set DDRAM address to + general_cmd(0b10000000 + add) + byte = general_cmd(0,1,1) # this will get byte in DDRAM and increment address counter by 1 + if i+1 > endrange: + add = i + 1 - lenrange + startrange + general_cmd(0b10000000 + add ) + else: + add = add + 1 + general_cmd(byte,1,0) # this will put byte in DDRAM at the new address thus shifting it + #print "moving to ", add, "this char ", chr(byte) + general_cmd(0b10000000 + textstart) + general_cmd(0b00100000,1,0) # this will put blank + # restore DDRAM address + general_cmd(add | 0x80) + + +class Histogram: + def __init__(self): + # make bars in CGRAM of height 8 to 1 in for custom char 0 to 7 (and 8 to 15) + histdata = [31,31,31,31,31,31,31,31, 0,31,31,31,31,31,31,31, 0,0,31,31,31,31,31,31, 0,0,0,31,31,31,31,31, 0,0,0,0,31,31,31,31, 0,0,0,0,0,31,31,31, 0,0,0,0,0,0,31,31, 0,0,0,0,0,0,0,31 ] + general_cmd(0b01000000) # set CGRAM address 0 + for i in range(64): + general_cmd(histdata[i],1) # write data to ram + + def histogram(self,bar,DDRAMstart=64,UseTwoLines=True): + # draws bars of height bar[0],bar[1],... starting at + # DDRAMstart. Heights must >=0 and <= max 16 for TwoLines and 8 for OneLine). + # In the case UseTwoLines==True, the bars use two rows, so it is advised + # to make DDRAMstart on the 2nd line. + # note no checking done on values. If they are bigger than 16 other characters + # will be displayed instead of the custom bars. + # get DDRAM address to be restored + add = general_cmd(0,0,1) + # draw bottom row + # set DDRAM address to start + general_cmd(0b10000000 + DDRAMstart) + for y in bar: + char = max(16-y,8) + general_cmd(char,1,0) # put char which has appropriate height + if UseTwoLines: + # draw top row + # set DDRAM address to start + general_cmd(0b10000000 + DDRAMstart - 64) + for y in bar: + char = min(16-y,8) + 8 + general_cmd(char,1,0) # put char which has appropriate height + # restore DDRAM address + general_cmd(add | 0x80) + + +class DotGrid: + def __init__(self): + # make dot patterns in CGRAM + self.dotdata = [0,0,0,0,14,31,14,0, 14,31,14,0,0,0,0,0, 14,31,14,0,14,31,14,0, 0,0,0,0,0,14,31,14, 0,14,31,14,0,0,0,0, 0,14,31,14,0,14,31,14] + self.dedata = [[[64,2,1,0],[64,2,0,1],[0,5,4,3],[0,5,3,4]], [[64,1,2,32],[64,0,2,32],[0,4,5,32],[0,3,5,32]]] + self.isdotdata = [[64,0,2],[64,1,2],[0,3,5],[0,4,5]] + self.initialize_CGRAM() + + def initialize_CGRAM(self): + general_cmd(0b01000000) # set CGRAM address 0 + for i in range(len(self.dotdata)): + general_cmd(self.dotdata[i],1) # write data to ram + + def draw_erase_or_test(self,x,y,deort): # deort == 0 for draw, ==1 for erase, else test only + # draws, erases or tests a dot at (x,y) + # 0<=x<=39 but only x<=15 visable in default display but can shift to see + # 0<=y<=3 + # get DDRAM address to be restored + add = general_cmd(0,0,1) + addforx = x + self.dedata[0][y][0] + general_cmd(0b10000000 + addforx) # set DDRAM address + byte = general_cmd(0,1,1) # this will get byte in DDRAM + isdot = byte==self.isdotdata[y][1] or byte==self.isdotdata[y][2] + # if asked to draw a dot thats not there or erase a dot that is there do it! + if deort==0 and not isdot or deort==1 and isdot: + char = self.dedata[deort][y][1] if byte==self.dedata[deort][y][2] else self.dedata[deort][y][3] + general_cmd(0b10000000 + addforx) # set DDRAM address + general_cmd(char,1,0) # put char which is one or two dots + # restore DDRAM address + general_cmd(add | 0x80) + # return True if there was a dot at x,y when entered function + return isdot + + def draw(self,x,y): + return self.draw_erase_or_test(x,y,0) + + def erase(self,x,y): + return self.draw_erase_or_test(x,y,1) + + def isdot(self,x,y): + return self.draw_erase_or_test(x,y,2) + + +# OLD +# def draw(self,x,y): +# # draws a dot at (x,y) +# # 0<=x<=39 but only x<=15 in default display can shift to see +# # 0<=y<=3 +# # get DDRAM address to be restored +# add = general_cmd(0,0,1) +# if y==0: +# addforx = x + 64 +# general_cmd(0b10000000 + addforx) # set DDRAM address +# byte = general_cmd(0,1,1) # this will get byte in DDRAM +# char = 2 if byte==1 else 0 +# general_cmd(0b10000000 + addforx) # set DDRAM address +# general_cmd(char,1,0) # put char which is one or two dots +# elif y==1: +# addforx = 64 + x +# general_cmd(0b10000000 + addforx) # set DDRAM address +# byte = general_cmd(0,1,1) # this will get byte in DDRAM +# char = 2 if byte==0 else 1 +# general_cmd(0b10000000 + addforx) # set DDRAM address +# general_cmd(char,1,0) # put char which is one or two dots +# elif y==2: +# addforx = x +# general_cmd(0b10000000 + addforx) # set DDRAM address +# byte = general_cmd(0,1,1) # this will get byte in DDRAM +# char = 5 if byte==4 else 3 +# general_cmd(0b10000000 + addforx) # set DDRAM address +# general_cmd(char,1,0) # put char which is one or two dots +# elif y==3: +# addforx = x +# general_cmd(0b10000000 + addforx) # set DDRAM address +# byte = general_cmd(0,1,1) # this will get byte in DDRAM +# general_cmd(0b10000000 + addforx) # set DDRAM address +# general_cmd(char,1,0) # put char which is one or two dots +# else: +# print "y not 0,1,2 or 3" +# # restore DDRAM address +# general_cmd(add | 0x80) +# + + +back = 0 +def ToggleBacklight(back): + back ^= 1 + lcd.backlight(back) + sleep(.2) + return back + + + +# initialize the LCD plate +# use busnum = 0 for raspi version 1 (256MB) and busnum = 1 for version 2 +lcd = Adafruit_CharLCDPlate(busnum = 1) + +Hist = Histogram() +bar = [0]*16 + +DotG = DotGrid() + +general_cmd(0b1) # clear +lcd.waitBFlow() # must wait for clear to complete + +# Testing using keyboard +while 1: + cmd = raw_input() + if cmd == 'help': + print "10, 9, bf, cgram, config, cyclerange, dim, dispall, dot, dotinit, dump, edot, histogram, histograminit, longchar, mess, oneline, ramdata, sdr, scrollrange, shiftwithinrange, test, twoline, quit" + + if cmd == 'test': + print "Routine for testing" + + if cmd == '10': + str = raw_input("10 bits of instruction code:") + RS = str[0]=="1" # 1 is true + RW = str[1]=="1" # 1 is true + str = str[2:].zfill(8) + num = int('0b'+str,2) + numrpt = raw_input("repeat #:") + numrpt = 1 if numrpt=="" else int(numrpt) + for count in range(0,numrpt): + print(general_cmd(num,RS,RW)) + + if cmd == 'dim': + time = 2 + on = input("Fraction on? ") + nforsec = input("nforsec? ") + dim_light(on,time,nforsec) + + if cmd == 'bf': + #print "BF", lcd.readBF() + print "fast BF + AD = ", binfill(readfast()) # read Busy Flag and Adress + #print "BF + AD = ", lcd.read4bits() # read Busy Flag and Adress + + if cmd == 'sdr': + numrpt = raw_input("Shift Display Right by ") + numrpt = 1 if numrpt=="" else int(numrpt) + display_right(numrpt) + + if cmd == 'cyclerange': + line = input("Window Range? ") + line = range(40) if line=="" else line + amt = raw_input("How much? ") + amt = 1 if amt=="" else int(amt) + cyclerange(line,amt) + + if cmd == 'dotinit': + DotG.initialize_CGRAM() + + if cmd == 'dot': + x = input("x? ") + y = input("y? ") + #print(DotG.draw_erase_or_test(x,y,0)) + print(DotG.draw(x,y)) + + if cmd == 'edot': + x = input("x? ") + y = input("y? ") + #print(DotG.draw_erase_or_test(x,y,1)) + print(DotG.erase(x,y)) + + if cmd == 'histograminit': + Hist.__init__() + + if cmd == 'histogram': + #bar = input("Bar list? ") + barcurrent = [0]*16 + barnew = barcurrent[:] + barshow = barcurrent[:] + for cnt in range(30): + for ind in range(len(barcurrent)): + barnew[ind] = randint(0,16) + tmax = 4 + for time in range(tmax+1): + for ind in range(len(barcurrent)): + barshow[ind] = int(((tmax-time)*barcurrent[ind] + time*barnew[ind])/float(tmax)) + Hist.histogram(barshow) + barcurrent = barnew[:] + + if cmd == 'scrollrange': + line = input("Window Range? ") + line = range(40) if line=="" else line + scrollrange(line) + + if cmd == 'shiftwithinrange': + #textstart = input('Start? ') + #textlen = input('Length? ') + #shiftwithinrange(textstart,textlen, range(10)) + #general_cmd(0b00011000) # display shift left + for i in range(40): + shiftwithinrange(i,16) + general_cmd(0b00011000) # display shift left + sleep(.05) + + if cmd == 'cgram': + num = raw_input("CGRAM address? ") + setCGRAMadd(int(num)) + + if cmd == 'ramdata': + print "fast RAM Data = ", binfill(readfast(True)) # read data from RAM + #print "RAM Data = ", lcd.read4bits(True) # read data from RAM + + if cmd == 'mess': + str = raw_input("message:") + lcd.message(str); + + if cmd == '9': + str = raw_input("9 bits of instruction code:") + char_mode = str[0]=="1" # 1 is true + str = str[1:].zfill(8) + bits = int('0b'+str,2) + print char_mode, str, bits + numrpt = raw_input("repeat #:") + numrpt = 1 if numrpt=="" else int(numrpt) + for count in range(0,numrpt): + lcd.write4bits(bits, char_mode) + + if cmd == 'dump': + DumpMCP23017Regs() + + if cmd == 'config': + pin = int(raw_input("pin number ")) + state = int(raw_input("1 or 0 "))==1 + lcd.mcp.config(pin,state) + + if cmd == 'oneline': + general_cmd(0b100000) + + if cmd == 'twoline': + general_cmd(0b101000) + + if cmd == 'longchar': + general_cmd(0b100100) + + if cmd == 'dispall': + dispall() + + if cmd == 'quit': + exit() + +# Testing using buttons on LCDPlate +while 1: + if (lcd.buttonPressed(lcd.LEFT)): + #print "BF", lcd.readBF() + print "fast BF + AD = ", binfill(readfast()) # read Busy Flag and Adress + #print "BF + AD = ", lcd.read4bits() # read Busy Flag and Adress + #back = ToggleBacklight(back) + sleep(.2) + + if (lcd.buttonPressed(lcd.UP)): + num = raw_input("Shift Display Right by ") + display_right(int(num)) + #num = raw_input("CGRAM address? ") + #setCGRAMadd(int(num)) + sleep(.2) #prevent multiple execution while button is down + + if (lcd.buttonPressed(lcd.DOWN)): + print "fast RAM Data = ", binfill(readfast(True)) # read data from RAM + #print "RAM Data = ", lcd.read4bits(True) # read data from RAM + sleep(.2) + + if (lcd.buttonPressed(lcd.RIGHT)): + str = raw_input("message:") + lcd.message(str); + + if (lcd.buttonPressed(lcd.SELECT)): + str = raw_input("9 bits of instruction code:") + char_mode = str[0]=="1" # 1 is true + str = str[1:].zfill(8) + bits = int('0b'+str,2) + print char_mode, str, bits + numrpt = raw_input("repeat #:") + #print "input",numrpt + if (numrpt == ""): # return means 1 + numrpt = 1 + else: + numrpt = int(numrpt) + for count in range(0,numrpt): + lcd.write4bits(bits, char_mode) diff --git a/Adafruit_MCP230xx/Adafruit_MCP230xx.py b/Adafruit_MCP230xx/Adafruit_MCP230xx.py index 60bb8fff..4face7f1 100755 --- a/Adafruit_MCP230xx/Adafruit_MCP230xx.py +++ b/Adafruit_MCP230xx/Adafruit_MCP230xx.py @@ -58,6 +58,7 @@ def __init__(self, address, num_gpios, busnum = 0): self.direction |= self.i2c.readU8(MCP23017_IODIRB) << 8 self.i2c.write8(MCP23017_GPPUA, 0x00) self.i2c.write8(MCP23017_GPPUB, 0x00) + def _changebit(self, bitmap, bit, value): assert value == 1 or value == 0, "Value is %s must be 1 or 0" % value @@ -70,7 +71,7 @@ def _readandchangepin(self, port, pin, value, currvalue = None): assert pin >= 0 and pin < self.num_gpios, "Pin number %s is invalid, only 0-%s are valid" % (pin, self.num_gpios) #assert self.direction & (1 << pin) == 0, "Pin %s not set to output" % pin if not currvalue: - currvalue = self.i2c.readU8(port) + currvalue = self.i2c.readU8(port) newvalue = self._changebit(currvalue, pin, value) self.i2c.write8(port, newvalue) return newvalue @@ -91,10 +92,12 @@ def config(self, pin, mode): self.direction = self._readandchangepin(MCP23017_IODIRA, pin, mode) if self.num_gpios <= 16: if (pin < 8): - self.direction = self._readandchangepin(MCP23017_IODIRA, pin, mode) + # replace low bits + self.direction = (self.direction & 0xff00) | self._readandchangepin(MCP23017_IODIRA, pin, mode) else: - self.direction = self._readandchangepin(MCP23017_IODIRB, pin-8, mode) - + # replace hi bits + self.direction = (self.direction & 0xff) | self._readandchangepin(MCP23017_IODIRB, pin-8, mode) << 8 + #print "config ", pin, mode, self.direction, bin(self.direction)[2:].zfill(16) return self.direction def output(self, pin, value): @@ -106,13 +109,14 @@ def output(self, pin, value): self.outputvalue = self._readandchangepin(MCP23017_GPIOA, pin, value, self.i2c.readU8(MCP23017_OLATA)) else: self.outputvalue = self._readandchangepin(MCP23017_GPIOB, pin-8, value, self.i2c.readU8(MCP23017_OLATB)) - return self.outputvalue +# inaccessible code removed from here - def input(self, pin): + def input(self, pin, check=True): assert pin >= 0 and pin < self.num_gpios, "Pin number %s is invalid, only 0-%s are valid" % (pin, self.num_gpios) - assert self.direction & (1 << pin) != 0, "Pin %s not set to input" % pin + if check: + assert self.direction & (1 << pin) != 0, "Pin %s not set to input" % pin if self.num_gpios <= 8: value = self.i2c.readU8(MCP23008_GPIOA) elif self.num_gpios > 8 and self.num_gpios <= 16: @@ -120,37 +124,38 @@ def input(self, pin): temp = value >> 8 value <<= 8 value |= temp - return value & (1 << pin) - - def readU8(self): - result = self.i2c.readU8(MCP23008_OLATA) - return(result) - - def readS8(self): - result = self.i2c.readU8(MCP23008_OLATA) - if (result > 127): result -= 256 - return result - - def readU16(self): - assert self.num_gpios >= 16, "16bits required" - lo = self.i2c.readU8(MCP23017_OLATA) - hi = self.i2c.readU8(MCP23017_OLATB) - return((hi << 8) | lo) - - def readS16(self): - assert self.num_gpios >= 16, "16bits required" - lo = self.i2c.readU8(MCP23017_OLATA) - hi = self.i2c.readU8(MCP23017_OLATB) - if (hi > 127): hi -= 256 - return((hi << 8) | lo) - - def write8(self, value): - self.i2c.write8(MCP23008_OLATA, value) - - def write16(self, value): - assert self.num_gpios >= 16, "16bits required" - self.i2c.write8(MCP23017_OLATA, value & 0xFF) - self.i2c.write8(MCP23017_OLATB, (value >> 8) & 0xFF) + return (value & (1 << pin))>>pin # to make 0 or 1 + + + +# these were indented so within scope of input but have now made them all part of the class +# have modified so can read any address but default to those given in original code +# also use available routines in imported Adafruit_I2C class + def readU8(self, add=MCP23008_OLATA): + result = self.i2c.readU8(add) + return(result) + + def readS8(self, add=MCP23008_OLATA): + result = self.i2c.readS8(add) + return result + + def readU16(self, add=MCP23017_OLATA): + assert self.num_gpios >= 16, "16bits required" + result = self.i2c.readU16(add) + return result + + def readS16(self, add=MCP23017_OLATA): + assert self.num_gpios >= 16, "16bits required" + result = self.i2c.readS16(add) + return result + + def write8(self, value, add=MCP23008_OLATA): + self.i2c.write8(add, value) + + def write16(self, value, add=MCP23017_OLATA): + assert self.num_gpios >= 16, "16bits required" + self.i2c.write16(add, value) + # RPi.GPIO compatible interface for MCP23017 and MCP23008 @@ -178,21 +183,21 @@ def pullup(self, pin, value): mcp = Adafruit_MCP230XX(address = 0x20, num_gpios = 8) # *************************************************** - # Set num_gpios to 8 for MCP23008 or 16 for MCP23017! - # If you have a new Pi you may also need to add: - # busnum = 1 - # *************************************************** - - # Set pins 0, 1 and 2 to output (you can set pins 0..15 this way) + # Set num_gpios to 8 for MCP23008 or 16 for MCP23017! + # If you have a new Pi you may also need to add: + # busnum = 1 + # *************************************************** + + # Set pins 0, 1 and 2 to output (you can set pins 0..15 this way) mcp.config(0, mcp.OUTPUT) mcp.config(1, mcp.OUTPUT) mcp.config(2, mcp.OUTPUT) - - # Set pin 3 to input with the pullup resistor enabled + + # Set pin 3 to input with the pullup resistor enabled mcp.pullup(3, 1) # Read pin 3 and display the results print "%d: %x" % (3, mcp.input(3) >> 3) - + # Python speed test on output 0 toggling at max speed while (True): mcp.output(0, 1) # Pin 0 High From 5953d83f677f67f333ed44910d4577be6f2729d8 Mon Sep 17 00:00:00 2001 From: Phillip Burgess Date: Tue, 12 Mar 2013 14:11:04 -0700 Subject: [PATCH 08/79] Incorporating nmadura's BeagleBone changes --- Adafruit_I2C/Adafruit_I2C.py | 96 ++++++++++++++++++------------------ 1 file changed, 49 insertions(+), 47 deletions(-) diff --git a/Adafruit_I2C/Adafruit_I2C.py b/Adafruit_I2C/Adafruit_I2C.py index d0416529..64486376 100755 --- a/Adafruit_I2C/Adafruit_I2C.py +++ b/Adafruit_I2C/Adafruit_I2C.py @@ -8,6 +8,7 @@ class Adafruit_I2C : + @staticmethod def getPiRevision(): "Gets the version number of the Raspberry Pi board" # Courtesy quick2wire-python-api @@ -19,109 +20,110 @@ def getPiRevision(): return 1 if line.rstrip()[-1] in ['1','2'] else 2 except: return 0 + + @staticmethod + def getPiI2CBusNumber(): + # Gets the I2C bus number /dev/i2c# + return 1 if Adafruit_I2C.getPiRevision() > 1 else 0 - def __init__(self, address, bus=smbus.SMBus(1 if getPiRevision() > 1 else 0), debug=False): + def __init__(self, address, bus=-1, debug=False): self.address = address - # By default, the correct I2C bus is auto-detected using /proc/cpuinfo - self.bus = bus - # Alternatively, you can hard-code the bus version below: - # self.bus = smbus.SMBus(0); # Force I2C0 (early 256MB Pi's) + # By default, the correct I2C bus is auto-detected using /proc/cpuinfo + # Alternatively, you can hard-code the bus version below: + # self.bus = smbus.SMBus(0); # Force I2C0 (early 256MB Pi's) # self.bus = smbus.SMBus(1); # Force I2C1 (512MB Pi's) + self.bus = smbus.SMBus( + bus if bus >= 0 else Adafruit_I2C.getPiI2CBusNumber()) self.debug = debug def reverseByteOrder(self, data): "Reverses the byte order of an int (16-bit) or long (32-bit) value" # Courtesy Vishal Sapre - dstr = hex(data)[2:].replace('L','') - byteCount = len(dstr[::2]) - val = 0 - for i, n in enumerate(range(byteCount)): - d = data & 0xFF - val |= (d << (8 * (byteCount - i - 1))) + byteCount = len(hex(data)[2:].replace('L','')[::2]) + val = 0 + for i in range(byteCount): + val = (val << 8) | (data & 0xff) data >>= 8 return val + def errMsg(): + print "Error accessing 0x%02X: Check your I2C address" % self.address + return -1 + def write8(self, reg, value): "Writes an 8-bit value to the specified register/address" try: self.bus.write_byte_data(self.address, reg, value) - if (self.debug): + if self.debug: print "I2C: Wrote 0x%02X to register 0x%02X" % (value, reg) except IOError, err: - print "Error accessing 0x%02X: Check your I2C address" % self.address - return -1 + return errMsg() def writeList(self, reg, list): "Writes an array of bytes using I2C format" try: - if (self.debug): + if self.debug: print "I2C: Writing list to register 0x%02X:" % reg print list self.bus.write_i2c_block_data(self.address, reg, list) except IOError, err: - print "Error accessing 0x%02X: Check your I2C address" % self.address - return -1 + return errMsg() def readList(self, reg, length): "Read a list of bytes from the I2C device" results = [] try: results = self.bus.read_i2c_block_data(self.address, reg, length) - if (self.debug): - print "I2C: Device 0x%02X returned the following from reg 0x%02X" % (self.address, reg) + if self.debug: + print ("I2C: Device 0x%02X returned the following from reg 0x%02X" % + (self.address, reg)) print results return results except IOError, err: - print "Error accessing 0x%02X: Check your I2C address" % self.address - return -1 + return errMsg() def readU8(self, reg): "Read an unsigned byte from the I2C device" try: result = self.bus.read_byte_data(self.address, reg) - if (self.debug): - print "I2C: Device 0x%02X returned 0x%02X from reg 0x%02X" % (self.address, result & 0xFF, reg) + if self.debug: + print ("I2C: Device 0x%02X returned 0x%02X from reg 0x%02X" % + (self.address, result & 0xFF, reg)) return result except IOError, err: - print "Error accessing 0x%02X: Check your I2C address" % self.address - return -1 + return errMsg() def readS8(self, reg): "Reads a signed byte from the I2C device" try: result = self.bus.read_byte_data(self.address, reg) - if (self.debug): - print "I2C: Device 0x%02X returned 0x%02X from reg 0x%02X" % (self.address, result & 0xFF, reg) - if (result > 127): - return result - 256 - else: - return result + if result > 127: result -= 256 + if self.debug: + print ("I2C: Device 0x%02X returned 0x%02X from reg 0x%02X" % + (self.address, result & 0xFF, reg)) + return result except IOError, err: - print "Error accessing 0x%02X: Check your I2C address" % self.address - return -1 + return errMsg() def readU16(self, reg): "Reads an unsigned 16-bit value from the I2C device" try: - hibyte = self.bus.read_byte_data(self.address, reg) - result = (hibyte << 8) + self.bus.read_byte_data(self.address, reg+1) - if (self.debug): - print "I2C: Device 0x%02X returned 0x%04X from reg 0x%02X" % (self.address, result & 0xFFFF, reg) + result = self.bus.read_word_data(self.address, reg) + if self.debug: + print ("I2C: Device 0x%02X returned 0x%04X from reg 0x%02X" % + (self.address, result & 0xFFFF, reg)) return result except IOError, err: - print "Error accessing 0x%02X: Check your I2C address" % self.address - return -1 + return errMsg() def readS16(self, reg): "Reads a signed 16-bit value from the I2C device" try: - hibyte = self.bus.read_byte_data(self.address, reg) - if (hibyte > 127): - hibyte -= 256 - result = (hibyte << 8) + self.bus.read_byte_data(self.address, reg+1) - if (self.debug): - print "I2C: Device 0x%02X returned 0x%04X from reg 0x%02X" % (self.address, result & 0xFFFF, reg) + result = self.bus.read_word_data(self.address, reg) + if result > 32767: result -= 65536 + if self.debug: + print ("I2C: Device 0x%02X returned 0x%04X from reg 0x%02X" % + (self.address, result & 0xFFFF, reg)) return result except IOError, err: - print "Error accessing 0x%02X: Check your I2C address" % self.address - return -1 + return errMsg() From 032817b9402d1e63c09609bd688811fbd50509f8 Mon Sep 17 00:00:00 2001 From: Phillip Burgess Date: Wed, 13 Mar 2013 13:49:20 -0700 Subject: [PATCH 09/79] Broad changes to I2C, MCP320XX, CharLCDPlate (faster) --- Adafruit_BMP085/Adafruit_I2C.py | 96 +-- .../Adafruit_CharLCDPlate.py | 589 +++++++++--------- Adafruit_CharLCDPlate/NewLCDTest.py | 566 ----------------- Adafruit_I2C/Adafruit_I2C.py | 41 +- Adafruit_MCP230xx/Adafruit_MCP230xx.py | 313 +++++----- Adafruit_MCP4725/Adafruit_I2C.py | 96 +-- Adafruit_PWM_Servo_Driver/Adafruit_I2C.py | 96 +-- Adafruit_VCNL4000/Adafruit_I2C.py | 96 +-- Adafruit_VCNL4000/Adafruit_I2C.pyc | Bin 4470 -> 0 bytes Adafruit_VCNL4000/Adafruit_VCNL4000.pyc | Bin 1829 -> 0 bytes 10 files changed, 480 insertions(+), 1413 deletions(-) mode change 100755 => 120000 Adafruit_BMP085/Adafruit_I2C.py delete mode 100644 Adafruit_CharLCDPlate/NewLCDTest.py mode change 100755 => 120000 Adafruit_MCP4725/Adafruit_I2C.py mode change 100755 => 120000 Adafruit_PWM_Servo_Driver/Adafruit_I2C.py mode change 100755 => 120000 Adafruit_VCNL4000/Adafruit_I2C.py delete mode 100644 Adafruit_VCNL4000/Adafruit_I2C.pyc delete mode 100644 Adafruit_VCNL4000/Adafruit_VCNL4000.pyc diff --git a/Adafruit_BMP085/Adafruit_I2C.py b/Adafruit_BMP085/Adafruit_I2C.py deleted file mode 100755 index dd2dfa76..00000000 --- a/Adafruit_BMP085/Adafruit_I2C.py +++ /dev/null @@ -1,95 +0,0 @@ -#!/usr/bin/python - -import smbus - -# =========================================================================== -# Adafruit_I2C Base Class -# =========================================================================== - -class Adafruit_I2C : - - def __init__(self, address, bus=smbus.SMBus(0), debug=False): - self.address = address - self.bus = bus - self.debug = debug - - def reverseByteOrder(self, data): - "Reverses the byte order of an int (16-bit) or long (32-bit) value" - # Courtesy Vishal Sapre - dstr = hex(data)[2:].replace('L','') - byteCount = len(dstr[::2]) - val = 0 - for i, n in enumerate(range(byteCount)): - d = data & 0xFF - val |= (d << (8 * (byteCount - i - 1))) - data >>= 8 - return val - - def write8(self, reg, value): - "Writes an 8-bit value to the specified register/address" - try: - self.bus.write_byte_data(self.address, reg, value) - if (self.debug): - print("I2C: Wrote 0x%02X to register 0x%02X" % (value, reg)) - except IOError, err: - print "Error accessing 0x%02X: Check your I2C address" % self.address - return -1 - - def writeList(self, reg, list): - "Writes an array of bytes using I2C format" - try: - self.bus.write_i2c_block_data(self.address, reg, list) - except IOError, err: - print "Error accessing 0x%02X: Check your I2C address" % self.address - return -1 - - def readU8(self, reg): - "Read an unsigned byte from the I2C device" - try: - result = self.bus.read_byte_data(self.address, reg) - if (self.debug): - print "I2C: Device 0x%02X returned 0x%02X from reg 0x%02X" % (self.address, result & 0xFF, reg) - return result - except IOError, err: - print "Error accessing 0x%02X: Check your I2C address" % self.address - return -1 - - def readS8(self, reg): - "Reads a signed byte from the I2C device" - try: - result = self.bus.read_byte_data(self.address, reg) - if (self.debug): - print "I2C: Device 0x%02X returned 0x%02X from reg 0x%02X" % (self.address, result & 0xFF, reg) - if (result > 127): - return result - 256 - else: - return result - except IOError, err: - print "Error accessing 0x%02X: Check your I2C address" % self.address - return -1 - - def readU16(self, reg): - "Reads an unsigned 16-bit value from the I2C device" - try: - hibyte = self.bus.read_byte_data(self.address, reg) - result = (hibyte << 8) + self.bus.read_byte_data(self.address, reg+1) - if (self.debug): - print "I2C: Device 0x%02X returned 0x%04X from reg 0x%02X" % (self.address, result & 0xFFFF, reg) - return result - except IOError, err: - print "Error accessing 0x%02X: Check your I2C address" % self.address - return -1 - - def readS16(self, reg): - "Reads a signed 16-bit value from the I2C device" - try: - hibyte = self.bus.read_byte_data(self.address, reg) - if (hibyte > 127): - hibyte -= 256 - result = (hibyte << 8) + self.bus.read_byte_data(self.address, reg+1) - if (self.debug): - print "I2C: Device 0x%02X returned 0x%04X from reg 0x%02X" % (self.address, result & 0xFFFF, reg) - return result - except IOError, err: - print "Error accessing 0x%02X: Check your I2C address" % self.address - return -1 diff --git a/Adafruit_BMP085/Adafruit_I2C.py b/Adafruit_BMP085/Adafruit_I2C.py new file mode 120000 index 00000000..77f06164 --- /dev/null +++ b/Adafruit_BMP085/Adafruit_I2C.py @@ -0,0 +1 @@ +../Adafruit_I2C/Adafruit_I2C.py \ No newline at end of file diff --git a/Adafruit_CharLCDPlate/Adafruit_CharLCDPlate.py b/Adafruit_CharLCDPlate/Adafruit_CharLCDPlate.py index 98dbbf7c..ba14d66c 100644 --- a/Adafruit_CharLCDPlate/Adafruit_CharLCDPlate.py +++ b/Adafruit_CharLCDPlate/Adafruit_CharLCDPlate.py @@ -1,388 +1,361 @@ -#!/usr/bin/pythonhttp://raspberrypi.local/editor +#!/usr/bin/python -# -# based on code from lrvick and LiquidCrystal +# Based on code from lrvick and LiquidCrystal # lrvic - https://github.com/lrvick/raspi-hd44780/blob/master/hd44780.py # LiquidCrystal - https://github.com/arduino/Arduino/blob/master/libraries/LiquidCrystal/LiquidCrystal.cpp - -from time import sleep -from Adafruit_I2C import Adafruit_I2C from Adafruit_MCP230xx import Adafruit_MCP230XX -import smbus +class Adafruit_CharLCDPlate(Adafruit_MCP230XX): -class Adafruit_CharLCDPlate: + # Port expander input pin definitions + SELECT = 0 + RIGHT = 1 + DOWN = 2 + UP = 3 + LEFT = 4 - OUTPUT = 0 - INPUT = 1 - # LED colors - RED = 0x01 - GREEN = 0x02 - BLUE = 0x04 - YELLOW = 0x03 - TEAL = 0x06 - VIOLET = 0x05 - ON = 0x07 - OFF = 0x0 - - # buttons - SELECT = 0 - RIGHT = 1 - DOWN = 2 - UP = 3 - LEFT = 4 - - # commands - LCD_CLEARDISPLAY = 0x01 - LCD_RETURNHOME = 0x02 - LCD_ENTRYMODESET = 0x04 - LCD_DISPLAYCONTROL = 0x08 - LCD_CURSORSHIFT = 0x10 - LCD_FUNCTIONSET = 0x20 - LCD_SETCGRAMADDR = 0x40 - LCD_SETDDRAMADDR = 0x80 - - # flags for display entry mode - LCD_ENTRYRIGHT = 0x00 - LCD_ENTRYLEFT = 0x02 - LCD_ENTRYSHIFTINCREMENT = 0x01 - LCD_ENTRYSHIFTDECREMENT = 0x00 - - # flags for display on/off control - LCD_DISPLAYON = 0x04 - LCD_DISPLAYOFF = 0x00 - LCD_CURSORON = 0x02 - LCD_CURSOROFF = 0x00 - LCD_BLINKON = 0x01 - LCD_BLINKOFF = 0x00 - - # flags for display/cursor shift - LCD_DISPLAYMOVE = 0x08 - LCD_CURSORMOVE = 0x00 - - # flags for display/cursor shift - LCD_DISPLAYMOVE = 0x08 - LCD_CURSORMOVE = 0x00 - LCD_MOVERIGHT = 0x04 - LCD_MOVELEFT = 0x00 - - # flags for function set - LCD_8BITMODE = 0x10 - LCD_4BITMODE = 0x00 - LCD_2LINE = 0x08 - LCD_1LINE = 0x00 - LCD_5x10DOTS = 0x04 - LCD_5x8DOTS = 0x00 - - - - - def __init__(self, busnum=1, pin_rs=15, pin_e=13, pins_db=[12, 11, 10, 9], pin_rw=14): - self.pin_rs = pin_rs - self.pin_e = pin_e - self.pin_rw = pin_rw - self.pins_db = pins_db - - self.mcp = Adafruit_MCP230XX(busnum = busnum, address = 0x20, num_gpios = 16) - - self.mcp.config(self.pin_e, self.OUTPUT) - self.mcp.config(self.pin_rs, self.OUTPUT) - self.mcp.config(self.pin_rw, self.OUTPUT) - self.mcp.output(self.pin_rw, 0) - self.mcp.output(self.pin_e, 0) - - for pin in self.pins_db: - self.mcp.config(pin, self.OUTPUT) - - self.write4bits(0x33) # initialization - self.write4bits(0x32) # initialization - self.write4bits(0x28) # 2 line 5x8 matrix - self.write4bits(0x0C) # turn cursor off 0x0E to enable cursor - self.write4bits(0x06) # set cursor incrementing and no shift of display - - self.displaycontrol = self.LCD_DISPLAYON | self.LCD_CURSOROFF | self.LCD_BLINKOFF - - self.displayfunction = self.LCD_4BITMODE | self.LCD_1LINE | self.LCD_5x8DOTS - self.displayfunction |= self.LCD_2LINE - - """ Initialize to default text direction (for romance languages) """ - self.displaymode = self.LCD_ENTRYLEFT | self.LCD_ENTRYSHIFTDECREMENT - self.write4bits(self.LCD_ENTRYMODESET | self.displaymode) # set the entry mode - - # turn on backlights! - self.mcp.config(6, self.mcp.OUTPUT) - self.mcp.config(7, self.mcp.OUTPUT) - self.mcp.config(8, self.mcp.OUTPUT) - self.mcp.output(6, 0) # red - self.mcp.output(7, 0) # green - self.mcp.output(8, 0) # blue - - # turn on pullups - self.mcp.pullup(self.SELECT, True) - self.mcp.pullup(self.LEFT, True) - self.mcp.pullup(self.RIGHT, True) - self.mcp.pullup(self.UP, True) - self.mcp.pullup(self.DOWN, True) - self.mcp.config(self.SELECT, self.mcp.INPUT) - self.mcp.config(self.LEFT, self.mcp.INPUT) - self.mcp.config(self.RIGHT, self.mcp.INPUT) - self.mcp.config(self.DOWN, self.mcp.INPUT) - self.mcp.config(self.UP, self.mcp.INPUT) + OFF = 0x00 + RED = 0x01 + GREEN = 0x02 + BLUE = 0x04 + YELLOW = RED + GREEN + TEAL = GREEN + BLUE + VIOLET = RED + BLUE + WHITE = RED + GREEN + BLUE + ON = RED + GREEN + BLUE + + # LCD Commands + LCD_CLEARDISPLAY = 0x01 + LCD_RETURNHOME = 0x02 + LCD_ENTRYMODESET = 0x04 + LCD_DISPLAYCONTROL = 0x08 + LCD_CURSORSHIFT = 0x10 + LCD_FUNCTIONSET = 0x20 + LCD_SETCGRAMADDR = 0x40 + LCD_SETDDRAMADDR = 0x80 + + # Flags for display on/off control + LCD_DISPLAYON = 0x04 + LCD_DISPLAYOFF = 0x00 + LCD_CURSORON = 0x02 + LCD_CURSOROFF = 0x00 + LCD_BLINKON = 0x01 + LCD_BLINKOFF = 0x00 + + # Flags for display entry mode + LCD_ENTRYRIGHT = 0x00 + LCD_ENTRYLEFT = 0x02 + LCD_ENTRYSHIFTINCREMENT = 0x01 + LCD_ENTRYSHIFTDECREMENT = 0x00 + + # Flags for display/cursor shift + LCD_DISPLAYMOVE = 0x08 + LCD_CURSORMOVE = 0x00 + LCD_MOVERIGHT = 0x04 + LCD_MOVELEFT = 0x00 + + + def __init__(self, busnum=-1, addr=0x20, debug=False): + + self.mcp = Adafruit_MCP230XX(addr, 16, busnum, debug) + + for i in range(0,16): + if i < 6: + # Configure button lines as inputs w/pullups + self.mcp.config(i, Adafruit_MCP230XX.INPUT) + self.mcp.pullup(i, True) + elif 9 <= i <= 12: + # Configure LCD data lines as inputs w/o pullups + self.mcp.config(i, Adafruit_MCP230XX.INPUT) + self.mcp.pullup(i, False) + else: + # All other lines are outputs + self.mcp.config(i, Adafruit_MCP230XX.OUTPUT) + + # Init control lines, backlight on (white) + self.mcp.outputAll(0) + + self.displaycontrol = (self.LCD_DISPLAYON | + self.LCD_CURSOROFF | + self.LCD_BLINKOFF) + self.displaymode = (self.LCD_ENTRYLEFT | + self.LCD_ENTRYSHIFTDECREMENT) + self.displayshift = (self.LCD_CURSORMOVE | + self.LCD_MOVERIGHT) + + self.write4(0x20) # Select 4-bit interface + self.write4(0x28) # 2 line 5x8 matrix + self.write4(self.LCD_CLEARDISPLAY) + self.write4(self.LCD_CURSORSHIFT | self.displayshift) + self.write4(self.LCD_ENTRYMODESET | self.displaymode) + self.write4(self.LCD_DISPLAYCONTROL | self.displaycontrol) + self.write4(self.LCD_RETURNHOME) + + + # The LCD data pins (D4-D7) connect to MCP pins 12-9 (PORTB4-1), in + # that order. Because this sequence is 'reversed,' a direct shift + # won't work. This table remaps 4-bit data values to MCP PORTB + # outputs, incorporating both the reverse and shift. + flip = ( 0b00000000, 0b00010000, 0b00001000, 0b00011000, + 0b00000100, 0b00010100, 0b00001100, 0b00011100, + 0b00000010, 0b00010010, 0b00001010, 0b00011010, + 0b00000110, 0b00010110, 0b00001110, 0b00011110 ) + + # Write 8-bit value to LCD over 4-bit interface + def write4(self, value, char_mode=False): + """ Send command/data to LCD """ + + # The following code does not invoke the base class methods that + # handle I/O exceptions. Instead, the underlying smbus calls are + # invoked directly for expediency, the expectation being that any + # I2C access or address type errors have already been identified + # during initialization. + + # The LCD control lines are all on MCP PORTB, so I2C byte ops + # on that single port (rather than word ops on both PORTA and + # PORTB together) are used here to save some bandwidth. + # LCD pin RS = MCP pin 15 (PORTB7) Command/data + # LCD pin RW = MCP pin 14 (PORTB6) Read/write + # LCD pin E = MCP pin 13 (PORTB5) Strobe + # LCD D4...D7 = MCP 12...9 (PORTB4...1) Data (see notes later) + + # Poll LCD busy state until clear. Data pins are inputs + # by default, so no need to reconfigure I/O direction yet. + + # Current PORTB pin state RS=0 RW=1 + a = ((self.mcp.outputvalue >> 8) & 0b00000001) | 0b01000000 + b = a | 0b00100000 # E=1 + # Configure MCP lines for polling. Will restore later. + self.mcp.i2c.bus.write_byte_data( + self.mcp.i2c.address, self.mcp.MCP23017_OLATB, a) + while True: + # Strobe high (enable) + self.mcp.i2c.bus.write_byte_data( + self.mcp.i2c.address, self.mcp.MCP23017_OLATB, b) + # There's no need for delay calls when strobing, as the + # limited I2C throughput already ensures the strobe is + # held long enough. + # First nybble contains busy state + bits = self.mcp.i2c.bus.read_byte_data( + self.mcp.i2c.address, self.mcp.MCP23017_GPIOB) + # Strobe low (!enable) + self.mcp.i2c.bus.write_byte_data( + self.mcp.i2c.address, self.mcp.MCP23017_OLATB, a) + if (bits & 0b00000010) == 0: break # D7=0, not busy + # Ignore second nybble + self.mcp.i2c.bus.write_byte_data( + self.mcp.i2c.address, self.mcp.MCP23017_OLATB, b) + self.mcp.i2c.bus.write_byte_data( + self.mcp.i2c.address, self.mcp.MCP23017_OLATB, a) + + # Change data pins to outputs temporarily + save = self.mcp.direction >> 8 # PORTB + self.mcp.i2c.bus.write_byte_data( + self.mcp.i2c.address, self.mcp.MCP23017_IODIRB, save & 0b11100001) + + a &= 0b00000001 # Mask out data bits & RW from current OLATB value + if char_mode: a |= 0b10000000 # RS = Command/data + + b = a | self.flip[value >> 4] # Insert high 4 bits of data + # Write initial !E state, data is sampled on rising strobe edge + self.mcp.i2c.bus.write_byte_data( + self.mcp.i2c.address, self.mcp.MCP23017_OLATB, b) + # Strobe high + self.mcp.i2c.bus.write_byte_data( + self.mcp.i2c.address, self.mcp.MCP23017_OLATB, b | 0b00100000) + # Strobe low + self.mcp.i2c.bus.write_byte_data( + self.mcp.i2c.address, self.mcp.MCP23017_OLATB, b) + b = a | self.flip[value & 0x0F] # Insert low 4 bits + self.mcp.i2c.bus.write_byte_data( + self.mcp.i2c.address, self.mcp.MCP23017_OLATB, b) + self.mcp.i2c.bus.write_byte_data( + self.mcp.i2c.address, self.mcp.MCP23017_OLATB, b | 0b00100000) + self.mcp.i2c.bus.write_byte_data( + self.mcp.i2c.address, self.mcp.MCP23017_OLATB, b) + + # Change data pins back to inputs + self.mcp.i2c.bus.write_byte_data( + self.mcp.i2c.address, self.mcp.MCP23017_IODIRB, save) + # And update mcp outputvalue state to reflect changes here + self.mcp.outputvalue = (self.mcp.outputvalue & 0x00FF) | (b << 8) + def begin(self, cols, lines): - if (lines > 1): - self.numlines = lines - self.displayfunction |= self.LCD_2LINE self.currline = 0 + self.numlines = lines self.clear() + + def clear(self): + self.write4(self.LCD_CLEARDISPLAY) + + def home(self): - self.write4bits(self.LCD_RETURNHOME) # set cursor position to zero - self.waitBFlow() #wait for Busy flag low + self.write4(self.LCD_RETURNHOME) - def clear(self): - self.write4bits(self.LCD_CLEARDISPLAY) # command to clear display - self.waitBFlow() #wait for Busy flag low - + row_offsets = ( 0x00, 0x40, 0x14, 0x54 ) def setCursor(self, col, row): - self.row_offsets = [ 0x00, 0x40, 0x14, 0x54 ] - if ( row > self.numlines ): - row = self.numlines - 1 # we count rows starting w/0 - self.write4bits(self.LCD_SETDDRAMADDR | (col + self.row_offsets[row])) + if row > self.numlines: row = self.numlines - 1 + elif row < 0: row = 0 + self.write4(self.LCD_SETDDRAMADDR | (col + self.row_offsets[row])) - def noDisplay(self): - """ Turn the display off (quickly) """ - self.displaycontrol &= ~self.LCD_DISPLAYON - self.write4bits(self.LCD_DISPLAYCONTROL | self.displaycontrol) def display(self): """ Turn the display on (quickly) """ self.displaycontrol |= self.LCD_DISPLAYON - self.write4bits(self.LCD_DISPLAYCONTROL | self.displaycontrol) + self.write4(self.LCD_DISPLAYCONTROL | self.displaycontrol) - def noCursor(self): - """ underline cursor off """ - self.displaycontrol &= ~self.LCD_CURSORON - self.write4bits(self.LCD_DISPLAYCONTROL | self.displaycontrol) + + def noDisplay(self): + """ Turn the display off (quickly) """ + self.displaycontrol &= ~self.LCD_DISPLAYON + self.write4(self.LCD_DISPLAYCONTROL | self.displaycontrol) def cursor(self): - """ underline Cursor On """ + """ Underline cursor on """ self.displaycontrol |= self.LCD_CURSORON - self.write4bits(self.LCD_DISPLAYCONTROL | self.displaycontrol) + self.write4(self.LCD_DISPLAYCONTROL | self.displaycontrol) + + + def noCursor(self): + """ Underline cursor off """ + self.displaycontrol &= ~self.LCD_CURSORON + self.write4(self.LCD_DISPLAYCONTROL | self.displaycontrol) + def ToggleCursor(self): - """ Toggles the underline cursor On/Off bb""" + """ Toggles the underline cursor On/Off """ self.displaycontrol ^= self.LCD_CURSORON - self.delayMicroseconds(200000) - self.write4bits(self.LCD_DISPLAYCONTROL | self.displaycontrol) + self.write4(self.LCD_DISPLAYCONTROL | self.displaycontrol) - def noBlink(self): - """ Turn off the blinking cursor """ - self.displaycontrol &= ~self.LCD_BLINKON - self.write4bits(self.LCD_DISPLAYCONTROL | self.displaycontrol) def blink(self): - """ Turn on the blinking cursor""" + """ Turn on the blinking cursor """ self.displaycontrol |= self.LCD_BLINKON - self.write4bits(self.LCD_DISPLAYCONTROL | self.displaycontrol) + self.write4(self.LCD_DISPLAYCONTROL | self.displaycontrol) + + + def noBlink(self): + """ Turn off the blinking cursor """ + self.displaycontrol &= ~self.LCD_BLINKON + self.write4(self.LCD_DISPLAYCONTROL | self.displaycontrol) + def ToggleBlink(self): - """ Toggles the blinking cursor""" + """ Toggles the blinking cursor """ self.displaycontrol ^= self.LCD_BLINKON - self.delayMicroseconds(200000) - self.write4bits(self.LCD_DISPLAYCONTROL | self.displaycontrol) + self.write4(self.LCD_DISPLAYCONTROL | self.displaycontrol) def DisplayLeft(self): """ These commands scroll the display without changing the RAM """ - self.write4bits(self.LCD_CURSORSHIFT | self.LCD_DISPLAYMOVE | self.LCD_MOVELEFT) + self.displayshift = self.LCD_DISPLAYMODE | self.LCD_MOVELEFT + self.write4(self.LCD_CURSORSHIFT | self.displayshift) + def scrollDisplayRight(self): """ These commands scroll the display without changing the RAM """ - self.write4bits(self.LCD_CURSORSHIFT | self.LCD_DISPLAYMOVE | self.LCD_MOVERIGHT); + self.displayshift = self.LCD_DISPLAYMOVE | self.LCD_MOVERIGHT + self.write4(self.LCD_CURSORSHIFT | self.displayshift) + def leftToRight(self): - """ This is for text that flows Left to Right """ + """ This is for text that flows left to right """ self.displaymode |= self.LCD_ENTRYLEFT - self.write4bits(self.LCD_ENTRYMODESET | self.displaymode); + self.write4(self.LCD_ENTRYMODESET | self.displaymode) + def rightToLeft(self): - """ This is for text that flows Right to Left """ + """ This is for text that flows right to left """ self.displaymode &= ~self.LCD_ENTRYLEFT - self.write4bits(self.LCD_ENTRYMODESET | self.displaymode) + self.write4(self.LCD_ENTRYMODESET | self.displaymode) + def autoscroll(self): """ This will 'right justify' text from the cursor """ self.displaymode |= self.LCD_ENTRYSHIFTINCREMENT - self.write4bits(self.LCD_ENTRYMODESET | self.displaymode) + self.write4(self.LCD_ENTRYMODESET | self.displaymode) + - def noAutoscroll(self): + def noAutoscroll(self): """ This will 'left justify' text from the cursor """ self.displaymode &= ~self.LCD_ENTRYSHIFTINCREMENT - self.write4bits(self.LCD_ENTRYMODESET | self.displaymode) + self.write4(self.LCD_ENTRYMODESET | self.displaymode) - def write4bits(self, bits, char_mode=False): - """ Send command to LCD """ - #self.delayMicroseconds(1000) # 1000 microsecond sleep - bits=bin(bits)[2:].zfill(8) - self.mcp.output(self.pin_rs, char_mode) - for i in range(4): - if bits[i] == "1": - self.mcp.output(self.pins_db[::-1][i], True) - else: - self.mcp.output(self.pins_db[::-1][i], False) - self.pulseEnable() + def createChar(self, location, bitmap): + self.write4(self.LCD_SETCGRAMADDR | ((location & 7) << 3)) + for i in range(8): + self.write4(bitmap[i], True) + self.write4(self.LCD_SETDDRAMADDR) - for i in range(4,8): - if bits[i] == "1": - self.mcp.output(self.pins_db[::-1][i-4], True) - else: - self.mcp.output(self.pins_db[::-1][i-4], False) - self.pulseEnable() - - #See pg. 24 and 58 HD44780.pdf and http://www.avrbeginners.net/ Standard LCD bit mode - def read4bits(self, char_mode=False): - """ Get Data from LCD, when char_mode = 0 get Busy Flag and Address Counter, else get RAM data """ -# print "First:", bin(self.mcp.direction)[2:].zfill(16) - self.mcp.output(self.pin_rs, char_mode) # when char_mode = 0 get Busy Flag and Address Counter, else get RAM data - self.mcp.output(self.pin_rw, 1) #set rw to 1 - # Configure pins for input - makeinput=True - if makeinput: - for pin in self.pins_db: - self.mcp.config(pin, self.INPUT) - self.mcp.output(self.pin_e, True) # set Enable high and keep while read first nibble - bits = range(8) - # get the pins values - for i in range(4): - bt = self.mcp.input(self.pins_db[::-1][i], makeinput) # if makeinput is False, pin direction checking is supressed in input - bits[i]=bt - #print i,bt,bits[i] - self.mcp.output(self.pin_e, False) # set Enable low to finish first nibble - self.mcp.output(self.pin_e, True) # set Enable high and keep while read 2nd nibble - # get the pins values - for i in range(4,8): - bt = self.mcp.input(self.pins_db[::-1][i-4],makeinput) - bits[i]=bt - #print i,bt,bits[i] - self.mcp.output(self.pin_e, False) # set Enable low to finish 2nd nibble - # restore the pins to output and rw to 0 - for pin in self.pins_db: - self.mcp.config(pin, self.OUTPUT) - self.mcp.output(self.pin_rw, 0) # return rw to 0 -# print "Last :", bin(self.mcp.direction)[2:].zfill(16) - return bits; - - def readBF(self): - """ Get Data from LCD, when char_mode = 0 get Busy Flag and Address Counter, else get RAM data """ -# print "First:", bin(self.mcp.direction)[2:].zfill(16) - self.mcp.output(self.pin_rs, 0) # when char_mode = 0 get Busy Flag and Address Counter, else get RAM data - self.mcp.output(self.pin_rw, 1) #set rw to 1 - # Configure pins for input - makeinput=True - self.mcp.config(self.pins_db[::-1][1], self.INPUT) - self.mcp.output(self.pin_e, True) # set Enable high and keep while read first nibble - # get the pins values - bt = self.mcp.input(self.pins_db[::-1][1], makeinput) # if makeinput is False, pin direction checking is supressed in input - self.mcp.output(self.pin_e, False) # set Enable low to finish first nibble - self.pulseEnable() # one more pulse to get (but ingore the 2nd nibble) - # restore the pins to output and rw to 0 - self.mcp.config(self.pins_db[::-1][1], self.OUTPUT) - self.mcp.output(self.pin_rw, 0) # return rw to 0 - return bt==1 - - def waitBFlow(self): - for cnt in range(100000): - if not self.readBF(): - #print cnt - return - print "timed out of waitBFlow" - - def delayMicroseconds(self, microseconds): - seconds = microseconds / 1000000 # divide microseconds by 1 million for seconds - sleep(seconds) - - def pulseEnable(self): - self.mcp.output(self.pin_e, True) - self.delayMicroseconds(1) # 1 microsecond pause - enable pulse must be > 450ns - self.mcp.output(self.pin_e, False) - #self.delayMicroseconds(1) # commands need > 37us to settle def message(self, text): """ Send string to LCD. Newline wraps to second line""" for char in text: if char == '\n': - self.write4bits(0xC0) # set DDRAM address 0x40 start of second line + self.write4(0xC0) # set DDRAM address to second line else: - self.write4bits(ord(char),True) + self.write4(ord(char), True) + def backlight(self, color): - self.mcp.output(6, not color & 0x01) - self.mcp.output(7, not color & 0x02) - self.mcp.output(8, not color & 0x04) + n = ((self.mcp.outputvalue & 0b1111111000111111) | + (((~color) & 0b111) << 6)) + # Direct smbus call so everything toggles together + self.mcp.i2c.bus.write_word_data( + self.mcp.i2c.address, self.mcp.MCP23017_OLATA, n) + self.mcp.outputvalue = n - def buttonPressed(self, buttonname): - if (buttonname > self.LEFT): - return false - return not self.mcp.input(buttonname) + def buttonPressed(self, b): + return not self.mcp.input(b) if 0 <= b <= self.LEFT else False if __name__ == '__main__': - lcd = Adafruit_CharLCDPlate(busnum = 1) + from time import sleep + + lcd = Adafruit_CharLCDPlate() + lcd.begin(16, 2) lcd.clear() lcd.message("Adafruit RGB LCD\nPlate w/Keypad!") sleep(1) - print " Cycle thru backlight colors 3 times " - - for i in range(3): - print "red" - lcd.backlight(lcd.RED) - sleep(1) - print "yellow" - lcd.backlight(lcd.YELLOW) - sleep(1) - print "green" - lcd.backlight(lcd.GREEN) - sleep(1) - print "teal" - lcd.backlight(lcd.TEAL) - sleep(1) - print "blue" - lcd.backlight(lcd.BLUE) - sleep(1) - print "violet" - lcd.backlight(lcd.VIOLET) - sleep(1) - print "off" - lcd.backlight(lcd.OFF) - sleep(1) - print "on" - lcd.backlight(lcd.ON) - sleep(1) - - print " Try buttons on plate" + col = (('Red' , lcd.RED) , ('Yellow', lcd.YELLOW), ('Green' , lcd.GREEN), + ('Teal', lcd.TEAL), ('Blue' , lcd.BLUE) , ('Violet', lcd.VIOLET), + ('Off' , lcd.OFF) , ('On' , lcd.ON)) + + print "Cycle thru backlight colors" + for c in col: + print c[0] + lcd.clear() + lcd.message(c[0]) + lcd.backlight(c[1]) + sleep(0.5) + + btn = ((lcd.SELECT, 'Select', lcd.ON), + (lcd.LEFT , 'Left' , lcd.RED), + (lcd.UP , 'Up' , lcd.BLUE), + (lcd.DOWN , 'Down' , lcd.GREEN), + (lcd.RIGHT , 'Right' , lcd.VIOLET)) - while 1: - if (lcd.buttonPressed(lcd.LEFT)): - lcd.backlight(lcd.RED) - - if (lcd.buttonPressed(lcd.UP)): - lcd.backlight(lcd.BLUE) - - if (lcd.buttonPressed(lcd.DOWN)): - lcd.backlight(lcd.GREEN) - - if (lcd.buttonPressed(lcd.RIGHT)): - lcd.backlight(lcd.VIOLET) - - if (lcd.buttonPressed(lcd.SELECT)): - lcd.backlight(lcd.ON) - + print "Try buttons on plate" + lcd.clear() + lcd.message("Try buttons") + prev = -1 + while True: + for b in btn: + if lcd.buttonPressed(b[0]): + if b is not prev: + print b[1] + lcd.clear() + lcd.message(b[1]) + lcd.backlight(b[2]) + prev = b + break diff --git a/Adafruit_CharLCDPlate/NewLCDTest.py b/Adafruit_CharLCDPlate/NewLCDTest.py deleted file mode 100644 index 7210de6b..00000000 --- a/Adafruit_CharLCDPlate/NewLCDTest.py +++ /dev/null @@ -1,566 +0,0 @@ -#!/usr/bin/python -# mod by bb 29 Jan 2013 - -from time import sleep -from random import randint -from Adafruit_I2C import Adafruit_I2C -from Adafruit_MCP230xx import Adafruit_MCP230XX -from Adafruit_CharLCDPlate import Adafruit_CharLCDPlate -#from Adafruit_MCP230xx import MCP23017_GPIOB, MCP23017_IODIRB -MCP23017_IODIRA = 0x00 -MCP23017_IODIRB = 0x01 -MCP23017_GPIOA = 0x12 -MCP23017_GPIOB = 0x13 -MCP23017_GPPUA = 0x0C -MCP23017_GPPUB = 0x0D -MCP23017_OLATA = 0x14 -MCP23017_OLATB = 0x15 -import smbus - - -def binfill(num,len=8): - return bin(num)[2:].zfill(len) - -ReverseNib = [0,8,4,12,2,10,6,14,1,9,5,13,3,11,7,15] - -def cur_right(num=1): # note num = 40 in 2 lines mode moves up/down to other line - for cnt in range(num): - lcd.mcp.write8(0x30, MCP23017_GPIOB) #RS=0, R/W=0, E=1, high nibble of lcd command reversed, 0. Going high sends this to LCD as hi bits of instruction code - lcd.mcp.write8(0x04, MCP23017_GPIOB) #RS=0, R/W=0, E=0, low nibble of lcd command reversed, 0 - lcd.mcp.write8(0x24, MCP23017_GPIOB) #same with E=1 so going high sends this nibble to LCD as low bits of instruction code - lcd.mcp.write8(0x04, MCP23017_GPIOB) #same as line two to send E low to finish - -def cur_left(num=1): - for cnt in range(num): - lcd.mcp.write8(0x30, MCP23017_GPIOB) #RS=0, R/W=0, E=1, high nibble of lcd command reversed, 0. Going high sends this to LCD as hi bits of instruction code - lcd.mcp.write8(0x00, MCP23017_GPIOB) #RS=0, R/W=0, E=0, low nibble of lcd command reversed, 0 - lcd.mcp.write8(0x20, MCP23017_GPIOB) #same with E=1 so going high sends this nibble to LCD as low bits of instruction code - lcd.mcp.write8(0x00, MCP23017_GPIOB) #same as line two to send E low to finish - -def display_right(num=1): # note num = 40 in 2 lines mode moves up/down to other line - for cnt in range(num): - lcd.mcp.write8(0x30, MCP23017_GPIOB) #RS=0, R/W=0, E=1, high nibble of lcd command reversed, 0. Going high sends this to LCD as hi bits of instruction code - lcd.mcp.write8(0x06, MCP23017_GPIOB) #RS=0, R/W=0, E=0, low nibble of lcd command reversed, 0 - lcd.mcp.write8(0x26, MCP23017_GPIOB) #same with E=1 so going high sends this nibble to LCD as low bits of instruction code - lcd.mcp.write8(0x06, MCP23017_GPIOB) #same as line two to send E low to finish - -def cur_pos(num=0): -# i.e. Set DDRAM address - the cursor will move to this address -# Note -# in two line mode DDRAM 0 to 39 is first line -# DDRAM 64 to 39+64 is second line -# using num from 40 till 63 will set DDRAM to 64 -# using num from above 39+64 will set DDRAM to 0 -# in one line mode DDRAM goes from 0 to 79 and setting above will go to 0 - # make num become the instruction code for Set DDRAM address - num &= 0x7f # truncate num to 7 bits - num |= 0x80 # make highest bit 1 - # make first byte to send which contains the reverse high nibble of num - hinum = (num & 0xf0) >> 4 - byte1 = 0x20 | (ReverseNib[hinum] << 1) # RS=0, R/W = 0, E = 1, high nibble of lcd command reversed, 0. - lonum = (num & 0xf) - byte2 = (ReverseNib[lonum] << 1) # RS=0, R/W = 0, E = 0, low nibble of lcd command reversed, 0. - #print "num = ", bin8(num), "hinum = ", bin8(hinum), "lonum = ", bin8(lonum) - #print "byte1 = ", bin8(byte1), "byte2 = ", bin8(byte2) - lcd.mcp.write8(byte1, MCP23017_GPIOB) #Going high sends this to LCD as hi bits of instruction code - lcd.mcp.write8(byte2, MCP23017_GPIOB) # E goes low - lcd.mcp.write8(0x20 | byte2, MCP23017_GPIOB) # going high sends this nibble to LCD as low bits of instruction code - lcd.mcp.write8(byte2, MCP23017_GPIOB) # send E low to finish - -def setCGRAMadd(num=0): -# i.e. Set CGRAM address - Write/Read Data from RAM after this will use Character Graphic RAM - # make num become the instruction code for Set CGRAM address - num &= 0x3f # truncate num to 6 bits - num |= 0x40 # make 2nd to highest bit 1 - # make first byte to send which contains the reverse high nibble of num - hinum = (num & 0xf0) >> 4 - byte1 = 0x20 | (ReverseNib[hinum] << 1) # RS=0, R/W = 0, E = 1, high nibble of lcd command reversed, 0. - lonum = (num & 0xf) - byte2 = (ReverseNib[lonum] << 1) # RS=0, R/W = 0, E = 0, low nibble of lcd command reversed, 0. - print "num = ", binfill(num), "hinum = ", binfill(hinum), "lonum = ", binfill(lonum) - print "byte1 = ", binfill(byte1), "byte2 = ", binfill(byte2) - lcd.mcp.write8(byte1, MCP23017_GPIOB) #Going high sends this to LCD as hi bits of instruction code - lcd.mcp.write8(byte2, MCP23017_GPIOB) # E goes low - lcd.mcp.write8(0x20 | byte2, MCP23017_GPIOB) # going high sends this nibble to LCD as low bits of instruction code - lcd.mcp.write8(byte2, MCP23017_GPIOB) # send E low to finish - -def general_cmd(cmd,RS=0,RW=0,debug=0): -# execute a general command for the LCD TC1602A-01T -# cmd are the 8 bits of instuction code from table pg. 11 -# if cmd is a read command (RW = 1) the value read is returned - # make first byte to send which contains the reverse high nibble of cmd - RSbit=0x80 if RS else 0x00 - RWbit=0x40 if RW else 0x00 - Ebit = 0x20 - hicmd = (cmd & 0xf0) >> 4 - byte1 = RSbit | RWbit | Ebit | (ReverseNib[hicmd] << 1) # RS,RW, E = 1, high nibble of lcd command reversed, 0. - locmd = (cmd & 0xf) - byte2 = RSbit | RWbit | (ReverseNib[locmd] << 1) # RS,RW, E = 0, low nibble of lcd command reversed, 0. - if debug: - print "cmd = ", binfill(cmd), "hinum = ", binfill(hicmd), "locmd = ", binfill(locmd) - print "byte1 = ", binfill(byte1), "byte2 = ", binfill(byte2) - lcd.mcp.write8(byte1, MCP23017_GPIOB) #Going high sends this to LCD as hi bits of instruction code - if RW: - currentiodir = lcd.mcp.readU8(MCP23017_IODIRB) # save entering state of input/output for pins from 8-15 - lcd.mcp.write8(0b00011110 | currentiodir, MCP23017_IODIRB) # configure input for pins 9-12 which are 4-7 in GPB - num = lcd.mcp.readU8(MCP23017_GPIOB) # get input which will contain reversed high nibble from LCD - hinum = ReverseNib[(num & 0b00011110) >> 1] # extract the 4 bits and reverse - lcd.mcp.write8(byte2, MCP23017_GPIOB) # E goes low - lcd.mcp.write8(Ebit | byte2, MCP23017_GPIOB) # going high sends this nibble to LCD as low bits of instruction code - if RW: - num = lcd.mcp.readU8(MCP23017_GPIOB) # get input which will contain reversed low nibble from LCD - lonum = ReverseNib[(num & 0b00011110) >> 1] # extract the 4 bits and reverse - if RW: - lcd.mcp.write8(currentiodir, MCP23017_IODIRB) # restore pins input/output to state upon entering this routine - lcd.mcp.write8(0x00, MCP23017_GPIOB) # send all low to finish and be compatible with other CarLCDPlate routines - if RW: - return (hinum << 4) | lonum - -def readfast(ram=False): -# read BF and AC or RAM Data - if ram: - cmdhi = 0xe0 - cmdlo = 0xc0 - else: - cmdhi = 0x60 - cmdlo = 0x40 - lcd.mcp.write8(0b00011111, MCP23017_IODIRB) # configure so input on pins 9-12 which are 4-7 in GPB - lcd.mcp.write8(cmdhi, MCP23017_GPIOB) #Going high prepares to record first nibble info - num = lcd.mcp.readU8(MCP23017_GPIOB) # get input which will contain reversed high nibble from LCD - hinum = ReverseNib[(num & 0b00011110) >> 1] # extract the 4 bits and reverse# extract the 4 bits and reverse - lcd.mcp.write8(cmdlo, MCP23017_GPIOB) # E goes low - lcd.mcp.write8(cmdhi, MCP23017_GPIOB) # going high prepares to recond second nibble info - num = lcd.mcp.readU8(MCP23017_GPIOB) # get input which will contain reversed low nibble from LCD - lonum = ReverseNib[(num & 0b00011110) >> 1] # extract the 4 bits and reverse - lcd.mcp.write8(0x0, MCP23017_GPIOB) # send E low to finish and set RS, RW and all to zero - lcd.mcp.write8(0b00000001, MCP23017_IODIRB) # configure so all approrpriate pins are output again - return (hinum << 4) | lonum - -def DumpMCP23017Regs(regs_to_use=[0x0,18,20]): -# Dump MCP23017 registers see MCP2301721952b.pdf specifications but show first B then A -# Default is to dump only IODIR, GPIO and OLATA -# will show B bank followed by A bank i.e. IODIRB, IODIRA so -# the output corresponds to 'pins' 15,14,...,0 -# to dump all use regs_to_use = range(0x0,0x15,0x2) - RegName = ["IODIR","IPOL","GPINTEN","DEFVAL","INTCON","IOCON","GPPU","INTF","INTCAP","GPIO","OLATA"] - print "B bank then A bank so Pins 15, 14, ..., 0" - print binfill(lcd.mcp.direction,16), " lcd.mcp.direction" #ideally should be same as IODIR - for reg in regs_to_use: - str = binfill(lcd.mcp.readU16(reg),16) - # interchange bytes B reg then A reg so 'pins' are from left to right are 15,14,13,...,0 - print str[8:]+str[:8]," ", RegName[reg/2] - -def home_fast(): -# fast return home - lcd.mcp.write8(0x20, MCP23017_GPIOB) #same with E=1 so going high sends this nibble to LCD as hi bits of instruction code - lcd.mcp.write8(0x08, MCP23017_GPIOB) #RS=0, R/W=0, E=0, low nibble of lcd command reversed, 0 - lcd.mcp.write8(0x28, MCP23017_GPIOB) #same with E=1 so going high sends this nibble to LCD as low bits of instruction code - lcd.mcp.write8(0x08, MCP23017_GPIOB) #same as line three to send E low to finish - -def clear_fast(): -# fast clear - lcd.mcp.write8(0x20, MCP23017_GPIOB) #same with E=1 so going high sends this nibble to LCD as hi bits of instruction code - lcd.mcp.write8(0x10, MCP23017_GPIOB) #RS=0, R/W=0, E=0, low nibble of clear display reversed, 0 - lcd.mcp.write8(0x30, MCP23017_GPIOB) #same with E=1 so going high sends this nibble to LCD as low bits of instruction code - lcd.mcp.write8(0x10, MCP23017_GPIOB) #same as line three to send E low to finish - -def dim_light(on=.5,time=1,nforsec=50): -# dimming routine doesnt work very well -# flashes display on and off over interval time -# on is fraction of time on during the interval - assert 0 <= on and on <= 1, "bad value for on" - ontime = float(on)/nforsec - offtime = (1.0-on)/nforsec - maxct = int(nforsec*time) - print ontime, offtime, maxct - for ct in range(maxct): - lcd.write4bits(0x8) # display off - sleep(offtime) - lcd.write4bits(0xc) # display on - sleep(ontime) - -def dispall(delay=.1): - for i in range(256): - general_cmd(i,1) - sleep(delay) - -def cycle(seq, n): -# cyclic premutation of seq shifting left n - n = n % len(seq) - return seq[n:] + seq[:n] - -def cyclerange(DDRAMrange=range(40), amount=1): -# cyclically shift characters in a range of DDRAM addresses by amount -# DDRAMrange default is line 1 in 2 line mode i.e. 0...39 - # get DDRAM address to be restored - add = general_cmd(0,0,1) - lenrange = len(DDRAMrange) - startadd = DDRAMrange[0] - # get data in DDRAMrange - # set DDRAM address to startadd - general_cmd(0b10000000 + startadd) - win = [0]*lenrange - for i in range(lenrange): #read DDRAM beginning at startadd - win[i] = general_cmd(0,1,1) - win = cycle(win,amount) - general_cmd(0b10000000 + startadd) - for i in range(lenrange): #write shifted values back in DDRAM starting at startadd - general_cmd(win[i],1,0) - # restore DDRAM address - general_cmd(add | 0x80) - -def scrollrange(DDRAMrange=range(40), num=1, delay=.01): - num = num*len(DDRAMrange) - for i in range(num): - cyclerange(DDRAMrange,1) - #sleep(delay) - -def shiftwithinrange(textstart,textlen,DDRAMrange=range(40)): -# cyclically shift characters in a range of DDRAM addresses by one position -# this code maybe faster than cyclerange code -# DDRAMrange default is line 1 in 2 line mode i.e. 0...39 - # if have string of text can shift it to the right one place within a range (say top line) - # assuming this string is surrounded by blanks in the rest of the range - # assuming LCD set in increment mode (rather than decrement mode) - # get DDRAM address to be restored - add = general_cmd(0,0,1) - startrange = DDRAMrange[0] - endrange = DDRAMrange[-1] - lenrange = len(DDRAMrange) - #print startrange, endrange, lenrange - for i in range(textstart+textlen-1,textstart-1,-1): # go thru in reverse - add = i - if i > endrange: - add = i - lenrange + startrange - #print "moving from ", add - # set DDRAM address to - general_cmd(0b10000000 + add) - byte = general_cmd(0,1,1) # this will get byte in DDRAM and increment address counter by 1 - if i+1 > endrange: - add = i + 1 - lenrange + startrange - general_cmd(0b10000000 + add ) - else: - add = add + 1 - general_cmd(byte,1,0) # this will put byte in DDRAM at the new address thus shifting it - #print "moving to ", add, "this char ", chr(byte) - general_cmd(0b10000000 + textstart) - general_cmd(0b00100000,1,0) # this will put blank - # restore DDRAM address - general_cmd(add | 0x80) - - -class Histogram: - def __init__(self): - # make bars in CGRAM of height 8 to 1 in for custom char 0 to 7 (and 8 to 15) - histdata = [31,31,31,31,31,31,31,31, 0,31,31,31,31,31,31,31, 0,0,31,31,31,31,31,31, 0,0,0,31,31,31,31,31, 0,0,0,0,31,31,31,31, 0,0,0,0,0,31,31,31, 0,0,0,0,0,0,31,31, 0,0,0,0,0,0,0,31 ] - general_cmd(0b01000000) # set CGRAM address 0 - for i in range(64): - general_cmd(histdata[i],1) # write data to ram - - def histogram(self,bar,DDRAMstart=64,UseTwoLines=True): - # draws bars of height bar[0],bar[1],... starting at - # DDRAMstart. Heights must >=0 and <= max 16 for TwoLines and 8 for OneLine). - # In the case UseTwoLines==True, the bars use two rows, so it is advised - # to make DDRAMstart on the 2nd line. - # note no checking done on values. If they are bigger than 16 other characters - # will be displayed instead of the custom bars. - # get DDRAM address to be restored - add = general_cmd(0,0,1) - # draw bottom row - # set DDRAM address to start - general_cmd(0b10000000 + DDRAMstart) - for y in bar: - char = max(16-y,8) - general_cmd(char,1,0) # put char which has appropriate height - if UseTwoLines: - # draw top row - # set DDRAM address to start - general_cmd(0b10000000 + DDRAMstart - 64) - for y in bar: - char = min(16-y,8) + 8 - general_cmd(char,1,0) # put char which has appropriate height - # restore DDRAM address - general_cmd(add | 0x80) - - -class DotGrid: - def __init__(self): - # make dot patterns in CGRAM - self.dotdata = [0,0,0,0,14,31,14,0, 14,31,14,0,0,0,0,0, 14,31,14,0,14,31,14,0, 0,0,0,0,0,14,31,14, 0,14,31,14,0,0,0,0, 0,14,31,14,0,14,31,14] - self.dedata = [[[64,2,1,0],[64,2,0,1],[0,5,4,3],[0,5,3,4]], [[64,1,2,32],[64,0,2,32],[0,4,5,32],[0,3,5,32]]] - self.isdotdata = [[64,0,2],[64,1,2],[0,3,5],[0,4,5]] - self.initialize_CGRAM() - - def initialize_CGRAM(self): - general_cmd(0b01000000) # set CGRAM address 0 - for i in range(len(self.dotdata)): - general_cmd(self.dotdata[i],1) # write data to ram - - def draw_erase_or_test(self,x,y,deort): # deort == 0 for draw, ==1 for erase, else test only - # draws, erases or tests a dot at (x,y) - # 0<=x<=39 but only x<=15 visable in default display but can shift to see - # 0<=y<=3 - # get DDRAM address to be restored - add = general_cmd(0,0,1) - addforx = x + self.dedata[0][y][0] - general_cmd(0b10000000 + addforx) # set DDRAM address - byte = general_cmd(0,1,1) # this will get byte in DDRAM - isdot = byte==self.isdotdata[y][1] or byte==self.isdotdata[y][2] - # if asked to draw a dot thats not there or erase a dot that is there do it! - if deort==0 and not isdot or deort==1 and isdot: - char = self.dedata[deort][y][1] if byte==self.dedata[deort][y][2] else self.dedata[deort][y][3] - general_cmd(0b10000000 + addforx) # set DDRAM address - general_cmd(char,1,0) # put char which is one or two dots - # restore DDRAM address - general_cmd(add | 0x80) - # return True if there was a dot at x,y when entered function - return isdot - - def draw(self,x,y): - return self.draw_erase_or_test(x,y,0) - - def erase(self,x,y): - return self.draw_erase_or_test(x,y,1) - - def isdot(self,x,y): - return self.draw_erase_or_test(x,y,2) - - -# OLD -# def draw(self,x,y): -# # draws a dot at (x,y) -# # 0<=x<=39 but only x<=15 in default display can shift to see -# # 0<=y<=3 -# # get DDRAM address to be restored -# add = general_cmd(0,0,1) -# if y==0: -# addforx = x + 64 -# general_cmd(0b10000000 + addforx) # set DDRAM address -# byte = general_cmd(0,1,1) # this will get byte in DDRAM -# char = 2 if byte==1 else 0 -# general_cmd(0b10000000 + addforx) # set DDRAM address -# general_cmd(char,1,0) # put char which is one or two dots -# elif y==1: -# addforx = 64 + x -# general_cmd(0b10000000 + addforx) # set DDRAM address -# byte = general_cmd(0,1,1) # this will get byte in DDRAM -# char = 2 if byte==0 else 1 -# general_cmd(0b10000000 + addforx) # set DDRAM address -# general_cmd(char,1,0) # put char which is one or two dots -# elif y==2: -# addforx = x -# general_cmd(0b10000000 + addforx) # set DDRAM address -# byte = general_cmd(0,1,1) # this will get byte in DDRAM -# char = 5 if byte==4 else 3 -# general_cmd(0b10000000 + addforx) # set DDRAM address -# general_cmd(char,1,0) # put char which is one or two dots -# elif y==3: -# addforx = x -# general_cmd(0b10000000 + addforx) # set DDRAM address -# byte = general_cmd(0,1,1) # this will get byte in DDRAM -# general_cmd(0b10000000 + addforx) # set DDRAM address -# general_cmd(char,1,0) # put char which is one or two dots -# else: -# print "y not 0,1,2 or 3" -# # restore DDRAM address -# general_cmd(add | 0x80) -# - - -back = 0 -def ToggleBacklight(back): - back ^= 1 - lcd.backlight(back) - sleep(.2) - return back - - - -# initialize the LCD plate -# use busnum = 0 for raspi version 1 (256MB) and busnum = 1 for version 2 -lcd = Adafruit_CharLCDPlate(busnum = 1) - -Hist = Histogram() -bar = [0]*16 - -DotG = DotGrid() - -general_cmd(0b1) # clear -lcd.waitBFlow() # must wait for clear to complete - -# Testing using keyboard -while 1: - cmd = raw_input() - if cmd == 'help': - print "10, 9, bf, cgram, config, cyclerange, dim, dispall, dot, dotinit, dump, edot, histogram, histograminit, longchar, mess, oneline, ramdata, sdr, scrollrange, shiftwithinrange, test, twoline, quit" - - if cmd == 'test': - print "Routine for testing" - - if cmd == '10': - str = raw_input("10 bits of instruction code:") - RS = str[0]=="1" # 1 is true - RW = str[1]=="1" # 1 is true - str = str[2:].zfill(8) - num = int('0b'+str,2) - numrpt = raw_input("repeat #:") - numrpt = 1 if numrpt=="" else int(numrpt) - for count in range(0,numrpt): - print(general_cmd(num,RS,RW)) - - if cmd == 'dim': - time = 2 - on = input("Fraction on? ") - nforsec = input("nforsec? ") - dim_light(on,time,nforsec) - - if cmd == 'bf': - #print "BF", lcd.readBF() - print "fast BF + AD = ", binfill(readfast()) # read Busy Flag and Adress - #print "BF + AD = ", lcd.read4bits() # read Busy Flag and Adress - - if cmd == 'sdr': - numrpt = raw_input("Shift Display Right by ") - numrpt = 1 if numrpt=="" else int(numrpt) - display_right(numrpt) - - if cmd == 'cyclerange': - line = input("Window Range? ") - line = range(40) if line=="" else line - amt = raw_input("How much? ") - amt = 1 if amt=="" else int(amt) - cyclerange(line,amt) - - if cmd == 'dotinit': - DotG.initialize_CGRAM() - - if cmd == 'dot': - x = input("x? ") - y = input("y? ") - #print(DotG.draw_erase_or_test(x,y,0)) - print(DotG.draw(x,y)) - - if cmd == 'edot': - x = input("x? ") - y = input("y? ") - #print(DotG.draw_erase_or_test(x,y,1)) - print(DotG.erase(x,y)) - - if cmd == 'histograminit': - Hist.__init__() - - if cmd == 'histogram': - #bar = input("Bar list? ") - barcurrent = [0]*16 - barnew = barcurrent[:] - barshow = barcurrent[:] - for cnt in range(30): - for ind in range(len(barcurrent)): - barnew[ind] = randint(0,16) - tmax = 4 - for time in range(tmax+1): - for ind in range(len(barcurrent)): - barshow[ind] = int(((tmax-time)*barcurrent[ind] + time*barnew[ind])/float(tmax)) - Hist.histogram(barshow) - barcurrent = barnew[:] - - if cmd == 'scrollrange': - line = input("Window Range? ") - line = range(40) if line=="" else line - scrollrange(line) - - if cmd == 'shiftwithinrange': - #textstart = input('Start? ') - #textlen = input('Length? ') - #shiftwithinrange(textstart,textlen, range(10)) - #general_cmd(0b00011000) # display shift left - for i in range(40): - shiftwithinrange(i,16) - general_cmd(0b00011000) # display shift left - sleep(.05) - - if cmd == 'cgram': - num = raw_input("CGRAM address? ") - setCGRAMadd(int(num)) - - if cmd == 'ramdata': - print "fast RAM Data = ", binfill(readfast(True)) # read data from RAM - #print "RAM Data = ", lcd.read4bits(True) # read data from RAM - - if cmd == 'mess': - str = raw_input("message:") - lcd.message(str); - - if cmd == '9': - str = raw_input("9 bits of instruction code:") - char_mode = str[0]=="1" # 1 is true - str = str[1:].zfill(8) - bits = int('0b'+str,2) - print char_mode, str, bits - numrpt = raw_input("repeat #:") - numrpt = 1 if numrpt=="" else int(numrpt) - for count in range(0,numrpt): - lcd.write4bits(bits, char_mode) - - if cmd == 'dump': - DumpMCP23017Regs() - - if cmd == 'config': - pin = int(raw_input("pin number ")) - state = int(raw_input("1 or 0 "))==1 - lcd.mcp.config(pin,state) - - if cmd == 'oneline': - general_cmd(0b100000) - - if cmd == 'twoline': - general_cmd(0b101000) - - if cmd == 'longchar': - general_cmd(0b100100) - - if cmd == 'dispall': - dispall() - - if cmd == 'quit': - exit() - -# Testing using buttons on LCDPlate -while 1: - if (lcd.buttonPressed(lcd.LEFT)): - #print "BF", lcd.readBF() - print "fast BF + AD = ", binfill(readfast()) # read Busy Flag and Adress - #print "BF + AD = ", lcd.read4bits() # read Busy Flag and Adress - #back = ToggleBacklight(back) - sleep(.2) - - if (lcd.buttonPressed(lcd.UP)): - num = raw_input("Shift Display Right by ") - display_right(int(num)) - #num = raw_input("CGRAM address? ") - #setCGRAMadd(int(num)) - sleep(.2) #prevent multiple execution while button is down - - if (lcd.buttonPressed(lcd.DOWN)): - print "fast RAM Data = ", binfill(readfast(True)) # read data from RAM - #print "RAM Data = ", lcd.read4bits(True) # read data from RAM - sleep(.2) - - if (lcd.buttonPressed(lcd.RIGHT)): - str = raw_input("message:") - lcd.message(str); - - if (lcd.buttonPressed(lcd.SELECT)): - str = raw_input("9 bits of instruction code:") - char_mode = str[0]=="1" # 1 is true - str = str[1:].zfill(8) - bits = int('0b'+str,2) - print char_mode, str, bits - numrpt = raw_input("repeat #:") - #print "input",numrpt - if (numrpt == ""): # return means 1 - numrpt = 1 - else: - numrpt = int(numrpt) - for count in range(0,numrpt): - lcd.write4bits(bits, char_mode) diff --git a/Adafruit_I2C/Adafruit_I2C.py b/Adafruit_I2C/Adafruit_I2C.py index 64486376..77f3795f 100755 --- a/Adafruit_I2C/Adafruit_I2C.py +++ b/Adafruit_I2C/Adafruit_I2C.py @@ -3,7 +3,7 @@ import smbus # =========================================================================== -# Adafruit_I2C Base Class +# Adafruit_I2C Class # =========================================================================== class Adafruit_I2C : @@ -26,14 +26,14 @@ def getPiI2CBusNumber(): # Gets the I2C bus number /dev/i2c# return 1 if Adafruit_I2C.getPiRevision() > 1 else 0 - def __init__(self, address, bus=-1, debug=False): + def __init__(self, address, busnum=-1, debug=False): self.address = address # By default, the correct I2C bus is auto-detected using /proc/cpuinfo # Alternatively, you can hard-code the bus version below: # self.bus = smbus.SMBus(0); # Force I2C0 (early 256MB Pi's) # self.bus = smbus.SMBus(1); # Force I2C1 (512MB Pi's) self.bus = smbus.SMBus( - bus if bus >= 0 else Adafruit_I2C.getPiI2CBusNumber()) + busnum if busnum >= 0 else Adafruit_I2C.getPiI2CBusNumber()) self.debug = debug def reverseByteOrder(self, data): @@ -46,7 +46,7 @@ def reverseByteOrder(self, data): data >>= 8 return val - def errMsg(): + def errMsg(self): print "Error accessing 0x%02X: Check your I2C address" % self.address return -1 @@ -57,7 +57,17 @@ def write8(self, reg, value): if self.debug: print "I2C: Wrote 0x%02X to register 0x%02X" % (value, reg) except IOError, err: - return errMsg() + return self.errMsg() + + def write16(self, reg, value): + "Writes a 16-bit value to the specified register/address pair" + try: + self.bus.write_word_data(self.address, reg, value) + if self.debug: + print ("I2C: Wrote 0x%02X to register pair 0x%02X,0x%02X" % + (value, reg, reg+1)) + except IOError, err: + return self.errMsg() def writeList(self, reg, list): "Writes an array of bytes using I2C format" @@ -67,11 +77,10 @@ def writeList(self, reg, list): print list self.bus.write_i2c_block_data(self.address, reg, list) except IOError, err: - return errMsg() + return self.errMsg() def readList(self, reg, length): "Read a list of bytes from the I2C device" - results = [] try: results = self.bus.read_i2c_block_data(self.address, reg, length) if self.debug: @@ -80,7 +89,7 @@ def readList(self, reg, length): print results return results except IOError, err: - return errMsg() + return self.errMsg() def readU8(self, reg): "Read an unsigned byte from the I2C device" @@ -91,7 +100,7 @@ def readU8(self, reg): (self.address, result & 0xFF, reg)) return result except IOError, err: - return errMsg() + return self.errMsg() def readS8(self, reg): "Reads a signed byte from the I2C device" @@ -103,7 +112,7 @@ def readS8(self, reg): (self.address, result & 0xFF, reg)) return result except IOError, err: - return errMsg() + return self.errMsg() def readU16(self, reg): "Reads an unsigned 16-bit value from the I2C device" @@ -114,7 +123,7 @@ def readU16(self, reg): (self.address, result & 0xFFFF, reg)) return result except IOError, err: - return errMsg() + return self.errMsg() def readS16(self, reg): "Reads a signed 16-bit value from the I2C device" @@ -126,4 +135,12 @@ def readS16(self, reg): (self.address, result & 0xFFFF, reg)) return result except IOError, err: - return errMsg() + return self.errMsg() + + +if __name__ == '__main__': + try: + bus = Adafruit_I2C(address=0) + print "Default I2C bus is accessible" + except: + print "Error accessing default I2C bus" diff --git a/Adafruit_MCP230xx/Adafruit_MCP230xx.py b/Adafruit_MCP230xx/Adafruit_MCP230xx.py index 4face7f1..19bc3721 100755 --- a/Adafruit_MCP230xx/Adafruit_MCP230xx.py +++ b/Adafruit_MCP230xx/Adafruit_MCP230xx.py @@ -1,174 +1,193 @@ #!/usr/bin/python -# Copyright 2012 Daniel Berlin (with some changes by Adafruit Industries/Limor Fried) -# -# Permission is hereby granted, free of charge, to any person obtaining a copy of -# this software and associated documentation files (the "Software"), to deal MCP230XX_GPIO(1, 0xin -# the Software without restriction, including without limitation the rights to -# use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies -# of the Software, and to permit persons to whom the Software is furnished to do -# so, subject to the following conditions: - -# The above copyright notice and this permission notice shall be included in all -# copies or substantial portions of the Software. +# Copyright 2012 Daniel Berlin (with some changes by Limor Fried, +# Adafruit Industries) + +# Permission is hereby granted, free of charge, to any person obtaining a +# copy of this software and associated documentation files (the "Software"), +# to deal in the Software without restriction, including without limitation +# the rights to use, copy, modify, merge, publish, distribute, sublicense, +# and/or sell copies of the Software, and to permit persons to whom the +# Software is furnished to do so, subject to the following conditions: + +# The above copyright notice and this permission notice shall be included +# in all copies or substantial portions of the Software. # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -# SOFTWARE. +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION 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 Adafruit_I2C import Adafruit_I2C -import smbus -import time - -MCP23017_IODIRA = 0x00 -MCP23017_IODIRB = 0x01 -MCP23017_GPIOA = 0x12 -MCP23017_GPIOB = 0x13 -MCP23017_GPPUA = 0x0C -MCP23017_GPPUB = 0x0D -MCP23017_OLATA = 0x14 -MCP23017_OLATB = 0x15 -MCP23008_GPIOA = 0x09 -MCP23008_GPPUA = 0x06 -MCP23008_OLATA = 0x0A - -class Adafruit_MCP230XX(object): - OUTPUT = 0 - INPUT = 1 - - def __init__(self, address, num_gpios, busnum = 0): - assert num_gpios >= 0 and num_gpios <= 16, "Number of GPIOs must be between 0 and 16" - self.i2c = Adafruit_I2C(address=address, bus=smbus.SMBus(busnum)) - self.address = address + +class Adafruit_MCP230XX(Adafruit_I2C): + + INPUT = True + OUTPUT = False + + MCP23017_IODIRA = 0x00 + MCP23017_IODIRB = 0x01 + MCP23017_GPPUA = 0x0C + MCP23017_GPPUB = 0x0D + MCP23017_GPIOA = 0x12 + MCP23017_GPIOB = 0x13 + MCP23017_OLATA = 0x14 + MCP23017_OLATB = 0x15 + MCP23008_IODIR = 0x00 + MCP23008_GPIO = 0x09 + MCP23008_GPPU = 0x06 + MCP23008_OLAT = 0x0A + + + def __init__(self, address, num_gpios=8, busnum=-1, debug=False): + + assert 0 < num_gpios < 17, "Number of GPIOs must be between 1 and 16" + + self.i2c = Adafruit_I2C(address, busnum, debug) self.num_gpios = num_gpios + self.pullups = 0 - # set defaults + # Set default pin values -- all inputs with pull-ups disabled. + # Current OLAT (output) value is polled, not set. if num_gpios <= 8: - self.i2c.write8(MCP23017_IODIRA, 0xFF) # all inputs on port A - self.direction = self.i2c.readU8(MCP23017_IODIRA) - self.i2c.write8(MCP23008_GPPUA, 0x00) - elif num_gpios > 8 and num_gpios <= 16: - self.i2c.write8(MCP23017_IODIRA, 0xFF) # all inputs on port A - self.i2c.write8(MCP23017_IODIRB, 0xFF) # all inputs on port B - self.direction = self.i2c.readU8(MCP23017_IODIRA) - self.direction |= self.i2c.readU8(MCP23017_IODIRB) << 8 - self.i2c.write8(MCP23017_GPPUA, 0x00) - self.i2c.write8(MCP23017_GPPUB, 0x00) + self.direction = 0xFF + self.i2c.write8(self.MCP23008_IODIR, self.direction) + self.i2c.write8(self.MCP23008_GPPU , self.pullups) + self.outputvalue = self.i2c.readU8(self.MCP23008_OLAT) + else: + self.direction = 0xFFFF + self.i2c.write16(self.MCP23017_IODIRA, self.direction) + self.i2c.write16(self.MCP23017_GPPUA , self.pullups) + self.outputvalue = self.i2c.readU16(self.MCP23017_OLATA) - - def _changebit(self, bitmap, bit, value): - assert value == 1 or value == 0, "Value is %s must be 1 or 0" % value - if value == 0: - return bitmap & ~(1 << bit) - elif value == 1: - return bitmap | (1 << bit) - - def _readandchangepin(self, port, pin, value, currvalue = None): - assert pin >= 0 and pin < self.num_gpios, "Pin number %s is invalid, only 0-%s are valid" % (pin, self.num_gpios) - #assert self.direction & (1 << pin) == 0, "Pin %s not set to output" % pin - if not currvalue: - currvalue = self.i2c.readU8(port) - newvalue = self._changebit(currvalue, pin, value) - self.i2c.write8(port, newvalue) - return newvalue + # Set single pin to either INPUT or OUTPUT mode + def config(self, pin, mode): - def pullup(self, pin, value): - if self.num_gpios <= 8: - return self._readandchangepin(MCP23008_GPPUA, pin, value) - if self.num_gpios <= 16: - if (pin < 8): - return self._readandchangepin(MCP23017_GPPUA, pin, value) - else: - return self._readandchangepin(MCP23017_GPPUB, pin-8, value) + assert 0 <= pin < self.num_gpios, "Pin number %s is invalid, must be between 0 and %s" % (pin, self.num_gpios-1) + + if mode is self.INPUT: self.direction |= (1 << pin) + else: self.direction &= ~(1 << pin) - # Set pin to either input or output mode - def config(self, pin, mode): if self.num_gpios <= 8: - self.direction = self._readandchangepin(MCP23017_IODIRA, pin, mode) - if self.num_gpios <= 16: - if (pin < 8): - # replace low bits - self.direction = (self.direction & 0xff00) | self._readandchangepin(MCP23017_IODIRA, pin, mode) - else: - # replace hi bits - self.direction = (self.direction & 0xff) | self._readandchangepin(MCP23017_IODIRB, pin-8, mode) << 8 - #print "config ", pin, mode, self.direction, bin(self.direction)[2:].zfill(16) + self.i2c.write8(self.MCP23008_IODIR, self.direction) + elif pin < 8: + # Replace low bits (IODIRA) + self.i2c.write8(self.MCP23017_IODIRA, self.direction & 0xFF) + else: + # Replace high bits (IODIRB) + self.i2c.write8(self.MCP23017_IODIRB, self.direction >> 8) + return self.direction - def output(self, pin, value): - # assert self.direction & (1 << pin) == 0, "Pin %s not set to output" % pin + + # Enable pull-up resistor on single input pin + def pullup(self, pin, enable, check=False): + + assert 0 <= pin < self.num_gpios, "Pin number %s is invalid, must be between 0 and %s" % (pin, self.num_gpios-1) + if check: + assert (self.direction & (1 << pin)) != 0, "Pin %s not set to input" % pin + + if enable: self.pullups |= (1 << pin) + else: self.pullups &= ~(1 << pin) + if self.num_gpios <= 8: - self.outputvalue = self._readandchangepin(MCP23008_GPIOA, pin, value, self.i2c.readU8(MCP23008_OLATA)) - if self.num_gpios <= 16: - if (pin < 8): - self.outputvalue = self._readandchangepin(MCP23017_GPIOA, pin, value, self.i2c.readU8(MCP23017_OLATA)) - else: - self.outputvalue = self._readandchangepin(MCP23017_GPIOB, pin-8, value, self.i2c.readU8(MCP23017_OLATB)) - return self.outputvalue + self.i2c.write8(self.MCP23008_GPPU, self.pullups) + elif pin < 8: + # Replace low bits (GPPUA) + self.i2c.write8(self.MCP23017_GPPUA, self.pullups & 0xFF) + else: + # Replace high bits (GPPUB) + self.i2c.write8(self.MCP23017_GPPUB, self.pullups >> 8) -# inaccessible code removed from here - + return self.pullups + + + # Read value from single input pin def input(self, pin, check=True): - assert pin >= 0 and pin < self.num_gpios, "Pin number %s is invalid, only 0-%s are valid" % (pin, self.num_gpios) + + assert 0 <= pin < self.num_gpios, "Pin number %s is invalid, must be between 0 and %s" % (pin, self.num_gpios-1) if check: - assert self.direction & (1 << pin) != 0, "Pin %s not set to input" % pin + assert (self.direction & (1 << pin)) != 0, "Pin %s not set to input" % pin + if self.num_gpios <= 8: - value = self.i2c.readU8(MCP23008_GPIOA) - elif self.num_gpios > 8 and self.num_gpios <= 16: - value = self.i2c.readU16(MCP23017_GPIOA) - temp = value >> 8 - value <<= 8 - value |= temp - return (value & (1 << pin))>>pin # to make 0 or 1 - + value = self.i2c.readU8(self.MCP23008_GPIO) + return (value >> pin) & 1 + elif pin < 8: + # Read from low bits (GPIOA) + value = self.i2c.readU8(self.MCP23017_GPIOA) + return (value >> pin) & 1 + else: + # Read from high bits (GPIOB) + value = self.i2c.readU8(self.MCP23017_GPIOB) + return (value >> (pin - 8)) & 1 + + + # Write value to single output pin + def output(self, pin, value): + assert 0 <= pin < self.num_gpios, "Pin number %s is invalid, must be between 0 and %s" % (pin, self.num_gpios-1) + # assert self.direction & (1 << pin) == 0, "Pin %s not set to output" % pin + + if value: new = self.outputvalue | (1 << pin) + else: new = self.outputvalue & ~(1 << pin) + + # Only write if pin value has changed: + if new is not self.outputvalue: + self.outputvalue = new + if self.num_gpios <= 8: + self.i2c.write8(self.MCP23008_OLAT, new) + elif pin < 8: + # Write to low bits (OLATA) + self.i2c.write8(self.MCP23017_OLATA, new & 0xFF) + else: + # Write to high bits (OLATB) + self.i2c.write8(self.MCP23017_OLATB, new >> 8) - -# these were indented so within scope of input but have now made them all part of the class -# have modified so can read any address but default to those given in original code -# also use available routines in imported Adafruit_I2C class - def readU8(self, add=MCP23008_OLATA): - result = self.i2c.readU8(add) - return(result) + return new - def readS8(self, add=MCP23008_OLATA): - result = self.i2c.readS8(add) - return result - def readU16(self, add=MCP23017_OLATA): - assert self.num_gpios >= 16, "16bits required" - result = self.i2c.readU16(add) - return result +# The following two methods (inputAll and outputAll) neither assert +# inputs nor invoke the base class methods that handle I/O exceptions. +# The underlying smbus calls are invoked directly for expediency, the +# expectation being that any I2C access or address type errors have +# already been identified during initialization. - def readS16(self, add=MCP23017_OLATA): - assert self.num_gpios >= 16, "16bits required" - result = self.i2c.readS16(add) - return result + # Read contiguous value from all input pins + def inputAll(self): + if self.num_gpios <= 8: + return self.i2c.bus.read_byte_data(self.i2c.address, + self.MCP23008_GPIO) + else: + return self.i2c.bus.read_word_data(self.i2c.address, + self.MCP23017_GPIOA) - def write8(self, value, add=MCP23008_OLATA): - self.i2c.write8(add, value) - def write16(self, value, add=MCP23017_OLATA): - assert self.num_gpios >= 16, "16bits required" - self.i2c.write16(add, value) - + # Write contiguous value to all output pins + def outputAll(self, value): + self.outputvalue = value + if self.num_gpios <= 8: + self.i2c.bus.write_byte_data(self.i2c.address, + self.MCP23008_OLAT, value) + else: + self.i2c.bus.write_word_data(self.i2c.address, + self.MCP23017_OLATA, value) + # RPi.GPIO compatible interface for MCP23017 and MCP23008 class MCP230XX_GPIO(object): - OUT = 0 - IN = 1 - BCM = 0 + OUT = 0 + IN = 1 + BCM = 0 BOARD = 0 + def __init__(self, busnum, address, num_gpios): self.chip = Adafruit_MCP230XX(busnum, address, num_gpios) def setmode(self, mode): - # do nothing - pass + pass # do nothing def setup(self, pin, mode): self.chip.config(pin, mode) def input(self, pin): @@ -177,28 +196,28 @@ def output(self, pin, value): self.chip.output(pin, value) def pullup(self, pin, value): self.chip.pullup(pin, value) - + if __name__ == '__main__': - mcp = Adafruit_MCP230XX(address = 0x20, num_gpios = 8) - # *************************************************** + # **************************************************** # Set num_gpios to 8 for MCP23008 or 16 for MCP23017! - # If you have a new Pi you may also need to add: - # busnum = 1 - # *************************************************** + # If you have a new Pi you may also need to add: bus=1 + # **************************************************** + mcp = Adafruit_MCP230XX(address=0x20, num_gpios=16) - # Set pins 0, 1 and 2 to output (you can set pins 0..15 this way) + # Set pins 0, 1, 2 as outputs mcp.config(0, mcp.OUTPUT) mcp.config(1, mcp.OUTPUT) mcp.config(2, mcp.OUTPUT) # Set pin 3 to input with the pullup resistor enabled - mcp.pullup(3, 1) + mcp.pullup(3, True) + # Read pin 3 and display the results - print "%d: %x" % (3, mcp.input(3) >> 3) + print "%d: %x" % (3, mcp.input(3)) # Python speed test on output 0 toggling at max speed - while (True): - mcp.output(0, 1) # Pin 0 High - mcp.output(0, 0) # Pin 0 Low + while True: + mcp.output(0, 1) # Pin 0 High + mcp.output(0, 0) # Pin 0 Low diff --git a/Adafruit_MCP4725/Adafruit_I2C.py b/Adafruit_MCP4725/Adafruit_I2C.py deleted file mode 100755 index dd2dfa76..00000000 --- a/Adafruit_MCP4725/Adafruit_I2C.py +++ /dev/null @@ -1,95 +0,0 @@ -#!/usr/bin/python - -import smbus - -# =========================================================================== -# Adafruit_I2C Base Class -# =========================================================================== - -class Adafruit_I2C : - - def __init__(self, address, bus=smbus.SMBus(0), debug=False): - self.address = address - self.bus = bus - self.debug = debug - - def reverseByteOrder(self, data): - "Reverses the byte order of an int (16-bit) or long (32-bit) value" - # Courtesy Vishal Sapre - dstr = hex(data)[2:].replace('L','') - byteCount = len(dstr[::2]) - val = 0 - for i, n in enumerate(range(byteCount)): - d = data & 0xFF - val |= (d << (8 * (byteCount - i - 1))) - data >>= 8 - return val - - def write8(self, reg, value): - "Writes an 8-bit value to the specified register/address" - try: - self.bus.write_byte_data(self.address, reg, value) - if (self.debug): - print("I2C: Wrote 0x%02X to register 0x%02X" % (value, reg)) - except IOError, err: - print "Error accessing 0x%02X: Check your I2C address" % self.address - return -1 - - def writeList(self, reg, list): - "Writes an array of bytes using I2C format" - try: - self.bus.write_i2c_block_data(self.address, reg, list) - except IOError, err: - print "Error accessing 0x%02X: Check your I2C address" % self.address - return -1 - - def readU8(self, reg): - "Read an unsigned byte from the I2C device" - try: - result = self.bus.read_byte_data(self.address, reg) - if (self.debug): - print "I2C: Device 0x%02X returned 0x%02X from reg 0x%02X" % (self.address, result & 0xFF, reg) - return result - except IOError, err: - print "Error accessing 0x%02X: Check your I2C address" % self.address - return -1 - - def readS8(self, reg): - "Reads a signed byte from the I2C device" - try: - result = self.bus.read_byte_data(self.address, reg) - if (self.debug): - print "I2C: Device 0x%02X returned 0x%02X from reg 0x%02X" % (self.address, result & 0xFF, reg) - if (result > 127): - return result - 256 - else: - return result - except IOError, err: - print "Error accessing 0x%02X: Check your I2C address" % self.address - return -1 - - def readU16(self, reg): - "Reads an unsigned 16-bit value from the I2C device" - try: - hibyte = self.bus.read_byte_data(self.address, reg) - result = (hibyte << 8) + self.bus.read_byte_data(self.address, reg+1) - if (self.debug): - print "I2C: Device 0x%02X returned 0x%04X from reg 0x%02X" % (self.address, result & 0xFFFF, reg) - return result - except IOError, err: - print "Error accessing 0x%02X: Check your I2C address" % self.address - return -1 - - def readS16(self, reg): - "Reads a signed 16-bit value from the I2C device" - try: - hibyte = self.bus.read_byte_data(self.address, reg) - if (hibyte > 127): - hibyte -= 256 - result = (hibyte << 8) + self.bus.read_byte_data(self.address, reg+1) - if (self.debug): - print "I2C: Device 0x%02X returned 0x%04X from reg 0x%02X" % (self.address, result & 0xFFFF, reg) - return result - except IOError, err: - print "Error accessing 0x%02X: Check your I2C address" % self.address - return -1 diff --git a/Adafruit_MCP4725/Adafruit_I2C.py b/Adafruit_MCP4725/Adafruit_I2C.py new file mode 120000 index 00000000..77f06164 --- /dev/null +++ b/Adafruit_MCP4725/Adafruit_I2C.py @@ -0,0 +1 @@ +../Adafruit_I2C/Adafruit_I2C.py \ No newline at end of file diff --git a/Adafruit_PWM_Servo_Driver/Adafruit_I2C.py b/Adafruit_PWM_Servo_Driver/Adafruit_I2C.py deleted file mode 100755 index dd2dfa76..00000000 --- a/Adafruit_PWM_Servo_Driver/Adafruit_I2C.py +++ /dev/null @@ -1,95 +0,0 @@ -#!/usr/bin/python - -import smbus - -# =========================================================================== -# Adafruit_I2C Base Class -# =========================================================================== - -class Adafruit_I2C : - - def __init__(self, address, bus=smbus.SMBus(0), debug=False): - self.address = address - self.bus = bus - self.debug = debug - - def reverseByteOrder(self, data): - "Reverses the byte order of an int (16-bit) or long (32-bit) value" - # Courtesy Vishal Sapre - dstr = hex(data)[2:].replace('L','') - byteCount = len(dstr[::2]) - val = 0 - for i, n in enumerate(range(byteCount)): - d = data & 0xFF - val |= (d << (8 * (byteCount - i - 1))) - data >>= 8 - return val - - def write8(self, reg, value): - "Writes an 8-bit value to the specified register/address" - try: - self.bus.write_byte_data(self.address, reg, value) - if (self.debug): - print("I2C: Wrote 0x%02X to register 0x%02X" % (value, reg)) - except IOError, err: - print "Error accessing 0x%02X: Check your I2C address" % self.address - return -1 - - def writeList(self, reg, list): - "Writes an array of bytes using I2C format" - try: - self.bus.write_i2c_block_data(self.address, reg, list) - except IOError, err: - print "Error accessing 0x%02X: Check your I2C address" % self.address - return -1 - - def readU8(self, reg): - "Read an unsigned byte from the I2C device" - try: - result = self.bus.read_byte_data(self.address, reg) - if (self.debug): - print "I2C: Device 0x%02X returned 0x%02X from reg 0x%02X" % (self.address, result & 0xFF, reg) - return result - except IOError, err: - print "Error accessing 0x%02X: Check your I2C address" % self.address - return -1 - - def readS8(self, reg): - "Reads a signed byte from the I2C device" - try: - result = self.bus.read_byte_data(self.address, reg) - if (self.debug): - print "I2C: Device 0x%02X returned 0x%02X from reg 0x%02X" % (self.address, result & 0xFF, reg) - if (result > 127): - return result - 256 - else: - return result - except IOError, err: - print "Error accessing 0x%02X: Check your I2C address" % self.address - return -1 - - def readU16(self, reg): - "Reads an unsigned 16-bit value from the I2C device" - try: - hibyte = self.bus.read_byte_data(self.address, reg) - result = (hibyte << 8) + self.bus.read_byte_data(self.address, reg+1) - if (self.debug): - print "I2C: Device 0x%02X returned 0x%04X from reg 0x%02X" % (self.address, result & 0xFFFF, reg) - return result - except IOError, err: - print "Error accessing 0x%02X: Check your I2C address" % self.address - return -1 - - def readS16(self, reg): - "Reads a signed 16-bit value from the I2C device" - try: - hibyte = self.bus.read_byte_data(self.address, reg) - if (hibyte > 127): - hibyte -= 256 - result = (hibyte << 8) + self.bus.read_byte_data(self.address, reg+1) - if (self.debug): - print "I2C: Device 0x%02X returned 0x%04X from reg 0x%02X" % (self.address, result & 0xFFFF, reg) - return result - except IOError, err: - print "Error accessing 0x%02X: Check your I2C address" % self.address - return -1 diff --git a/Adafruit_PWM_Servo_Driver/Adafruit_I2C.py b/Adafruit_PWM_Servo_Driver/Adafruit_I2C.py new file mode 120000 index 00000000..77f06164 --- /dev/null +++ b/Adafruit_PWM_Servo_Driver/Adafruit_I2C.py @@ -0,0 +1 @@ +../Adafruit_I2C/Adafruit_I2C.py \ No newline at end of file diff --git a/Adafruit_VCNL4000/Adafruit_I2C.py b/Adafruit_VCNL4000/Adafruit_I2C.py deleted file mode 100755 index dd2dfa76..00000000 --- a/Adafruit_VCNL4000/Adafruit_I2C.py +++ /dev/null @@ -1,95 +0,0 @@ -#!/usr/bin/python - -import smbus - -# =========================================================================== -# Adafruit_I2C Base Class -# =========================================================================== - -class Adafruit_I2C : - - def __init__(self, address, bus=smbus.SMBus(0), debug=False): - self.address = address - self.bus = bus - self.debug = debug - - def reverseByteOrder(self, data): - "Reverses the byte order of an int (16-bit) or long (32-bit) value" - # Courtesy Vishal Sapre - dstr = hex(data)[2:].replace('L','') - byteCount = len(dstr[::2]) - val = 0 - for i, n in enumerate(range(byteCount)): - d = data & 0xFF - val |= (d << (8 * (byteCount - i - 1))) - data >>= 8 - return val - - def write8(self, reg, value): - "Writes an 8-bit value to the specified register/address" - try: - self.bus.write_byte_data(self.address, reg, value) - if (self.debug): - print("I2C: Wrote 0x%02X to register 0x%02X" % (value, reg)) - except IOError, err: - print "Error accessing 0x%02X: Check your I2C address" % self.address - return -1 - - def writeList(self, reg, list): - "Writes an array of bytes using I2C format" - try: - self.bus.write_i2c_block_data(self.address, reg, list) - except IOError, err: - print "Error accessing 0x%02X: Check your I2C address" % self.address - return -1 - - def readU8(self, reg): - "Read an unsigned byte from the I2C device" - try: - result = self.bus.read_byte_data(self.address, reg) - if (self.debug): - print "I2C: Device 0x%02X returned 0x%02X from reg 0x%02X" % (self.address, result & 0xFF, reg) - return result - except IOError, err: - print "Error accessing 0x%02X: Check your I2C address" % self.address - return -1 - - def readS8(self, reg): - "Reads a signed byte from the I2C device" - try: - result = self.bus.read_byte_data(self.address, reg) - if (self.debug): - print "I2C: Device 0x%02X returned 0x%02X from reg 0x%02X" % (self.address, result & 0xFF, reg) - if (result > 127): - return result - 256 - else: - return result - except IOError, err: - print "Error accessing 0x%02X: Check your I2C address" % self.address - return -1 - - def readU16(self, reg): - "Reads an unsigned 16-bit value from the I2C device" - try: - hibyte = self.bus.read_byte_data(self.address, reg) - result = (hibyte << 8) + self.bus.read_byte_data(self.address, reg+1) - if (self.debug): - print "I2C: Device 0x%02X returned 0x%04X from reg 0x%02X" % (self.address, result & 0xFFFF, reg) - return result - except IOError, err: - print "Error accessing 0x%02X: Check your I2C address" % self.address - return -1 - - def readS16(self, reg): - "Reads a signed 16-bit value from the I2C device" - try: - hibyte = self.bus.read_byte_data(self.address, reg) - if (hibyte > 127): - hibyte -= 256 - result = (hibyte << 8) + self.bus.read_byte_data(self.address, reg+1) - if (self.debug): - print "I2C: Device 0x%02X returned 0x%04X from reg 0x%02X" % (self.address, result & 0xFFFF, reg) - return result - except IOError, err: - print "Error accessing 0x%02X: Check your I2C address" % self.address - return -1 diff --git a/Adafruit_VCNL4000/Adafruit_I2C.py b/Adafruit_VCNL4000/Adafruit_I2C.py new file mode 120000 index 00000000..77f06164 --- /dev/null +++ b/Adafruit_VCNL4000/Adafruit_I2C.py @@ -0,0 +1 @@ +../Adafruit_I2C/Adafruit_I2C.py \ No newline at end of file diff --git a/Adafruit_VCNL4000/Adafruit_I2C.pyc b/Adafruit_VCNL4000/Adafruit_I2C.pyc deleted file mode 100644 index 0ab5c836596ad8d9caa637cd14676cf2c9aa4f9e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4470 zcmdT{U2hXd6uq-+J9aQoRR{utW?N`$9zsHjAVn1o1WJ+8fYzl6Q7dcX9VeUEyXnlD zVl`2#hCcPBKcX-F5&ch<`UB{>ch`v%IijLXqz3Qh?#%3b+;i@k8TYS~qklMmK50_^ z=i>iaJoYk7h@YZ1(J~x|!UBaZy(HQpdbX^%u3jsmUGxfn3uzVZ-7sjGZj?42P0#J? z^d5KGfYInqk#=a^>*|wl?L0 zm99;BxuIU^uGYBcl#SKxmd~I0Jdn>VYj`qa>+mMml8&C-j3zgG=~@y`_JcIx2X=Es z8`GP35=}gj%89uo)VnPjU(GGd-E=#K`!7lAMwCzxeSY-GL6hFIk9u2nvP?5F^^kRV!04x@vLOFi- zzqw6c<5N_ZIHZ7Nc6)@j&;*FVK}?G@23*F@+_9Cu4!+jmufFDp*CL9@`Bil;?%2Mzd5lIrB_kmwUc<&t9>+`6+92xT^;d)Q-)w3 zs|0?6fAk7&#BqqYN|-7*uIU$otcuLqvLKzn;_MKvUE?nNUAV&_ z4FvblrbfQuDbFR{IF+6-BbiDhHWnM!(8UoG;w_9|vPj;;gdTGUxy-U5_o6zlN@`q< zstf9rYBEcCNz7-V2&ZOmhBILuKS`2xumX-lJ1!}%aLL?a`f%zfYB_ZF;pZ{YV(d`? zA=wxuvrG!KQ6Lw8AT7YM`clY<^I-NC%%X`>;0<(V7)DP}^wLBaU^jI$YDGHqj9!gw zs?B7ch4u=*1^;h*izWe0re3^1HNC{&^;_me_8J;KFa~r9noZF23V=HW=Rq!=7b1hfetO=&=kTN|5n`t1uPej;u)-fdoGW z{5jcWzB3o$*;6p&xIn$4&Z^U@It26kXwtiMIOZ9!t^oUK4s4$pfF2+NSfDEruvgLB z9v+N9#iV~DNvvJ7^7O&D$e_i z0##LZ257+C-rb1#tk#PTrvdU^(H#~7{Q7Fl$18` z2=|~$`~q4OuyY?y3(otT76USo9nJDBe284^oxuK)aNJnRG-psaaF9DHhKQ`lmLeMj zqqY{Y@*OK#_@=><_VoJAhj8uNFd18}9F&ZGT=^Z%dOy8}E35`LL=7C8!C^m^yAP-_ zj6{WlB--XXz#fTk&fmAy93ateIf-xs5Z>`Aq0HJ+fwu78XD49}Xv=FEw5t>UCocK# z@k)PRn~?#-ge^sRo%;JBgb73K<6--Dso?PNUID!fu;inP#@rzwy?; zxR>93KMUGc`;s**Y5oN^m)Ll0-eq%{%@vrv6P9>Kbr<$A6!B3@HrkRiR;*Mjqm^>y iMCDYanoWWaTE6US-1wL#CK3K5i|HM{8(5x3we&X(F6o^B diff --git a/Adafruit_VCNL4000/Adafruit_VCNL4000.pyc b/Adafruit_VCNL4000/Adafruit_VCNL4000.pyc deleted file mode 100644 index 6a36ebe081ef8728a7b6fec2fec6e9b97ae58cd3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1829 zcmcgsU2hXd6g{&}>^O10A;4P^0=W;t`6x6<2w3bbGGrHb?383)R*q*wHnL;0I}tyJ^AC*KeZMHPln$2XrzA< zX!;ju1FCO3XbW@%lz`9~Cd3q21t2fY9_54{Mr0DTU63Hm(V0dIjFwa69Kix;T6_&<7r zq9D^02wdIVOO9d_R@ch$B0Ichc*8(v5mOAr?-@QY{Lb(P0}aF+Cw3T^gLsZ%g5e&+ z4+Ms%zm*dPwM>rQO|6qC zO-+{U=Sgg$4Revq;YGrle7s!^s*N4D@^Gu(umLFtl@qo1Bu6UJ=tH_qR%yT6iAue= z)H^o&-NVw5_+{Bld%IDR952`6<(l1GE_Zb_@(71Xzh1dc!IN?fw7{HLT8zVYW=>vsOi-eRd*h%zV)K=yGIC8) z+U9%pafZ@z)nPB`zKA=qIlj(y@sAW@QRKyfD2O=`6m5O|t{*l#Q5c#@atXsuS0A-` z$~*_%!>G?Xt644(e7T6V{#R8>R^DYAR*hMa%@p$e{O7owSq2(s<|EhoE=GnEMH&!3f+9{c@-&%RZj;BOBkolk@ndgM(Pevc^ nu%;!;z>@ksyJ){HxBI%f!{4;@8Ud*=m(5U5PyRWB+35WlG_rSM From be8dd30eb58e1eb82d59e60ad5fc003a181fe406 Mon Sep 17 00:00:00 2001 From: Phillip Burgess Date: Wed, 13 Mar 2013 15:41:14 -0700 Subject: [PATCH 10/79] Bugfixlets & moar speed --- .../Adafruit_CharLCDPlate.py | 63 +++++++++++-------- 1 file changed, 38 insertions(+), 25 deletions(-) diff --git a/Adafruit_CharLCDPlate/Adafruit_CharLCDPlate.py b/Adafruit_CharLCDPlate/Adafruit_CharLCDPlate.py index ba14d66c..a1552ee6 100644 --- a/Adafruit_CharLCDPlate/Adafruit_CharLCDPlate.py +++ b/Adafruit_CharLCDPlate/Adafruit_CharLCDPlate.py @@ -85,7 +85,9 @@ def __init__(self, busnum=-1, addr=0x20, debug=False): self.displayshift = (self.LCD_CURSORMOVE | self.LCD_MOVERIGHT) - self.write4(0x20) # Select 4-bit interface +# self.write4(0x20) # Select 4-bit interface + self.write4(0x33) # Init + self.write4(0x32) # Init self.write4(0x28) # 2 line 5x8 matrix self.write4(self.LCD_CLEARDISPLAY) self.write4(self.LCD_CURSORSHIFT | self.displayshift) @@ -103,6 +105,28 @@ def __init__(self, busnum=-1, addr=0x20, debug=False): 0b00000010, 0b00010010, 0b00001010, 0b00011010, 0b00000110, 0b00010110, 0b00001110, 0b00011110 ) + # Low-level 4 bit output interface + def out4(self, bitmask, value): + b = bitmask | self.flip[value >> 4] # Insert high 4 bits of data + # Write initial !E state, data is sampled on rising strobe edge + self.mcp.i2c.bus.write_byte_data( + self.mcp.i2c.address, self.mcp.MCP23017_OLATB, b) + # Strobe high + self.mcp.i2c.bus.write_byte_data( + self.mcp.i2c.address, self.mcp.MCP23017_OLATB, b | 0b00100000) + # Strobe low + self.mcp.i2c.bus.write_byte_data( + self.mcp.i2c.address, self.mcp.MCP23017_OLATB, b) + b = bitmask | self.flip[value & 0x0F] # Insert low 4 bits + self.mcp.i2c.bus.write_byte_data( + self.mcp.i2c.address, self.mcp.MCP23017_OLATB, b) + self.mcp.i2c.bus.write_byte_data( + self.mcp.i2c.address, self.mcp.MCP23017_OLATB, b | 0b00100000) + self.mcp.i2c.bus.write_byte_data( + self.mcp.i2c.address, self.mcp.MCP23017_OLATB, b) + return b + + # Write 8-bit value to LCD over 4-bit interface def write4(self, value, char_mode=False): """ Send command/data to LCD """ @@ -158,23 +182,13 @@ def write4(self, value, char_mode=False): a &= 0b00000001 # Mask out data bits & RW from current OLATB value if char_mode: a |= 0b10000000 # RS = Command/data - b = a | self.flip[value >> 4] # Insert high 4 bits of data - # Write initial !E state, data is sampled on rising strobe edge - self.mcp.i2c.bus.write_byte_data( - self.mcp.i2c.address, self.mcp.MCP23017_OLATB, b) - # Strobe high - self.mcp.i2c.bus.write_byte_data( - self.mcp.i2c.address, self.mcp.MCP23017_OLATB, b | 0b00100000) - # Strobe low - self.mcp.i2c.bus.write_byte_data( - self.mcp.i2c.address, self.mcp.MCP23017_OLATB, b) - b = a | self.flip[value & 0x0F] # Insert low 4 bits - self.mcp.i2c.bus.write_byte_data( - self.mcp.i2c.address, self.mcp.MCP23017_OLATB, b) - self.mcp.i2c.bus.write_byte_data( - self.mcp.i2c.address, self.mcp.MCP23017_OLATB, b | 0b00100000) - self.mcp.i2c.bus.write_byte_data( - self.mcp.i2c.address, self.mcp.MCP23017_OLATB, b) + # If string or list, iterate through a write iteration + if isinstance(value, str): + for v in value: b = self.out4(a, ord(v)) + elif isinstance(value, list): + for v in value: b = self.out4(a, v) + else: + b = self.out4(a, value) # Change data pins back to inputs self.mcp.i2c.bus.write_byte_data( @@ -290,18 +304,17 @@ def noAutoscroll(self): def createChar(self, location, bitmap): self.write4(self.LCD_SETCGRAMADDR | ((location & 7) << 3)) - for i in range(8): - self.write4(bitmap[i], True) + self.write4(bitmap, True) self.write4(self.LCD_SETDDRAMADDR) def message(self, text): """ Send string to LCD. Newline wraps to second line""" - for char in text: - if char == '\n': - self.write4(0xC0) # set DDRAM address to second line - else: - self.write4(ord(char), True) + lines = text.split('\n') # Split at newline(s) + for line in lines: # Render each substring... + self.write4(line, True) + if len(lines) > 1: # If newline(s), + self.write4(0xC0) # set DDRAM address to second line def backlight(self, color): From 2309cf2e6cc048d2408daa710e2f2c4d639ff4e5 Mon Sep 17 00:00:00 2001 From: Phillip Burgess Date: Wed, 13 Mar 2013 17:12:30 -0700 Subject: [PATCH 11/79] Further speed tweak; poll only when sensible --- .../Adafruit_CharLCDPlate.py | 203 ++++++++++-------- 1 file changed, 116 insertions(+), 87 deletions(-) diff --git a/Adafruit_CharLCDPlate/Adafruit_CharLCDPlate.py b/Adafruit_CharLCDPlate/Adafruit_CharLCDPlate.py index a1552ee6..9b0a1cd6 100644 --- a/Adafruit_CharLCDPlate/Adafruit_CharLCDPlate.py +++ b/Adafruit_CharLCDPlate/Adafruit_CharLCDPlate.py @@ -8,6 +8,9 @@ class Adafruit_CharLCDPlate(Adafruit_MCP230XX): + # ---------------------------------------------------------------------- + # Constants + # Port expander input pin definitions SELECT = 0 RIGHT = 1 @@ -57,6 +60,9 @@ class Adafruit_CharLCDPlate(Adafruit_MCP230XX): LCD_MOVELEFT = 0x00 + # ---------------------------------------------------------------------- + # Constructor + def __init__(self, busnum=-1, addr=0x20, debug=False): self.mcp = Adafruit_MCP230XX(addr, 16, busnum, debug) @@ -77,24 +83,25 @@ def __init__(self, busnum=-1, addr=0x20, debug=False): # Init control lines, backlight on (white) self.mcp.outputAll(0) - self.displaycontrol = (self.LCD_DISPLAYON | - self.LCD_CURSOROFF | - self.LCD_BLINKOFF) - self.displaymode = (self.LCD_ENTRYLEFT | - self.LCD_ENTRYSHIFTDECREMENT) - self.displayshift = (self.LCD_CURSORMOVE | - self.LCD_MOVERIGHT) - -# self.write4(0x20) # Select 4-bit interface - self.write4(0x33) # Init - self.write4(0x32) # Init - self.write4(0x28) # 2 line 5x8 matrix - self.write4(self.LCD_CLEARDISPLAY) - self.write4(self.LCD_CURSORSHIFT | self.displayshift) - self.write4(self.LCD_ENTRYMODESET | self.displaymode) - self.write4(self.LCD_DISPLAYCONTROL | self.displaycontrol) - self.write4(self.LCD_RETURNHOME) - + self.displayshift = (self.LCD_CURSORMOVE | + self.LCD_MOVERIGHT) + self.displaymode = (self.LCD_ENTRYLEFT | + self.LCD_ENTRYSHIFTDECREMENT) + self.displaycontrol = (self.LCD_DISPLAYON | + self.LCD_CURSOROFF | + self.LCD_BLINKOFF) + self.write(0x33) # Init + self.write(0x32) # Init + self.write(0x28) # 2 line 5x8 matrix + self.write(self.LCD_CLEARDISPLAY) + self.write(self.LCD_CURSORSHIFT | self.displayshift) + self.write(self.LCD_ENTRYMODESET | self.displaymode) + self.write(self.LCD_DISPLAYCONTROL | self.displaycontrol) + self.write(self.LCD_RETURNHOME) + + + # ---------------------------------------------------------------------- + # Write operations # The LCD data pins (D4-D7) connect to MCP pins 12-9 (PORTB4-1), in # that order. Because this sequence is 'reversed,' a direct shift @@ -111,10 +118,12 @@ def out4(self, bitmask, value): # Write initial !E state, data is sampled on rising strobe edge self.mcp.i2c.bus.write_byte_data( self.mcp.i2c.address, self.mcp.MCP23017_OLATB, b) - # Strobe high + # Strobe high (enable) self.mcp.i2c.bus.write_byte_data( self.mcp.i2c.address, self.mcp.MCP23017_OLATB, b | 0b00100000) - # Strobe low + # There's no need for delay calls when strobing, as the limited + # I2C throughput already ensures the strobe is held long enough. + # Strobe low (!enable) self.mcp.i2c.bus.write_byte_data( self.mcp.i2c.address, self.mcp.MCP23017_OLATB, b) b = bitmask | self.flip[value & 0x0F] # Insert low 4 bits @@ -124,11 +133,24 @@ def out4(self, bitmask, value): self.mcp.i2c.address, self.mcp.MCP23017_OLATB, b | 0b00100000) self.mcp.i2c.bus.write_byte_data( self.mcp.i2c.address, self.mcp.MCP23017_OLATB, b) - return b - - - # Write 8-bit value to LCD over 4-bit interface - def write4(self, value, char_mode=False): + return b # Last port state + + # The speed of LCD accesses is inherently limited by I2C through the + # port expander. A 'well behaved program' is expected to poll the + # LCD to know that a prior instruction completed. But the timing of + # most instructions is a known uniform 37 mS. The enable strobe + # can't even be twiddled that fast through I2C, so it's a safe bet + # with these instructions to not waste time polling (which requires + # several I2C transfers for reconfiguring the port direction). + # 'pollflag' is set when a potentially time-consuming instruction + # has been issued (e.g. screen clear), as well as on startup, and + # polling will then occur before more commands or data are issued. + + pollables = ( LCD_CLEARDISPLAY, LCD_RETURNHOME ) + pollflag = True + + # Write 8-bit value to LCD + def write(self, value, char_mode=False): """ Send command/data to LCD """ # The following code does not invoke the base class methods that @@ -145,44 +167,42 @@ def write4(self, value, char_mode=False): # LCD pin E = MCP pin 13 (PORTB5) Strobe # LCD D4...D7 = MCP 12...9 (PORTB4...1) Data (see notes later) - # Poll LCD busy state until clear. Data pins are inputs - # by default, so no need to reconfigure I/O direction yet. - - # Current PORTB pin state RS=0 RW=1 - a = ((self.mcp.outputvalue >> 8) & 0b00000001) | 0b01000000 - b = a | 0b00100000 # E=1 - # Configure MCP lines for polling. Will restore later. - self.mcp.i2c.bus.write_byte_data( - self.mcp.i2c.address, self.mcp.MCP23017_OLATB, a) - while True: - # Strobe high (enable) - self.mcp.i2c.bus.write_byte_data( - self.mcp.i2c.address, self.mcp.MCP23017_OLATB, b) - # There's no need for delay calls when strobing, as the - # limited I2C throughput already ensures the strobe is - # held long enough. - # First nybble contains busy state - bits = self.mcp.i2c.bus.read_byte_data( - self.mcp.i2c.address, self.mcp.MCP23017_GPIOB) - # Strobe low (!enable) + # If pollflag is set, poll LCD busy state until clear. Data + # pins were previously set as inputs, no need to reconfigure + # I/O yet. + if self.pollflag: + # Current PORTB pin state RS=0 RW=1 + a = ((self.mcp.outputvalue >> 8) & 0b00000001) | 0b01000000 + b = a | 0b00100000 # E=1 self.mcp.i2c.bus.write_byte_data( self.mcp.i2c.address, self.mcp.MCP23017_OLATB, a) - if (bits & 0b00000010) == 0: break # D7=0, not busy - # Ignore second nybble + while True: + # Strobe high (enable) + self.mcp.i2c.bus.write_byte_data( + self.mcp.i2c.address, self.mcp.MCP23017_OLATB, b) + # First nybble contains busy state + bits = self.mcp.i2c.bus.read_byte_data( + self.mcp.i2c.address, self.mcp.MCP23017_GPIOB) + # Strobe low (!enable) + self.mcp.i2c.bus.write_byte_data( + self.mcp.i2c.address, self.mcp.MCP23017_OLATB, a) + if (bits & 0b00000010) == 0: break # D7=0, not busy + # Ignore second nybble + self.mcp.i2c.bus.write_byte_data( + self.mcp.i2c.address, self.mcp.MCP23017_OLATB, b) + self.mcp.i2c.bus.write_byte_data( + self.mcp.i2c.address, self.mcp.MCP23017_OLATB, a) + + # Polling complete, change data pins to outputs + save = self.mcp.direction >> 8 # PORTB self.mcp.i2c.bus.write_byte_data( - self.mcp.i2c.address, self.mcp.MCP23017_OLATB, b) - self.mcp.i2c.bus.write_byte_data( - self.mcp.i2c.address, self.mcp.MCP23017_OLATB, a) - - # Change data pins to outputs temporarily - save = self.mcp.direction >> 8 # PORTB - self.mcp.i2c.bus.write_byte_data( - self.mcp.i2c.address, self.mcp.MCP23017_IODIRB, save & 0b11100001) + self.mcp.i2c.address, self.mcp.MCP23017_IODIRB, save&0b11100001) - a &= 0b00000001 # Mask out data bits & RW from current OLATB value + # Mask out data bits & RW from current OLATB value + a = ((self.mcp.outputvalue >> 8) & 0b00000001) if char_mode: a |= 0b10000000 # RS = Command/data - # If string or list, iterate through a write iteration + # If string or list, iterate through multiple write ops if isinstance(value, str): for v in value: b = self.out4(a, ord(v)) elif isinstance(value, list): @@ -190,13 +210,19 @@ def write4(self, value, char_mode=False): else: b = self.out4(a, value) - # Change data pins back to inputs - self.mcp.i2c.bus.write_byte_data( - self.mcp.i2c.address, self.mcp.MCP23017_IODIRB, save) - # And update mcp outputvalue state to reflect changes here - self.mcp.outputvalue = (self.mcp.outputvalue & 0x00FF) | (b << 8) + # If a poll-worthy instruction was issued, reconfigure + # data pins as inputs and set flag to poll on next call. + if (not char_mode) and (value in self.pollables): + self.mcp.i2c.bus.write_byte_data( + self.mcp.i2c.address, self.mcp.MCP23017_IODIRB, save) + # Update mcp outputvalue state to reflect changes here + self.mcp.outputvalue = (self.mcp.outputvalue & 0x00FF) | (b << 8) + self.pollflag = True + # ---------------------------------------------------------------------- + # Utility methods + def begin(self, cols, lines): self.currline = 0 self.numlines = lines @@ -204,117 +230,117 @@ def begin(self, cols, lines): def clear(self): - self.write4(self.LCD_CLEARDISPLAY) + self.write(self.LCD_CLEARDISPLAY) def home(self): - self.write4(self.LCD_RETURNHOME) + self.write(self.LCD_RETURNHOME) row_offsets = ( 0x00, 0x40, 0x14, 0x54 ) def setCursor(self, col, row): if row > self.numlines: row = self.numlines - 1 elif row < 0: row = 0 - self.write4(self.LCD_SETDDRAMADDR | (col + self.row_offsets[row])) + self.write(self.LCD_SETDDRAMADDR | (col + self.row_offsets[row])) def display(self): """ Turn the display on (quickly) """ self.displaycontrol |= self.LCD_DISPLAYON - self.write4(self.LCD_DISPLAYCONTROL | self.displaycontrol) + self.write(self.LCD_DISPLAYCONTROL | self.displaycontrol) def noDisplay(self): """ Turn the display off (quickly) """ self.displaycontrol &= ~self.LCD_DISPLAYON - self.write4(self.LCD_DISPLAYCONTROL | self.displaycontrol) + self.write(self.LCD_DISPLAYCONTROL | self.displaycontrol) def cursor(self): """ Underline cursor on """ self.displaycontrol |= self.LCD_CURSORON - self.write4(self.LCD_DISPLAYCONTROL | self.displaycontrol) + self.write(self.LCD_DISPLAYCONTROL | self.displaycontrol) def noCursor(self): """ Underline cursor off """ self.displaycontrol &= ~self.LCD_CURSORON - self.write4(self.LCD_DISPLAYCONTROL | self.displaycontrol) + self.write(self.LCD_DISPLAYCONTROL | self.displaycontrol) def ToggleCursor(self): """ Toggles the underline cursor On/Off """ self.displaycontrol ^= self.LCD_CURSORON - self.write4(self.LCD_DISPLAYCONTROL | self.displaycontrol) + self.write(self.LCD_DISPLAYCONTROL | self.displaycontrol) def blink(self): """ Turn on the blinking cursor """ self.displaycontrol |= self.LCD_BLINKON - self.write4(self.LCD_DISPLAYCONTROL | self.displaycontrol) + self.write(self.LCD_DISPLAYCONTROL | self.displaycontrol) def noBlink(self): """ Turn off the blinking cursor """ self.displaycontrol &= ~self.LCD_BLINKON - self.write4(self.LCD_DISPLAYCONTROL | self.displaycontrol) + self.write(self.LCD_DISPLAYCONTROL | self.displaycontrol) def ToggleBlink(self): """ Toggles the blinking cursor """ self.displaycontrol ^= self.LCD_BLINKON - self.write4(self.LCD_DISPLAYCONTROL | self.displaycontrol) + self.write(self.LCD_DISPLAYCONTROL | self.displaycontrol) def DisplayLeft(self): """ These commands scroll the display without changing the RAM """ self.displayshift = self.LCD_DISPLAYMODE | self.LCD_MOVELEFT - self.write4(self.LCD_CURSORSHIFT | self.displayshift) + self.write(self.LCD_CURSORSHIFT | self.displayshift) def scrollDisplayRight(self): """ These commands scroll the display without changing the RAM """ self.displayshift = self.LCD_DISPLAYMOVE | self.LCD_MOVERIGHT - self.write4(self.LCD_CURSORSHIFT | self.displayshift) + self.write(self.LCD_CURSORSHIFT | self.displayshift) def leftToRight(self): """ This is for text that flows left to right """ self.displaymode |= self.LCD_ENTRYLEFT - self.write4(self.LCD_ENTRYMODESET | self.displaymode) + self.write(self.LCD_ENTRYMODESET | self.displaymode) def rightToLeft(self): """ This is for text that flows right to left """ self.displaymode &= ~self.LCD_ENTRYLEFT - self.write4(self.LCD_ENTRYMODESET | self.displaymode) + self.write(self.LCD_ENTRYMODESET | self.displaymode) def autoscroll(self): """ This will 'right justify' text from the cursor """ self.displaymode |= self.LCD_ENTRYSHIFTINCREMENT - self.write4(self.LCD_ENTRYMODESET | self.displaymode) + self.write(self.LCD_ENTRYMODESET | self.displaymode) def noAutoscroll(self): """ This will 'left justify' text from the cursor """ self.displaymode &= ~self.LCD_ENTRYSHIFTINCREMENT - self.write4(self.LCD_ENTRYMODESET | self.displaymode) + self.write(self.LCD_ENTRYMODESET | self.displaymode) def createChar(self, location, bitmap): - self.write4(self.LCD_SETCGRAMADDR | ((location & 7) << 3)) - self.write4(bitmap, True) - self.write4(self.LCD_SETDDRAMADDR) + self.write(self.LCD_SETCGRAMADDR | ((location & 7) << 3)) + self.write(bitmap, True) + self.write(self.LCD_SETDDRAMADDR) def message(self, text): """ Send string to LCD. Newline wraps to second line""" - lines = text.split('\n') # Split at newline(s) - for line in lines: # Render each substring... - self.write4(line, True) - if len(lines) > 1: # If newline(s), - self.write4(0xC0) # set DDRAM address to second line + lines = text.split('\n') # Split at newline(s) + for line in lines: # Render each substring... + self.write(line, True) + if len(lines) > 1: # If newline(s), + self.write(0xC0) # set DDRAM address to second line def backlight(self, color): @@ -330,6 +356,9 @@ def buttonPressed(self, b): return not self.mcp.input(b) if 0 <= b <= self.LEFT else False + # ---------------------------------------------------------------------- + # Test code + if __name__ == '__main__': from time import sleep From 508df28ecc5211326601a22831d353e69d6fbf54 Mon Sep 17 00:00:00 2001 From: Phillip Burgess Date: Wed, 13 Mar 2013 18:22:43 -0700 Subject: [PATCH 12/79] Eliminated separate poll flag and partial strobe op. --- .../Adafruit_CharLCDPlate.py | 37 +++++++++---------- 1 file changed, 17 insertions(+), 20 deletions(-) diff --git a/Adafruit_CharLCDPlate/Adafruit_CharLCDPlate.py b/Adafruit_CharLCDPlate/Adafruit_CharLCDPlate.py index 9b0a1cd6..83dbfdda 100644 --- a/Adafruit_CharLCDPlate/Adafruit_CharLCDPlate.py +++ b/Adafruit_CharLCDPlate/Adafruit_CharLCDPlate.py @@ -123,10 +123,8 @@ def out4(self, bitmask, value): self.mcp.i2c.address, self.mcp.MCP23017_OLATB, b | 0b00100000) # There's no need for delay calls when strobing, as the limited # I2C throughput already ensures the strobe is held long enough. - # Strobe low (!enable) - self.mcp.i2c.bus.write_byte_data( - self.mcp.i2c.address, self.mcp.MCP23017_OLATB, b) b = bitmask | self.flip[value & 0x0F] # Insert low 4 bits + # This also does strobe low (!enable) for prior nybble self.mcp.i2c.bus.write_byte_data( self.mcp.i2c.address, self.mcp.MCP23017_OLATB, b) self.mcp.i2c.bus.write_byte_data( @@ -142,12 +140,12 @@ def out4(self, bitmask, value): # can't even be twiddled that fast through I2C, so it's a safe bet # with these instructions to not waste time polling (which requires # several I2C transfers for reconfiguring the port direction). - # 'pollflag' is set when a potentially time-consuming instruction - # has been issued (e.g. screen clear), as well as on startup, and - # polling will then occur before more commands or data are issued. + # I/O pins are set as inputs when a potentially time-consuming + # instruction has been issued (e.g. screen clear), as well as on + # startup, and polling will then occur before more commands or data + # are issued. pollables = ( LCD_CLEARDISPLAY, LCD_RETURNHOME ) - pollflag = True # Write 8-bit value to LCD def write(self, value, char_mode=False): @@ -167,10 +165,8 @@ def write(self, value, char_mode=False): # LCD pin E = MCP pin 13 (PORTB5) Strobe # LCD D4...D7 = MCP 12...9 (PORTB4...1) Data (see notes later) - # If pollflag is set, poll LCD busy state until clear. Data - # pins were previously set as inputs, no need to reconfigure - # I/O yet. - if self.pollflag: + # If I/O pins are in input state, poll LCD busy flag until clear. + if self.mcp.direction & 0b0001111000000000 > 0: # Current PORTB pin state RS=0 RW=1 a = ((self.mcp.outputvalue >> 8) & 0b00000001) | 0b01000000 b = a | 0b00100000 # E=1 @@ -194,9 +190,9 @@ def write(self, value, char_mode=False): self.mcp.i2c.address, self.mcp.MCP23017_OLATB, a) # Polling complete, change data pins to outputs - save = self.mcp.direction >> 8 # PORTB - self.mcp.i2c.bus.write_byte_data( - self.mcp.i2c.address, self.mcp.MCP23017_IODIRB, save&0b11100001) + self.mcp.direction &= 0b1110000111111111 + self.mcp.i2c.bus.write_byte_data(self.mcp.i2c.address, + self.mcp.MCP23017_IODIRB, self.mcp.direction >> 8) # Mask out data bits & RW from current OLATB value a = ((self.mcp.outputvalue >> 8) & 0b00000001) @@ -210,14 +206,15 @@ def write(self, value, char_mode=False): else: b = self.out4(a, value) + # Update mcp outputvalue state to reflect changes here + self.mcp.outputvalue = (self.mcp.outputvalue & 0x00FF) | (b << 8) + # If a poll-worthy instruction was issued, reconfigure - # data pins as inputs and set flag to poll on next call. + # data pins as inputs to indicate need for poll on next call. if (not char_mode) and (value in self.pollables): - self.mcp.i2c.bus.write_byte_data( - self.mcp.i2c.address, self.mcp.MCP23017_IODIRB, save) - # Update mcp outputvalue state to reflect changes here - self.mcp.outputvalue = (self.mcp.outputvalue & 0x00FF) | (b << 8) - self.pollflag = True + self.mcp.direction |= 0b0001111000000000 + self.mcp.i2c.bus.write_byte_data(self.mcp.i2c.address, + self.mcp.MCP23017_IODIRB, self.mcp.direction >> 8) # ---------------------------------------------------------------------- From 894c16c5fd48e31e4162a798be4cbd7e32aefeeb Mon Sep 17 00:00:00 2001 From: Phillip Burgess Date: Wed, 13 Mar 2013 20:52:49 -0700 Subject: [PATCH 13/79] Bugfixlet --- Adafruit_CharLCDPlate/Adafruit_CharLCDPlate.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Adafruit_CharLCDPlate/Adafruit_CharLCDPlate.py b/Adafruit_CharLCDPlate/Adafruit_CharLCDPlate.py index 83dbfdda..38f919c0 100644 --- a/Adafruit_CharLCDPlate/Adafruit_CharLCDPlate.py +++ b/Adafruit_CharLCDPlate/Adafruit_CharLCDPlate.py @@ -116,8 +116,9 @@ def __init__(self, busnum=-1, addr=0x20, debug=False): def out4(self, bitmask, value): b = bitmask | self.flip[value >> 4] # Insert high 4 bits of data # Write initial !E state, data is sampled on rising strobe edge - self.mcp.i2c.bus.write_byte_data( - self.mcp.i2c.address, self.mcp.MCP23017_OLATB, b) +# Commented out, seems to be OK setting & strobing at same time +# self.mcp.i2c.bus.write_byte_data( +# self.mcp.i2c.address, self.mcp.MCP23017_OLATB, b) # Strobe high (enable) self.mcp.i2c.bus.write_byte_data( self.mcp.i2c.address, self.mcp.MCP23017_OLATB, b | 0b00100000) @@ -197,6 +198,7 @@ def write(self, value, char_mode=False): # Mask out data bits & RW from current OLATB value a = ((self.mcp.outputvalue >> 8) & 0b00000001) if char_mode: a |= 0b10000000 # RS = Command/data + b = a # If string or list, iterate through multiple write ops if isinstance(value, str): From 8d720ef5d5fa52c81728011e583f9d22573e41aa Mon Sep 17 00:00:00 2001 From: Phillip Burgess Date: Sat, 16 Mar 2013 21:36:06 -0700 Subject: [PATCH 14/79] CharLCDPlate subclass I2C directly, not MCP230XX; quicker --- .../Adafruit_CharLCDPlate.py | 245 ++++++++++-------- Adafruit_CharLCDPlate/LCDtest.py | 81 ++---- 2 files changed, 168 insertions(+), 158 deletions(-) diff --git a/Adafruit_CharLCDPlate/Adafruit_CharLCDPlate.py b/Adafruit_CharLCDPlate/Adafruit_CharLCDPlate.py index 38f919c0..622946d0 100644 --- a/Adafruit_CharLCDPlate/Adafruit_CharLCDPlate.py +++ b/Adafruit_CharLCDPlate/Adafruit_CharLCDPlate.py @@ -1,16 +1,29 @@ #!/usr/bin/python -# Based on code from lrvick and LiquidCrystal +# Python library for Adafruit RGB-backlit LCD plate for Raspberry Pi. +# Written by Adafruit Industries. MIT license. + +# This is essentially a complete rewrite, but the calling syntax +# and constants are based on code from lrvick and LiquidCrystal. # lrvic - https://github.com/lrvick/raspi-hd44780/blob/master/hd44780.py # LiquidCrystal - https://github.com/arduino/Arduino/blob/master/libraries/LiquidCrystal/LiquidCrystal.cpp -from Adafruit_MCP230xx import Adafruit_MCP230XX +from Adafruit_I2C import Adafruit_I2C + -class Adafruit_CharLCDPlate(Adafruit_MCP230XX): +class Adafruit_CharLCDPlate(Adafruit_I2C): # ---------------------------------------------------------------------- # Constants + # Port expander registers + MCP23017_IOCON_BANK0 = 0x0A # IOCON when Bank 0 active + MCP23017_IOCON_BANK1 = 0x05 # IOCON when Bank 1 active + # These are register addresses when in Bank 1 only: + MCP23017_GPIOA = 0x09 + MCP23017_IODIRB = 0x10 + MCP23017_GPIOB = 0x19 + # Port expander input pin definitions SELECT = 0 RIGHT = 1 @@ -65,23 +78,55 @@ class Adafruit_CharLCDPlate(Adafruit_MCP230XX): def __init__(self, busnum=-1, addr=0x20, debug=False): - self.mcp = Adafruit_MCP230XX(addr, 16, busnum, debug) - - for i in range(0,16): - if i < 6: - # Configure button lines as inputs w/pullups - self.mcp.config(i, Adafruit_MCP230XX.INPUT) - self.mcp.pullup(i, True) - elif 9 <= i <= 12: - # Configure LCD data lines as inputs w/o pullups - self.mcp.config(i, Adafruit_MCP230XX.INPUT) - self.mcp.pullup(i, False) - else: - # All other lines are outputs - self.mcp.config(i, Adafruit_MCP230XX.OUTPUT) - - # Init control lines, backlight on (white) - self.mcp.outputAll(0) + self.i2c = Adafruit_I2C(addr, busnum, debug) + + # I2C is relatively slow. MCP output port states are cached + # so we don't need to constantly poll-and-change bit states. + self.porta, self.portb, self.ddrb = 0, 0, 0b00010000 + + # Set MCP23017 IOCON register to Bank 0 with sequential operation. + # If chip is already set for Bank 0, this will just write to OLATB, + # which won't seriously bother anything on the plate right now + # (blue backlight LED will come on, but that's done in the next + # step anyway). + self.i2c.bus.write_byte_data( + self.i2c.address, self.MCP23017_IOCON_BANK1, 0) + + # Brute force reload ALL registers to known state. This also + # sets up all the input pins, pull-ups, etc. for the Pi Plate. + self.i2c.bus.write_i2c_block_data( + self.i2c.address, 0, + [ 0b00111111, # IODIRA R+G LEDs=outputs, buttons=inputs + self.ddrb , # IODIRB LCD D7=input, Blue LED=output + 0b00111111, # IPOLA Invert polarity on button inputs + 0b00000000, # IPOLB + 0b00000000, # GPINTENA Disable interrupt-on-change + 0b00000000, # GPINTENB + 0b00000000, # DEFVALA + 0b00000000, # DEFVALB + 0b00000000, # INTCONA + 0b00000000, # INTCONB + 0b00000000, # IOCON + 0b00000000, # IOCON + 0b00111111, # GPPUA Enable pull-ups on buttons + 0b00000000, # GPPUB + 0b00000000, # INTFA + 0b00000000, # INTFB + 0b00000000, # INTCAPA + 0b00000000, # INTCAPB + self.porta, # GPIOA + self.portb, # GPIOB + self.porta, # OLATA 0 on all outputs; side effect of + self.portb ]) # OLATB turning on R+G+B backlight LEDs. + + # Switch to Bank 1 and disable sequential operation. + # From this point forward, the register addresses do NOT match + # the list immediately above. Instead, use the constants defined + # at the start of the class. Also, the address register will no + # longer increment automatically after this -- multi-byte + # operations must be broken down into single-byte calls. + self.i2c.bus.write_byte_data( + self.i2c.address, self.MCP23017_IOCON_BANK0, 0b10100000) self.displayshift = (self.LCD_CURSORMOVE | self.LCD_MOVERIGHT) @@ -90,6 +135,7 @@ def __init__(self, busnum=-1, addr=0x20, debug=False): self.displaycontrol = (self.LCD_DISPLAYON | self.LCD_CURSOROFF | self.LCD_BLINKOFF) + self.write(0x33) # Init self.write(0x32) # Init self.write(0x28) # 2 line 5x8 matrix @@ -112,27 +158,15 @@ def __init__(self, busnum=-1, addr=0x20, debug=False): 0b00000010, 0b00010010, 0b00001010, 0b00011010, 0b00000110, 0b00010110, 0b00001110, 0b00011110 ) - # Low-level 4 bit output interface + # Low-level 4-bit interface for LCD output. This doesn't actually + # write data, just returns a byte array of the PORTB state over time. + # Can concatenate the output of multiple calls (up to 8) for more + # efficient batch write. def out4(self, bitmask, value): - b = bitmask | self.flip[value >> 4] # Insert high 4 bits of data - # Write initial !E state, data is sampled on rising strobe edge -# Commented out, seems to be OK setting & strobing at same time -# self.mcp.i2c.bus.write_byte_data( -# self.mcp.i2c.address, self.mcp.MCP23017_OLATB, b) - # Strobe high (enable) - self.mcp.i2c.bus.write_byte_data( - self.mcp.i2c.address, self.mcp.MCP23017_OLATB, b | 0b00100000) - # There's no need for delay calls when strobing, as the limited - # I2C throughput already ensures the strobe is held long enough. - b = bitmask | self.flip[value & 0x0F] # Insert low 4 bits - # This also does strobe low (!enable) for prior nybble - self.mcp.i2c.bus.write_byte_data( - self.mcp.i2c.address, self.mcp.MCP23017_OLATB, b) - self.mcp.i2c.bus.write_byte_data( - self.mcp.i2c.address, self.mcp.MCP23017_OLATB, b | 0b00100000) - self.mcp.i2c.bus.write_byte_data( - self.mcp.i2c.address, self.mcp.MCP23017_OLATB, b) - return b # Last port state + hi = bitmask | self.flip[value >> 4] + lo = bitmask | self.flip[value & 0x0F] + return [hi | 0b00100000, hi, lo | 0b00100000, lo] + # The speed of LCD accesses is inherently limited by I2C through the # port expander. A 'well behaved program' is expected to poll the @@ -141,82 +175,83 @@ def out4(self, bitmask, value): # can't even be twiddled that fast through I2C, so it's a safe bet # with these instructions to not waste time polling (which requires # several I2C transfers for reconfiguring the port direction). - # I/O pins are set as inputs when a potentially time-consuming + # The D7 pin is set as input when a potentially time-consuming # instruction has been issued (e.g. screen clear), as well as on # startup, and polling will then occur before more commands or data # are issued. pollables = ( LCD_CLEARDISPLAY, LCD_RETURNHOME ) - # Write 8-bit value to LCD + # Write byte, list or string value to LCD def write(self, value, char_mode=False): """ Send command/data to LCD """ - # The following code does not invoke the base class methods that - # handle I/O exceptions. Instead, the underlying smbus calls are - # invoked directly for expediency, the expectation being that any - # I2C access or address type errors have already been identified - # during initialization. - - # The LCD control lines are all on MCP PORTB, so I2C byte ops - # on that single port (rather than word ops on both PORTA and - # PORTB together) are used here to save some bandwidth. - # LCD pin RS = MCP pin 15 (PORTB7) Command/data - # LCD pin RW = MCP pin 14 (PORTB6) Read/write - # LCD pin E = MCP pin 13 (PORTB5) Strobe - # LCD D4...D7 = MCP 12...9 (PORTB4...1) Data (see notes later) - - # If I/O pins are in input state, poll LCD busy flag until clear. - if self.mcp.direction & 0b0001111000000000 > 0: - # Current PORTB pin state RS=0 RW=1 - a = ((self.mcp.outputvalue >> 8) & 0b00000001) | 0b01000000 - b = a | 0b00100000 # E=1 - self.mcp.i2c.bus.write_byte_data( - self.mcp.i2c.address, self.mcp.MCP23017_OLATB, a) + # If pin D7 is in input state, poll LCD busy flag until clear. + if self.ddrb & 0b00010000: + lo = (self.portb & 0b00000001) | 0b01000000 + hi = lo | 0b00100000 # E=1 (strobe) + self.i2c.bus.write_byte_data( + self.i2c.address, self.MCP23017_GPIOB, lo) while True: # Strobe high (enable) - self.mcp.i2c.bus.write_byte_data( - self.mcp.i2c.address, self.mcp.MCP23017_OLATB, b) + self.i2c.bus.write_byte(self.i2c.address, hi) # First nybble contains busy state - bits = self.mcp.i2c.bus.read_byte_data( - self.mcp.i2c.address, self.mcp.MCP23017_GPIOB) - # Strobe low (!enable) - self.mcp.i2c.bus.write_byte_data( - self.mcp.i2c.address, self.mcp.MCP23017_OLATB, a) + bits = self.i2c.bus.read_byte(self.i2c.address) + # Strobe low, high, low. Second nybble (A3) is ignored. + self.i2c.bus.write_i2c_block_data( + self.i2c.address, self.MCP23017_GPIOB, [lo, hi, lo]) if (bits & 0b00000010) == 0: break # D7=0, not busy - # Ignore second nybble - self.mcp.i2c.bus.write_byte_data( - self.mcp.i2c.address, self.mcp.MCP23017_OLATB, b) - self.mcp.i2c.bus.write_byte_data( - self.mcp.i2c.address, self.mcp.MCP23017_OLATB, a) - - # Polling complete, change data pins to outputs - self.mcp.direction &= 0b1110000111111111 - self.mcp.i2c.bus.write_byte_data(self.mcp.i2c.address, - self.mcp.MCP23017_IODIRB, self.mcp.direction >> 8) - - # Mask out data bits & RW from current OLATB value - a = ((self.mcp.outputvalue >> 8) & 0b00000001) - if char_mode: a |= 0b10000000 # RS = Command/data - b = a + self.portb = lo + + # Polling complete, change D7 pin to output + self.ddrb &= 0b11101111 + self.i2c.bus.write_byte_data(self.i2c.address, + self.MCP23017_IODIRB, self.ddrb) + + bitmask = self.portb & 0b00000001 # Mask out PORTB LCD control bits + if char_mode: bitmask |= 0b10000000 # Set data bit if not a command # If string or list, iterate through multiple write ops if isinstance(value, str): - for v in value: b = self.out4(a, ord(v)) + last = len(value) - 1 # Last character in string + data = [] # Start with blank list + for i, v in enumerate(value): # For each character... + # Append 4 bytes to list representing PORTB over time. + # First the high 4 data bits with strobe (enable) set + # and unset, then same with low 4 data bits (strobe 1/0). + data.extend(self.out4(bitmask, ord(v))) + # I2C block data write is limited to 32 bytes max. + # If limit reached, write data so far and clear. + # Also do this on last byte if not otherwise handled. + if (len(data) >= 32) or (i == last): + self.i2c.bus.write_i2c_block_data( + self.i2c.address, self.MCP23017_GPIOB, data) + self.portb = data[-1] # Save state of last byte out + data = [] # Clear list for next iteration elif isinstance(value, list): - for v in value: b = self.out4(a, v) + # Same as above, but for list instead of string + last = len(value) - 1 + data = [] + for i, v in enumerate(value): + data.extend(self.out4(bitmask, v)) + if (len(data) >= 32) or (i == last): + self.i2c.bus.write_i2c_block_data( + self.i2c.address, self.MCP23017_GPIOB, data) + self.portb = data[-1] + data = [] else: - b = self.out4(a, value) - - # Update mcp outputvalue state to reflect changes here - self.mcp.outputvalue = (self.mcp.outputvalue & 0x00FF) | (b << 8) - - # If a poll-worthy instruction was issued, reconfigure - # data pins as inputs to indicate need for poll on next call. + # Single byte + data = self.out4(bitmask, value) + self.i2c.bus.write_i2c_block_data( + self.i2c.address, self.MCP23017_GPIOB, data) + self.portb = data[-1] + + # If a poll-worthy instruction was issued, reconfigure D7 + # pin as input to indicate need for polling on next call. if (not char_mode) and (value in self.pollables): - self.mcp.direction |= 0b0001111000000000 - self.mcp.i2c.bus.write_byte_data(self.mcp.i2c.address, - self.mcp.MCP23017_IODIRB, self.mcp.direction >> 8) + self.ddrb |= 0b00010000 + self.i2c.bus.write_byte_data(self.i2c.address, + self.MCP23017_IODIRB, self.ddrb) # ---------------------------------------------------------------------- @@ -343,16 +378,18 @@ def message(self, text): def backlight(self, color): - n = ((self.mcp.outputvalue & 0b1111111000111111) | - (((~color) & 0b111) << 6)) - # Direct smbus call so everything toggles together - self.mcp.i2c.bus.write_word_data( - self.mcp.i2c.address, self.mcp.MCP23017_OLATA, n) - self.mcp.outputvalue = n + c = ~color + self.porta = (self.porta & 0b00111111) | ((c & 0b011) << 6) + self.portb = (self.portb & 0b11111110) | ((c & 0b100) >> 2) + # Has to be done as two writes because sequential operation is off. + self.i2c.bus.write_byte_data( + self.i2c.address, self.MCP23017_GPIOA, self.porta) + self.i2c.bus.write_byte_data( + self.i2c.address, self.MCP23017_GPIOB, self.portb) def buttonPressed(self, b): - return not self.mcp.input(b) if 0 <= b <= self.LEFT else False + return (self.i2c.readU8(self.MCP23017_GPIOA) >> b) & 1 # ---------------------------------------------------------------------- diff --git a/Adafruit_CharLCDPlate/LCDtest.py b/Adafruit_CharLCDPlate/LCDtest.py index 3f6177ee..cbda5c2c 100644 --- a/Adafruit_CharLCDPlate/LCDtest.py +++ b/Adafruit_CharLCDPlate/LCDtest.py @@ -1,64 +1,37 @@ #!/usr/bin/python from time import sleep -from Adafruit_I2C import Adafruit_I2C -from Adafruit_MCP230xx import Adafruit_MCP230XX from Adafruit_CharLCDPlate import Adafruit_CharLCDPlate -import smbus +# Initialize the LCD plate. Should auto-detect correct I2C bus. If not, +# pass '0' for early 256 MB Model B boards or '1' for all later versions +lcd = Adafruit_CharLCDPlate() - -# initialize the LCD plate -# use busnum = 0 for raspi version 1 (256MB) and busnum = 1 for version 2 -lcd = Adafruit_CharLCDPlate(busnum = 0) - -# clear display +# Clear display and show greeting, pause 1 sec lcd.clear() -# hello! lcd.message("Adafruit RGB LCD\nPlate w/Keypad!") sleep(1) -# first loop, just changes the color -lcd.backlight(lcd.RED) -sleep(.5) -lcd.backlight(lcd.YELLOW) -sleep(.5) -lcd.backlight(lcd.GREEN) -sleep(.5) -lcd.backlight(lcd.TEAL) -sleep(.5) -lcd.backlight(lcd.BLUE) -sleep(.5) -lcd.backlight(lcd.VIOLET) -sleep(.5) -lcd.backlight(lcd.ON) -sleep(.5) -lcd.backlight(lcd.OFF) -sleep(.5) - -while 1: - if (lcd.buttonPressed(lcd.LEFT)): - lcd.clear() - lcd.message("Red Red Wine") - lcd.backlight(lcd.RED) - - if (lcd.buttonPressed(lcd.UP)): - lcd.clear() - lcd.message("Sita Sings \nthe blues") - lcd.backlight(lcd.BLUE) - - if (lcd.buttonPressed(lcd.DOWN)): - lcd.clear() - lcd.message("I see fields\nof green"); - lcd.backlight(lcd.GREEN) - - if (lcd.buttonPressed(lcd.RIGHT)): - lcd.clear() - lcd.message("Purple mountain\n majesties"); - lcd.backlight(lcd.VIOLET) - - if (lcd.buttonPressed(lcd.SELECT)): - lcd.clear() - lcd.backlight(lcd.ON) - - +# Cycle through backlight colors +col = (lcd.RED , lcd.YELLOW, lcd.GREEN, lcd.TEAL, + lcd.BLUE, lcd.VIOLET, lcd.ON , lcd.OFF) +for c in col: + lcd.backlight(c) + sleep(.5) + +# Poll buttons, display message & set backlight accordingly +btn = ((lcd.LEFT , 'Red Red Wine' , lcd.RED), + (lcd.UP , 'Sita sings\nthe blues' , lcd.BLUE), + (lcd.DOWN , 'I see fields\nof green' , lcd.GREEN), + (lcd.RIGHT , 'Purple mountain\nmajesties', lcd.VIOLET), + (lcd.SELECT, '' , lcd.ON)) +prev = -1 +while True: + for b in btn: + if lcd.buttonPressed(b[0]): + if b is not prev: + lcd.clear() + lcd.message(b[1]) + lcd.backlight(b[2]) + prev = b + break From 853a344c9e521c0bdd0ca54ea3c45b3af72e0309 Mon Sep 17 00:00:00 2001 From: Phillip Burgess Date: Sun, 17 Mar 2013 10:24:48 -0700 Subject: [PATCH 15/79] Added stop() method to CharLCDPlate --- .../Adafruit_CharLCDPlate.py | 42 +++++++++++++++++-- 1 file changed, 38 insertions(+), 4 deletions(-) diff --git a/Adafruit_CharLCDPlate/Adafruit_CharLCDPlate.py b/Adafruit_CharLCDPlate/Adafruit_CharLCDPlate.py index 622946d0..9a4b8984 100644 --- a/Adafruit_CharLCDPlate/Adafruit_CharLCDPlate.py +++ b/Adafruit_CharLCDPlate/Adafruit_CharLCDPlate.py @@ -9,7 +9,7 @@ # LiquidCrystal - https://github.com/arduino/Arduino/blob/master/libraries/LiquidCrystal/LiquidCrystal.cpp from Adafruit_I2C import Adafruit_I2C - +from time import sleep class Adafruit_CharLCDPlate(Adafruit_I2C): @@ -18,7 +18,7 @@ class Adafruit_CharLCDPlate(Adafruit_I2C): # Port expander registers MCP23017_IOCON_BANK0 = 0x0A # IOCON when Bank 0 active - MCP23017_IOCON_BANK1 = 0x05 # IOCON when Bank 1 active + MCP23017_IOCON_BANK1 = 0x15 # IOCON when Bank 1 active # These are register addresses when in Bank 1 only: MCP23017_GPIOA = 0x09 MCP23017_IODIRB = 0x10 @@ -263,6 +263,42 @@ def begin(self, cols, lines): self.clear() + # Puts the MCP23017 back in Bank 0 + sequential write mode so + # that other code using the 'classic' library can still work. + # Any code using this newer version of the library should + # consider adding an atexit() handler that calls this. + def stop(self): + self.porta = 0b11000000 # Turn off LEDs on the way out + self.portb = 0b00000001 + sleep(0.0015) + self.i2c.bus.write_byte_data( + self.i2c.address, self.MCP23017_IOCON_BANK1, 0) + self.i2c.bus.write_i2c_block_data( + self.i2c.address, 0, + [ 0b00111111, # IODIRA + self.ddrb , # IODIRB + 0b00000000, # IPOLA + 0b00000000, # IPOLB + 0b00000000, # GPINTENA + 0b00000000, # GPINTENB + 0b00000000, # DEFVALA + 0b00000000, # DEFVALB + 0b00000000, # INTCONA + 0b00000000, # INTCONB + 0b00000000, # IOCON + 0b00000000, # IOCON + 0b00111111, # GPPUA + 0b00000000, # GPPUB + 0b00000000, # INTFA + 0b00000000, # INTFB + 0b00000000, # INTCAPA + 0b00000000, # INTCAPB + self.porta, # GPIOA + self.portb, # GPIOB + self.porta, # OLATA + self.portb ]) # OLATB + + def clear(self): self.write(self.LCD_CLEARDISPLAY) @@ -397,8 +433,6 @@ def buttonPressed(self, b): if __name__ == '__main__': - from time import sleep - lcd = Adafruit_CharLCDPlate() lcd.begin(16, 2) lcd.clear() From b1afed2cada776412a298adddc460cf71a8b5c51 Mon Sep 17 00:00:00 2001 From: Phillip Burgess Date: Tue, 19 Mar 2013 09:01:19 -0700 Subject: [PATCH 16/79] Added buttons() method -- polls all buttons, returns bitmask --- Adafruit_CharLCDPlate/Adafruit_CharLCDPlate.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Adafruit_CharLCDPlate/Adafruit_CharLCDPlate.py b/Adafruit_CharLCDPlate/Adafruit_CharLCDPlate.py index 9a4b8984..28cd3535 100644 --- a/Adafruit_CharLCDPlate/Adafruit_CharLCDPlate.py +++ b/Adafruit_CharLCDPlate/Adafruit_CharLCDPlate.py @@ -424,10 +424,16 @@ def backlight(self, color): self.i2c.address, self.MCP23017_GPIOB, self.portb) + # Read state of single button def buttonPressed(self, b): return (self.i2c.readU8(self.MCP23017_GPIOA) >> b) & 1 + # Read and return bitmask of combined button state + def buttons(self): + return self.i2c.readU8(self.MCP23017_GPIOA) & 0b11111 + + # ---------------------------------------------------------------------- # Test code From 660dcc570d9d62a69f70013d3ca087a654e5b4e1 Mon Sep 17 00:00:00 2001 From: Phillip Burgess Date: Thu, 21 Mar 2013 11:10:52 -0700 Subject: [PATCH 17/79] Fixed lcd.message() in CharLCDPlate for non-string types --- Adafruit_CharLCDPlate/Adafruit_CharLCDPlate.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Adafruit_CharLCDPlate/Adafruit_CharLCDPlate.py b/Adafruit_CharLCDPlate/Adafruit_CharLCDPlate.py index 28cd3535..8c742673 100644 --- a/Adafruit_CharLCDPlate/Adafruit_CharLCDPlate.py +++ b/Adafruit_CharLCDPlate/Adafruit_CharLCDPlate.py @@ -406,11 +406,11 @@ def createChar(self, location, bitmap): def message(self, text): """ Send string to LCD. Newline wraps to second line""" - lines = text.split('\n') # Split at newline(s) - for line in lines: # Render each substring... - self.write(line, True) - if len(lines) > 1: # If newline(s), - self.write(0xC0) # set DDRAM address to second line + lines = str(text).split('\n') # Split at newline(s) + for i, line in enumerate(lines): # For each substring... + if i > 0: # If newline(s), + self.write(0xC0) # set DDRAM address to 2nd line + self.write(line, True) # Issue substring def backlight(self, color): From ae10bfbc829cc750034845b9948ea83a55bace3e Mon Sep 17 00:00:00 2001 From: Phillip Burgess Date: Fri, 22 Mar 2013 22:32:43 -0700 Subject: [PATCH 18/79] Added LSM303 library (adapted from Arduino version) --- Adafruit_LSM303/Adafruit_I2C.py | 1 + Adafruit_LSM303/Adafruit_LSM303.py | 122 +++++++++++++++++++++++++++++ 2 files changed, 123 insertions(+) create mode 120000 Adafruit_LSM303/Adafruit_I2C.py create mode 100755 Adafruit_LSM303/Adafruit_LSM303.py diff --git a/Adafruit_LSM303/Adafruit_I2C.py b/Adafruit_LSM303/Adafruit_I2C.py new file mode 120000 index 00000000..77f06164 --- /dev/null +++ b/Adafruit_LSM303/Adafruit_I2C.py @@ -0,0 +1 @@ +../Adafruit_I2C/Adafruit_I2C.py \ No newline at end of file diff --git a/Adafruit_LSM303/Adafruit_LSM303.py b/Adafruit_LSM303/Adafruit_LSM303.py new file mode 100755 index 00000000..9af1e83a --- /dev/null +++ b/Adafruit_LSM303/Adafruit_LSM303.py @@ -0,0 +1,122 @@ +#!/usr/bin/python + +# Python library for Adafruit Flora Accelerometer/Compass Sensor (LSM303). +# This is pretty much a direct port of the current Arduino library and is +# similarly incomplete (e.g. no orientation value returned from read() +# method). This does add optional high resolution mode to accelerometer +# though. + +# Copyright 2013 Adafruit Industries + +# Permission is hereby granted, free of charge, to any person obtaining a +# copy of this software and associated documentation files (the "Software"), +# to deal in the Software without restriction, including without limitation +# the rights to use, copy, modify, merge, publish, distribute, sublicense, +# and/or sell copies of the Software, and to permit persons to whom the +# Software is furnished to do so, subject to the following conditions: + +# The above copyright notice and this permission notice shall be included +# in all copies or substantial portions of the Software. + +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION 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 Adafruit_I2C import Adafruit_I2C + + +class Adafruit_LSM303(Adafruit_I2C): + + # Minimal constants carried over from Arduino library + LSM303_ADDRESS_ACCEL = (0x32 >> 1) # 0011001x + LSM303_ADDRESS_MAG = (0x3C >> 1) # 0011110x + # Default Type + LSM303_REGISTER_ACCEL_CTRL_REG1_A = 0x20 # 00000111 rw + LSM303_REGISTER_ACCEL_CTRL_REG4_A = 0x23 # 00000000 rw + LSM303_REGISTER_ACCEL_OUT_X_L_A = 0x28 + LSM303_REGISTER_MAG_CRB_REG_M = 0x01 + LSM303_REGISTER_MAG_MR_REG_M = 0x02 + LSM303_REGISTER_MAG_OUT_X_H_M = 0x03 + + # Gain settings for setMagGain() + LSM303_MAGGAIN_1_3 = 0x20 # +/- 1.3 + LSM303_MAGGAIN_1_9 = 0x40 # +/- 1.9 + LSM303_MAGGAIN_2_5 = 0x60 # +/- 2.5 + LSM303_MAGGAIN_4_0 = 0x80 # +/- 4.0 + LSM303_MAGGAIN_4_7 = 0xA0 # +/- 4.7 + LSM303_MAGGAIN_5_6 = 0xC0 # +/- 5.6 + LSM303_MAGGAIN_8_1 = 0xE0 # +/- 8.1 + + + def __init__(self, busnum=-1, debug=False, hires=False): + + # Accelerometer and magnetometer are at different I2C + # addresses, so invoke a separate I2C instance for each + self.accel = Adafruit_I2C(self.LSM303_ADDRESS_ACCEL, busnum, debug) + self.mag = Adafruit_I2C(self.LSM303_ADDRESS_MAG , busnum, debug) + + # Enable the accelerometer + self.accel.write8(self.LSM303_REGISTER_ACCEL_CTRL_REG1_A, 0x27) + # Select hi-res (12-bit) or low-res (10-bit) output mode. + # Low-res mode uses less power and sustains a higher update rate, + # output is padded to compatible 12-bit units. + if hires: + self.accel.write8(self.LSM303_REGISTER_ACCEL_CTRL_REG4_A, + 0b00001000) + else: + self.accel.write8(self.LSM303_REGISTER_ACCEL_CTRL_REG4_A, 0) + + # Enable the magnetometer + self.mag.write8(self.LSM303_REGISTER_MAG_MR_REG_M, 0x00) + + + # Interpret signed 12-bit acceleration component from list + def accel12(self, list, idx): + n = list[idx] | (list[idx+1] << 8) # Low, high bytes + if n > 32767: n -= 65536 # 2's complement signed + return n >> 4 # 12-bit resolution + + + # Interpret signed 16-bit magnetometer component from list + def mag16(self, list, idx): + n = (list[idx] << 8) | list[idx+1] # High, low bytes + return n if n < 32768 else n - 65536 # 2's complement signed + + + def read(self): + # Read the accelerometer + list = self.accel.readList( + self.LSM303_REGISTER_ACCEL_OUT_X_L_A | 0x80, 6) + res = [( self.accel12(list, 0), + self.accel12(list, 2), + self.accel12(list, 4) )] + + # Read the magnetometer + list = self.mag.readList(self.LSM303_REGISTER_MAG_OUT_X_H_M, 6) + res.append((self.mag16(list, 0), + self.mag16(list, 2), + self.mag16(list, 4), + 0.0 )) # ToDo: Calculate orientation + + return res + + + def setMagGain(gain=LSM303_MAGGAIN_1_3): + self.mag.write8( LSM303_REGISTER_MAG_CRB_REG_M, gain) + + +# Simple example prints accel/mag data once per second: +if __name__ == '__main__': + + from time import sleep + + lsm = Adafruit_LSM303() + + print '[(Accelerometer X, Y, Z), (Magnetometer X, Y, Z, orientation)]' + while True: + print lsm.read() + sleep(1) # Output is fun to watch if this is commented out From e8a9985d1022a686167b56d4afc9b4b7a5f2af21 Mon Sep 17 00:00:00 2001 From: wckdDev Date: Sat, 23 Mar 2013 19:24:55 -0300 Subject: [PATCH 19/79] Update Adafruit_CharLCDPlate.py Fixed errors in scrollDisplyLeft utility method --- Adafruit_CharLCDPlate/Adafruit_CharLCDPlate.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Adafruit_CharLCDPlate/Adafruit_CharLCDPlate.py b/Adafruit_CharLCDPlate/Adafruit_CharLCDPlate.py index 8c742673..06b9300c 100644 --- a/Adafruit_CharLCDPlate/Adafruit_CharLCDPlate.py +++ b/Adafruit_CharLCDPlate/Adafruit_CharLCDPlate.py @@ -362,9 +362,9 @@ def ToggleBlink(self): self.write(self.LCD_DISPLAYCONTROL | self.displaycontrol) - def DisplayLeft(self): + def scrollDisplayLeft(self): """ These commands scroll the display without changing the RAM """ - self.displayshift = self.LCD_DISPLAYMODE | self.LCD_MOVELEFT + self.displayshift = self.LCD_DISPLAYMOVE | self.LCD_MOVELEFT self.write(self.LCD_CURSORSHIFT | self.displayshift) From c1f1e506536502db7debb2a1118ec12f7b0f7499 Mon Sep 17 00:00:00 2001 From: Ethan Bissett Date: Sun, 31 Mar 2013 16:38:16 -0400 Subject: [PATCH 20/79] Fix potentially broken symlinks in CharLCDPlate. --- Adafruit_CharLCDPlate/Adafruit_I2C.py | 2 +- Adafruit_CharLCDPlate/Adafruit_MCP230xx.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Adafruit_CharLCDPlate/Adafruit_I2C.py b/Adafruit_CharLCDPlate/Adafruit_I2C.py index f5fcefeb..77f06164 120000 --- a/Adafruit_CharLCDPlate/Adafruit_I2C.py +++ b/Adafruit_CharLCDPlate/Adafruit_I2C.py @@ -1 +1 @@ -../../Adafruit-Raspberry-Pi-Python-Code/Adafruit_I2C/Adafruit_I2C.py \ No newline at end of file +../Adafruit_I2C/Adafruit_I2C.py \ No newline at end of file diff --git a/Adafruit_CharLCDPlate/Adafruit_MCP230xx.py b/Adafruit_CharLCDPlate/Adafruit_MCP230xx.py index 4e89f685..3df8faef 120000 --- a/Adafruit_CharLCDPlate/Adafruit_MCP230xx.py +++ b/Adafruit_CharLCDPlate/Adafruit_MCP230xx.py @@ -1 +1 @@ -../../Adafruit-Raspberry-Pi-Python-Code/Adafruit_MCP230xx/Adafruit_MCP230xx.py \ No newline at end of file +../Adafruit_MCP230xx/Adafruit_MCP230xx.py \ No newline at end of file From 8dc8c4fd1c5d117e29becacf02a36706226c0929 Mon Sep 17 00:00:00 2001 From: Kevin Townsend Date: Thu, 4 Apr 2013 13:19:56 +0300 Subject: [PATCH 21/79] Fixed typo in ADS1015_REG_CONFIG_DR_920SPS --- Adafruit_ADS1x15/Adafruit_ADS1x15.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Adafruit_ADS1x15/Adafruit_ADS1x15.py b/Adafruit_ADS1x15/Adafruit_ADS1x15.py index 96a99feb..438c14fc 100644 --- a/Adafruit_ADS1x15/Adafruit_ADS1x15.py +++ b/Adafruit_ADS1x15/Adafruit_ADS1x15.py @@ -54,7 +54,7 @@ class ADS1x15: __ADS1015_REG_CONFIG_DR_128SPS = 0x0000 # 128 samples per second __ADS1015_REG_CONFIG_DR_250SPS = 0x0020 # 250 samples per second __ADS1015_REG_CONFIG_DR_490SPS = 0x0040 # 490 samples per second - __ADS1015_REG_CONFIG_DR_920SPS = 0x0050 # 920 samples per second + __ADS1015_REG_CONFIG_DR_920SPS = 0x0060 # 920 samples per second __ADS1015_REG_CONFIG_DR_1600SPS = 0x0080 # 1600 samples per second (default) __ADS1015_REG_CONFIG_DR_2400SPS = 0x00A0 # 2400 samples per second __ADS1015_REG_CONFIG_DR_3300SPS = 0x00C0 # 3300 samples per second From 36306a71af9d44f8f5e32bee980523dfd01efe42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matja=C5=BE=20Lipu=C5=A1?= Date: Sat, 6 Apr 2013 20:39:37 +0300 Subject: [PATCH 22/79] =?UTF-8?q?fixed=C2=A0open=5Fby=5Fkey?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Adafruit_DHT_Driver/Adafruit_DHT_googledocs.ex.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Adafruit_DHT_Driver/Adafruit_DHT_googledocs.ex.py b/Adafruit_DHT_Driver/Adafruit_DHT_googledocs.ex.py index c13d3033..9c9f6318 100755 --- a/Adafruit_DHT_Driver/Adafruit_DHT_googledocs.ex.py +++ b/Adafruit_DHT_Driver/Adafruit_DHT_googledocs.ex.py @@ -32,7 +32,7 @@ try: worksheet = gc.open(spreadsheet).sheet1 # Alternatively, open a spreadsheet using the spreadsheet's key - # worksheet = gc.open_by_key('0BmgG6nO_6dprdS1MN3d3MkdPa142WFRrdnRRUWl1UFE') + # worksheet = gc.open_by_key('0BmgG6nO_6dprdS1MN3d3MkdPa142WFRrdnRRUWl1UFE').sheet1 except: print "Unable to open the spreadsheet. Check your filename: %s" % spreadsheet sys.exit() From 331899c2e7905a36ae505dd0e18efc030c4c322d Mon Sep 17 00:00:00 2001 From: KTOWN Date: Tue, 9 Apr 2013 11:59:19 +0200 Subject: [PATCH 23/79] Added improvements from Pedvide --- Adafruit_ADS1x15/Adafruit_ADS1x15.py | 639 ++++++++++++++++++-- Adafruit_ADS1x15/ads1015_example.py | 35 -- Adafruit_ADS1x15/ads1x15_ex_comparator.py | 30 + Adafruit_ADS1x15/ads1x15_ex_differential.py | 27 + Adafruit_ADS1x15/ads1x15_ex_singleended.py | 25 + 5 files changed, 672 insertions(+), 84 deletions(-) delete mode 100644 Adafruit_ADS1x15/ads1015_example.py create mode 100644 Adafruit_ADS1x15/ads1x15_ex_comparator.py create mode 100644 Adafruit_ADS1x15/ads1x15_ex_differential.py create mode 100644 Adafruit_ADS1x15/ads1x15_ex_singleended.py diff --git a/Adafruit_ADS1x15/Adafruit_ADS1x15.py b/Adafruit_ADS1x15/Adafruit_ADS1x15.py index 438c14fc..32141f4b 100644 --- a/Adafruit_ADS1x15/Adafruit_ADS1x15.py +++ b/Adafruit_ADS1x15/Adafruit_ADS1x15.py @@ -6,6 +6,15 @@ # =========================================================================== # ADS1x15 Class +# +# Originally written by K. Townsend, Adafruit (https://github.com/adafruit/Adafruit-Raspberry-Pi-Python-Code/tree/master/Adafruit_ADS1x15) +# Updates and new functions implementation by Pedro Villanueva, 03/2013. +# The only error in the original code was in line 57: +# __ADS1015_REG_CONFIG_DR_920SPS = 0x0050 +# should be +# __ADS1015_REG_CONFIG_DR_920SPS = 0x0060 +# +# NOT IMPLEMENTED: Conversion ready pin, page 15 datasheet. # =========================================================================== class ADS1x15: @@ -57,7 +66,7 @@ class ADS1x15: __ADS1015_REG_CONFIG_DR_920SPS = 0x0060 # 920 samples per second __ADS1015_REG_CONFIG_DR_1600SPS = 0x0080 # 1600 samples per second (default) __ADS1015_REG_CONFIG_DR_2400SPS = 0x00A0 # 2400 samples per second - __ADS1015_REG_CONFIG_DR_3300SPS = 0x00C0 # 3300 samples per second + __ADS1015_REG_CONFIG_DR_3300SPS = 0x00C0 # 3300 samples per second (also 0x00E0) __ADS1115_REG_CONFIG_DR_8SPS = 0x0000 # 8 samples per second __ADS1115_REG_CONFIG_DR_16SPS = 0x0020 # 16 samples per second @@ -85,14 +94,47 @@ class ADS1x15: __ADS1015_REG_CONFIG_CQUE_2CONV = 0x0001 # Assert ALERT/RDY after two conversions __ADS1015_REG_CONFIG_CQUE_4CONV = 0x0002 # Assert ALERT/RDY after four conversions __ADS1015_REG_CONFIG_CQUE_NONE = 0x0003 # Disable the comparator and put ALERT/RDY in high state (default) + + + # Dictionaries with the sampling speed values + # These simplify and clean the code (avoid the abuse of if/elif/else clauses) + spsADS1115 = { + 8:__ADS1115_REG_CONFIG_DR_8SPS, + 16:__ADS1115_REG_CONFIG_DR_16SPS, + 32:__ADS1115_REG_CONFIG_DR_32SPS, + 64:__ADS1115_REG_CONFIG_DR_64SPS, + 128:__ADS1115_REG_CONFIG_DR_128SPS, + 250:__ADS1115_REG_CONFIG_DR_250SPS, + 475:__ADS1115_REG_CONFIG_DR_475SPS, + 860:__ADS1115_REG_CONFIG_DR_860SPS + } + spsADS1015 = { + 128:__ADS1015_REG_CONFIG_DR_128SPS, + 250:__ADS1015_REG_CONFIG_DR_250SPS, + 490:__ADS1015_REG_CONFIG_DR_490SPS, + 920:__ADS1015_REG_CONFIG_DR_920SPS, + 1600:__ADS1015_REG_CONFIG_DR_1600SPS, + 2400:__ADS1015_REG_CONFIG_DR_2400SPS, + 3300:__ADS1015_REG_CONFIG_DR_3300SPS + } + # Dictionariy with the programable gains + pgaADS1x15 = { + 6144:__ADS1015_REG_CONFIG_PGA_6_144V, + 4096:__ADS1015_REG_CONFIG_PGA_4_096V, + 2048:__ADS1015_REG_CONFIG_PGA_2_048V, + 1024:__ADS1015_REG_CONFIG_PGA_1_024V, + 512:__ADS1015_REG_CONFIG_PGA_0_512V, + 256:__ADS1015_REG_CONFIG_PGA_0_256V + } + # Constructor def __init__(self, address=0x48, ic=__IC_ADS1015, debug=False): - # Depending on if you have an old or a new Raspberry Pi, you - # may need to change the I2C bus. Older Pis use SMBus 0, - # whereas new Pis use SMBus 1. If you see an error like: - # 'Error accessing 0x48: Check your I2C address ' - # change the SMBus number in the initializer below! + # Depending on if you have an old or a new Raspberry Pi, you + # may need to change the I2C bus. Older Pis use SMBus 0, + # whereas new Pis use SMBus 1. If you see an error like: + # 'Error accessing 0x48: Check your I2C address ' + # change the SMBus number in the initializer below! self.i2c = Adafruit_I2C(address) self.address = address self.debug = debug @@ -100,38 +142,54 @@ def __init__(self, address=0x48, ic=__IC_ADS1015, debug=False): # Make sure the IC specified is valid if ((ic < self.__IC_ADS1015) | (ic > self.__IC_ADS1115)): if (self.debug): - print "ADS1x15: Invalid IC. Using the ADS1015 by default" - self.ic = __IC_ADS1015 + print "ADS1x15: Invalid IC specfied: %h" % ic + return -1 else: self.ic = ic - - def readADCSingleEnded(self, channel=0): - "Gets a single-ended ADC reading from the specified channel (1 bit = 3mV)" - # Default to channel 0 with invalid channel, or return -1? + + # Set pga value, so that getLastConversionResult() can use it, + # any function that accepts a pga value must update this. + self.pga = 6144 + + + def readADCSingleEnded(self, channel=0, pga=6144, sps=250): + "Gets a single-ended ADC reading from the specified channel in mV. \ + The sample rate for this mode (single-shot) can be used to lower the noise \ + (low sps) or to lower the power consumption (high sps) by duty cycling, \ + see datasheet page 14 for more info. \ + The pga must be given in mV, see page 13 for the supported values." + + # With invalid channel return -1 if (channel > 3): if (self.debug): print "ADS1x15: Invalid channel specified: %d" % channel return -1 + + # Disable comparator, Non-latching, Alert/Rdy active low + # traditional comparator, single-shot mode + config = self.__ADS1015_REG_CONFIG_CQUE_NONE | \ + self.__ADS1015_REG_CONFIG_CLAT_NONLAT | \ + self.__ADS1015_REG_CONFIG_CPOL_ACTVLOW | \ + self.__ADS1015_REG_CONFIG_CMODE_TRAD | \ + self.__ADS1015_REG_CONFIG_MODE_SINGLE - # Set default values + # Set sample per seconds, defaults to 250sps + # If sps is in the dictionary (defined in init) it returns the value of the constant + # othewise it returns the value for 250sps. This saves a lot of if/elif/else code! if (self.ic == self.__IC_ADS1015): - config = self.__ADS1015_REG_CONFIG_CQUE_NONE | \ - self.__ADS1015_REG_CONFIG_CLAT_NONLAT | \ - self.__ADS1015_REG_CONFIG_CPOL_ACTVLOW | \ - self.__ADS1015_REG_CONFIG_CMODE_TRAD | \ - self.__ADS1015_REG_CONFIG_DR_1600SPS | \ - self.__ADS1015_REG_CONFIG_MODE_SINGLE - else: - config = self.__ADS1015_REG_CONFIG_CQUE_NONE | \ - self.__ADS1015_REG_CONFIG_CLAT_NONLAT | \ - self.__ADS1015_REG_CONFIG_CPOL_ACTVLOW | \ - self.__ADS1015_REG_CONFIG_CMODE_TRAD | \ - self.__ADS1115_REG_CONFIG_DR_250SPS | \ - self.__ADS1015_REG_CONFIG_MODE_SINGLE - - # Set PGA/voltage range to max value (+/- 6.144V) - config |= self.__ADS1015_REG_CONFIG_PGA_6_144V + config |= self.spsADS1015.setdefault(sps, self.__ADS1015_REG_CONFIG_DR_1600SPS) + else: + if ( (sps not in self.spsADS1115) & self.debug): + print "ADS1x15: Invalid pga specified: %d, using 6144mV" % sps + config |= self.spsADS1115.setdefault(sps, self.__ADS1115_REG_CONFIG_DR_250SPS) + # Set PGA/voltage range, defaults to +-6.144V + if ( (pga not in self.pgaADS1x15) & self.debug): + print "ADS1x15: Invalid pga specified: %d, using 6144mV" % sps + config |= self.pgaADS1x15.setdefault(pga, self.__ADS1015_REG_CONFIG_PGA_6_144V) + self.pga = pga + + # Set the channel to be converted if channel == 3: config |= self.__ADS1015_REG_CONFIG_MUX_SINGLE_3 elif channel == 2: @@ -149,33 +207,516 @@ def readADCSingleEnded(self, channel=0): self.i2c.writeList(self.__ADS1015_REG_POINTER_CONFIG, bytes) # Wait for the ADC conversion to complete + # The minimum delay depends on the sps: delay >= 1/sps + # We add 0.1ms to be sure + delay = 1.0/sps+0.0001 + time.sleep(delay) + + # Read the conversion results + result = self.i2c.readList(self.__ADS1015_REG_POINTER_CONVERT, 2) if (self.ic == self.__IC_ADS1015): - time.sleep(0.001) + # Shift right 4 bits for the 12-bit ADS1015 and convert to mV + return ( ((result[0] << 8) | (result[1] & 0xFF)) >> 4 )*pga/2048.0 else: - time.sleep(0.008) + # Return a mV value for the ADS1115 + # (Take signed values into account as well) + val = (result[0] << 8) | (result[1]) + if val > 0x7FFF: + return (val - 0xFFFF)*pga/32768.0 + else: + return ( (result[0] << 8) | (result[1]) )*pga/32768.0 + + + def readADCDifferential(self, chP=0, chN=1, pga=6144, sps=250): + "Gets a differential ADC reading from channels chP and chN in mV. \ + The sample rate for this mode (single-shot) can be used to lower the noise \ + (low sps) or to lower the power consumption (high sps) by duty cycling, \ + see data sheet page 14 for more info. \ + The pga must be given in mV, see page 13 for the supported values." + + # Disable comparator, Non-latching, Alert/Rdy active low + # traditional comparator, single-shot mode + config = self.__ADS1015_REG_CONFIG_CQUE_NONE | \ + self.__ADS1015_REG_CONFIG_CLAT_NONLAT | \ + self.__ADS1015_REG_CONFIG_CPOL_ACTVLOW | \ + self.__ADS1015_REG_CONFIG_CMODE_TRAD | \ + self.__ADS1015_REG_CONFIG_MODE_SINGLE + + # Set channels + if ( (chP == 0) & (chN == 1) ): + config |= self.__ADS1015_REG_CONFIG_MUX_DIFF_0_1 + elif ( (chP == 0) & (chN == 3) ): + config |= self.__ADS1015_REG_CONFIG_MUX_DIFF_0_3 + elif ( (chP == 2) & (chN == 3) ): + config |= self.__ADS1015_REG_CONFIG_MUX_DIFF_2_3 + elif ( (chP == 1) & (chN == 3) ): + config |= self.__ADS1015_REG_CONFIG_MUX_DIFF_1_3 + else: + if (self.debug): + print "ADS1x15: Invalid channels specified: %d, %d" % (chP, chN) + return -1 + + # Set sample per seconds, defaults to 250sps + # If sps is in the dictionary (defined in init()) it returns the value of the constant + # othewise it returns the value for 250sps. This saves a lot of if/elif/else code! + if (self.ic == self.__IC_ADS1015): + config |= self.spsADS1015.setdefault(sps, self.__ADS1015_REG_CONFIG_DR_1600SPS) + else: + if ( (sps not in self.spsADS1115) & self.debug): + print "ADS1x15: Invalid pga specified: %d, using 6144mV" % sps + config |= self.spsADS1115.setdefault(sps, self.__ADS1115_REG_CONFIG_DR_250SPS) + + # Set PGA/voltage range, defaults to +-6.144V + if ( (pga not in self.pgaADS1x15) & self.debug): + print "ADS1x15: Invalid pga specified: %d, using 6144mV" % sps + config |= self.pgaADS1x15.setdefault(pga, self.__ADS1015_REG_CONFIG_PGA_6_144V) + self.pga = pga + + # Set 'start single-conversion' bit + config |= self.__ADS1015_REG_CONFIG_OS_SINGLE + + # Write config register to the ADC + bytes = [(config >> 8) & 0xFF, config & 0xFF] + self.i2c.writeList(self.__ADS1015_REG_POINTER_CONFIG, bytes) + + # Wait for the ADC conversion to complete + # The minimum delay depends on the sps: delay >= 1/sps + # We add 0.1ms to be sure + delay = 1.0/sps+0.0001 + time.sleep(delay) # Read the conversion results result = self.i2c.readList(self.__ADS1015_REG_POINTER_CONVERT, 2) if (self.ic == self.__IC_ADS1015): - # Shift right 4 bits for the 12-bit ADS1015 - return ( ((result[0] << 8) | (result[1] & 0xFF)) >> 4 ) - else: - # Return 16-bit value for the ADS1115 - # (Take signed values into account as well) - val = (result[0] << 8) | (result[1]) - if val > 0x7FFF: - return val - 0xFFFF - else: - return (result[0] << 8) | (result[1]) - - def readADCDifferential01(self): - "Gets a differential ADC reading from channels 0 and 1" + # Shift right 4 bits for the 12-bit ADS1015 and convert to mV + return ( ((result[0] << 8) | (result[1] & 0xFF)) >> 4 )*pga/2048.0 + else: + # Return a mV value for the ADS1115 + # (Take signed values into account as well) + val = (result[0] << 8) | (result[1]) + if val > 0x7FFF: + return (val - 0xFFFF)*pga/32768.0 + else: + return ( (result[0] << 8) | (result[1]) )*pga/32768.0 + + + def readADCDifferential01(self, pga=6144, sps=250): + "Gets a differential ADC reading from channels 0 and 1 in mV\ + The sample rate for this mode (single-shot) can be used to lower the noise \ + (low sps) or to lower the power consumption (high sps) by duty cycling, \ + see data sheet page 14 for more info. \ + The pga must be given in mV, see page 13 for the supported values." + return self.readADCDifferential(0, 1, pga, sps) + + + def readADCDifferential03(self, pga=6144, sps=250): + "Gets a differential ADC reading from channels 0 and 3 in mV \ + The sample rate for this mode (single-shot) can be used to lower the noise \ + (low sps) or to lower the power consumption (high sps) by duty cycling, \ + see data sheet page 14 for more info. \ + The pga must be given in mV, see page 13 for the supported values." + return self.readADCDifferential(0, 3, pga, sps) + + + def readADCDifferential13(self, pga=6144, sps=250): + "Gets a differential ADC reading from channels 1 and 3 in mV \ + The sample rate for this mode (single-shot) can be used to lower the noise \ + (low sps) or to lower the power consumption (high sps) by duty cycling, \ + see data sheet page 14 for more info. \ + The pga must be given in mV, see page 13 for the supported values." + return self.__readADCDifferential(1, 3, pga, sps) + + + def readADCDifferential23(self, pga=6144, sps=250): + "Gets a differential ADC reading from channels 2 and 3 in mV \ + The sample rate for this mode (single-shot) can be used to lower the noise \ + (low sps) or to lower the power consumption (high sps) by duty cycling, \ + see data sheet page 14 for more info. \ + The pga must be given in mV, see page 13 for the supported values." + return self.readADCDifferential(2, 3, pga, sps) + + + def startContinuousConversion(self, channel=0, pga=6144, sps=250): + "Starts the continuous conversion mode and returns the first ADC reading \ + in mV from the specified channel. \ + The sps controls the sample rate. \ + The pga must be given in mV, see datasheet page 13 for the supported values. \ + Use getLastConversionResults() to read the next values and \ + stopContinuousConversion() to stop converting." + + # Default to channel 0 with invalid channel, or return -1? + if (channel > 3): + if (self.debug): + print "ADS1x15: Invalid channel specified: %d" % channel + return -1 + + # Disable comparator, Non-latching, Alert/Rdy active low + # traditional comparator, continuous mode + # The last flag is the only change we need, page 11 datasheet + config = self.__ADS1015_REG_CONFIG_CQUE_NONE | \ + self.__ADS1015_REG_CONFIG_CLAT_NONLAT | \ + self.__ADS1015_REG_CONFIG_CPOL_ACTVLOW | \ + self.__ADS1015_REG_CONFIG_CMODE_TRAD | \ + self.__ADS1015_REG_CONFIG_MODE_CONTIN - def readADCDifferential23(self): - "Gets a differential ADC reading from channels 2 and 3" + # Set sample per seconds, defaults to 250sps + # If sps is in the dictionary (defined in init()) it returns the value of the constant + # othewise it returns the value for 250sps. This saves a lot of if/elif/else code! + if (self.ic == self.__IC_ADS1015): + config |= self.spsADS1015.setdefault(sps, self.__ADS1015_REG_CONFIG_DR_1600SPS) + else: + if ( (sps not in self.spsADS1115) & self.debug): + print "ADS1x15: Invalid pga specified: %d, using 6144mV" % sps + config |= self.spsADS1115.setdefault(sps, self.__ADS1115_REG_CONFIG_DR_250SPS) + + # Set PGA/voltage range, defaults to +-6.144V + if ( (pga not in self.pgaADS1x15) & self.debug): + print "ADS1x15: Invalid pga specified: %d, using 6144mV" % sps + config |= self.pgaADS1x15.setdefault(pga, self.__ADS1015_REG_CONFIG_PGA_6_144V) + self.pga = pga + + # Set the channel to be converted + if channel == 3: + config |= self.__ADS1015_REG_CONFIG_MUX_SINGLE_3 + elif channel == 2: + config |= self.__ADS1015_REG_CONFIG_MUX_SINGLE_2 + elif channel == 1: + config |= self.__ADS1015_REG_CONFIG_MUX_SINGLE_1 + else: + config |= self.__ADS1015_REG_CONFIG_MUX_SINGLE_0 + + # Set 'start single-conversion' bit to begin conversions + # No need to change this for continuous mode! + config |= self.__ADS1015_REG_CONFIG_OS_SINGLE + + # Write config register to the ADC + # Once we write the ADC will convert continously + # we can read the next values using getLastConversionResult + bytes = [(config >> 8) & 0xFF, config & 0xFF] + self.i2c.writeList(self.__ADS1015_REG_POINTER_CONFIG, bytes) + + # Wait for the ADC conversion to complete + # The minimum delay depends on the sps: delay >= 1/sps + # We add 0.5ms to be sure + delay = 1.0/sps+0.0005 + time.sleep(delay) + + # Read the conversion results + result = self.i2c.readList(self.__ADS1015_REG_POINTER_CONVERT, 2) + if (self.ic == self.__IC_ADS1015): + # Shift right 4 bits for the 12-bit ADS1015 and convert to mV + return ( ((result[0] << 8) | (result[1] & 0xFF)) >> 4 )*pga/2048.0 + else: + # Return a mV value for the ADS1115 + # (Take signed values into account as well) + val = (result[0] << 8) | (result[1]) + if val > 0x7FFF: + return (val - 0xFFFF)*pga/32768.0 + else: + return ( (result[0] << 8) | (result[1]) )*pga/32768.0 + + def startContinuousDifferentialConversion(self, chP=0, chN=1, pga=6144, sps=250): + "Starts the continuous differential conversion mode and returns the first ADC reading \ + in mV as the difference from the specified channels. \ + The sps controls the sample rate. \ + The pga must be given in mV, see datasheet page 13 for the supported values. \ + Use getLastConversionResults() to read the next values and \ + stopContinuousConversion() to stop converting." + + # Disable comparator, Non-latching, Alert/Rdy active low + # traditional comparator, continuous mode + # The last flag is the only change we need, page 11 datasheet + config = self.__ADS1015_REG_CONFIG_CQUE_NONE | \ + self.__ADS1015_REG_CONFIG_CLAT_NONLAT | \ + self.__ADS1015_REG_CONFIG_CPOL_ACTVLOW | \ + self.__ADS1015_REG_CONFIG_CMODE_TRAD | \ + self.__ADS1015_REG_CONFIG_MODE_CONTIN + + # Set sample per seconds, defaults to 250sps + # If sps is in the dictionary (defined in init()) it returns the value of the constant + # othewise it returns the value for 250sps. This saves a lot of if/elif/else code! + if (self.ic == self.__IC_ADS1015): + config |= self.spsADS1015.setdefault(sps, self.__ADS1015_REG_CONFIG_DR_1600SPS) + else: + if ( (sps not in self.spsADS1115) & self.debug): + print "ADS1x15: Invalid pga specified: %d, using 6144mV" % sps + config |= self.spsADS1115.setdefault(sps, self.__ADS1115_REG_CONFIG_DR_250SPS) + + # Set PGA/voltage range, defaults to +-6.144V + if ( (pga not in self.pgaADS1x15) & self.debug): + print "ADS1x15: Invalid pga specified: %d, using 6144mV" % sps + config |= self.pgaADS1x15.setdefault(pga, self.__ADS1015_REG_CONFIG_PGA_6_144V) + self.pga = pga + + # Set channels + if ( (chP == 0) & (chN == 1) ): + config |= self.__ADS1015_REG_CONFIG_MUX_DIFF_0_1 + elif ( (chP == 0) & (chN == 3) ): + config |= self.__ADS1015_REG_CONFIG_MUX_DIFF_0_3 + elif ( (chP == 2) & (chN == 3) ): + config |= self.__ADS1015_REG_CONFIG_MUX_DIFF_2_3 + elif ( (chP == 1) & (chN == 3) ): + config |= self.__ADS1015_REG_CONFIG_MUX_DIFF_1_3 + else: + if (self.debug): + print "ADS1x15: Invalid channels specified: %d, %d" % (chP, chN) + return -1 + + # Set 'start single-conversion' bit to begin conversions + # No need to change this for continuous mode! + config |= self.__ADS1015_REG_CONFIG_OS_SINGLE + + # Write config register to the ADC + # Once we write the ADC will convert continously + # we can read the next values using getLastConversionResult + bytes = [(config >> 8) & 0xFF, config & 0xFF] + self.i2c.writeList(self.__ADS1015_REG_POINTER_CONFIG, bytes) + + # Wait for the ADC conversion to complete + # The minimum delay depends on the sps: delay >= 1/sps + # We add 0.5ms to be sure + delay = 1.0/sps+0.0005 + time.sleep(delay) + + # Read the conversion results + result = self.i2c.readList(self.__ADS1015_REG_POINTER_CONVERT, 2) + if (self.ic == self.__IC_ADS1015): + # Shift right 4 bits for the 12-bit ADS1015 and convert to mV + return ( ((result[0] << 8) | (result[1] & 0xFF)) >> 4 )*pga/2048.0 + else: + # Return a mV value for the ADS1115 + # (Take signed values into account as well) + val = (result[0] << 8) | (result[1]) + if val > 0x7FFF: + return (val - 0xFFFF)*pga/32768.0 + else: + return ( (result[0] << 8) | (result[1]) )*pga/32768.0 - def startSingleEndedComparator(self, channel, threshold): - "Starts the comparator in single-ended mode on the specified channel" + + def stopContinuousConversion(self): + "Stops the ADC's conversions when in continuous mode \ + and resets the configuration to its default value." + # Write the default config register to the ADC + # Once we write, the ADC will do a single conversion and + # enter power-off mode. + config = 0x8583 # Page 18 datasheet. + bytes = [(config >> 8) & 0xFF, config & 0xFF] + self.i2c.writeList(self.__ADS1015_REG_POINTER_CONFIG, bytes) + return True def getLastConversionResults(self): - "Returns the last ADC conversion result" + "Returns the last ADC conversion result in mV" + # Read the conversion results + result = self.i2c.readList(self.__ADS1015_REG_POINTER_CONVERT, 2) + if (self.ic == self.__IC_ADS1015): + # Shift right 4 bits for the 12-bit ADS1015 and convert to mV + return ( ((result[0] << 8) | (result[1] & 0xFF)) >> 4 )*self.pga/2048.0 + else: + # Return a mV value for the ADS1115 + # (Take signed values into account as well) + val = (result[0] << 8) | (result[1]) + if val > 0x7FFF: + return (val - 0xFFFF)*self.pga/32768.0 + else: + return ( (result[0] << 8) | (result[1]) )*self.pga/32768.0 + + + def startSingleEndedComparator(self, channel, thresholdHigh, thresholdLow, \ + pga=6144, sps=250, \ + activeLow=True, traditionalMode=True, latching=False, \ + numReadings=1): + "Starts the comparator mode on the specified channel, see datasheet pg. 15. \ + In traditional mode it alerts (ALERT pin will go low) when voltage exceeds \ + thresholdHigh until it falls below thresholdLow (both given in mV). \ + In window mode (traditionalMode=False) it alerts when voltage doesn't lie\ + between both thresholds.\ + In latching mode the alert will continue until the conversion value is read. \ + numReadings controls how many readings are necessary to trigger an alert: 1, 2 or 4.\ + Use getLastConversionResults() to read the current value (which may differ \ + from the one that triggered the alert) and clear the alert pin in latching mode. \ + This function starts the continuous conversion mode. The sps controls \ + the sample rate and the pga the gain, see datasheet page 13. " + + # With invalid channel return -1 + if (channel > 3): + if (self.debug): + print "ADS1x15: Invalid channel specified: %d" % channel + return -1 + + # Continuous mode + config = self.__ADS1015_REG_CONFIG_MODE_CONTIN + + if (activeLow==False): + config |= self.__ADS1015_REG_CONFIG_CPOL_ACTVHI + else: + config |= self.__ADS1015_REG_CONFIG_CPOL_ACTVLOW + + if (traditionalMode==False): + config |= self.__ADS1015_REG_CONFIG_CMODE_WINDOW + else: + config |= self.__ADS1015_REG_CONFIG_CMODE_TRAD + + if (latching==True): + config |= self.__ADS1015_REG_CONFIG_CLAT_LATCH + else: + config |= self.__ADS1015_REG_CONFIG_CLAT_NONLAT + + if (numReadings==4): + config |= self.__ADS1015_REG_CONFIG_CQUE_4CONV + elif (numReadings==2): + config |= self.__ADS1015_REG_CONFIG_CQUE_2CONV + else: + config |= self.__ADS1015_REG_CONFIG_CQUE_1CONV + + # Set sample per seconds, defaults to 250sps + # If sps is in the dictionary (defined in init()) it returns the value of the constant + # othewise it returns the value for 250sps. This saves a lot of if/elif/else code! + if (self.ic == self.__IC_ADS1015): + if ( (sps not in self.spsADS1015) & self.debug): + print "ADS1x15: Invalid sps specified: %d, using 1600sps" % sps + config |= self.spsADS1015.setdefault(sps, self.__ADS1015_REG_CONFIG_DR_1600SPS) + else: + if ( (sps not in self.spsADS1115) & self.debug): + print "ADS1x15: Invalid sps specified: %d, using 250sps" % sps + config |= self.spsADS1115.setdefault(sps, self.__ADS1115_REG_CONFIG_DR_250SPS) + + # Set PGA/voltage range, defaults to +-6.144V + if ( (pga not in self.pgaADS1x15) & self.debug): + print "ADS1x15: Invalid pga specified: %d, using 6144mV" % pga + config |= self.pgaADS1x15.setdefault(pga, self.__ADS1015_REG_CONFIG_PGA_6_144V) + self.pga = pga + + # Set the channel to be converted + if channel == 3: + config |= self.__ADS1015_REG_CONFIG_MUX_SINGLE_3 + elif channel == 2: + config |= self.__ADS1015_REG_CONFIG_MUX_SINGLE_2 + elif channel == 1: + config |= self.__ADS1015_REG_CONFIG_MUX_SINGLE_1 + else: + config |= self.__ADS1015_REG_CONFIG_MUX_SINGLE_0 + + # Set 'start single-conversion' bit to begin conversions + config |= self.__ADS1015_REG_CONFIG_OS_SINGLE + + # Write threshold high and low registers to the ADC + # V_digital = (2^(n-1)-1)/pga*V_analog + if (self.ic == self.__IC_ADS1015): + thresholdHighWORD = int(thresholdHigh*(2048.0/pga)) + else: + thresholdHighWORD = int(thresholdHigh*(32767.0/pga)) + bytes = [(thresholdHighWORD >> 8) & 0xFF, thresholdHighWORD & 0xFF] + self.i2c.writeList(self.__ADS1015_REG_POINTER_HITHRESH, bytes) + + if (self.ic == self.__IC_ADS1015): + thresholdLowWORD = int(thresholdLow*(2048.0/pga)) + else: + thresholdLowWORD = int(thresholdLow*(32767.0/pga)) + bytes = [(thresholdLowWORD >> 8) & 0xFF, thresholdLowWORD & 0xFF] + self.i2c.writeList(self.__ADS1015_REG_POINTER_LOWTHRESH, bytes) + + # Write config register to the ADC + # Once we write the ADC will convert continously and alert when things happen, + # we can read the converted values using getLastConversionResult + bytes = [(config >> 8) & 0xFF, config & 0xFF] + self.i2c.writeList(self.__ADS1015_REG_POINTER_CONFIG, bytes) + + + def startDifferentialComparator(self, chP, chN, thresholdHigh, thresholdLow, \ + pga=6144, sps=250, \ + activeLow=True, traditionalMode=True, latching=False, \ + numReadings=1): + "Starts the comparator mode on the specified channel, see datasheet pg. 15. \ + In traditional mode it alerts (ALERT pin will go low) when voltage exceeds \ + thresholdHigh until it falls below thresholdLow (both given in mV). \ + In window mode (traditionalMode=False) it alerts when voltage doesn't lie\ + between both thresholds.\ + In latching mode the alert will continue until the conversion value is read. \ + numReadings controls how many readings are necessary to trigger an alert: 1, 2 or 4.\ + Use getLastConversionResults() to read the current value (which may differ \ + from the one that triggered the alert) and clear the alert pin in latching mode. \ + This function starts the continuous conversion mode. The sps controls \ + the sample rate and the pga the gain, see datasheet page 13. " + + # Continuous mode + config = self.__ADS1015_REG_CONFIG_MODE_CONTIN + + if (activeLow==False): + config |= self.__ADS1015_REG_CONFIG_CPOL_ACTVHI + else: + config |= self.__ADS1015_REG_CONFIG_CPOL_ACTVLOW + + if (traditionalMode==False): + config |= self.__ADS1015_REG_CONFIG_CMODE_WINDOW + else: + config |= self.__ADS1015_REG_CONFIG_CMODE_TRAD + + if (latching==True): + config |= self.__ADS1015_REG_CONFIG_CLAT_LATCH + else: + config |= self.__ADS1015_REG_CONFIG_CLAT_NONLAT + + if (numReadings==4): + config |= self.__ADS1015_REG_CONFIG_CQUE_4CONV + elif (numReadings==2): + config |= self.__ADS1015_REG_CONFIG_CQUE_2CONV + else: + config |= self.__ADS1015_REG_CONFIG_CQUE_1CONV + + # Set sample per seconds, defaults to 250sps + # If sps is in the dictionary (defined in init()) it returns the value of the constant + # othewise it returns the value for 250sps. This saves a lot of if/elif/else code! + if (self.ic == self.__IC_ADS1015): + if ( (sps not in self.spsADS1015) & self.debug): + print "ADS1x15: Invalid sps specified: %d, using 1600sps" % sps + config |= self.spsADS1015.setdefault(sps, self.__ADS1015_REG_CONFIG_DR_1600SPS) + else: + if ( (sps not in self.spsADS1115) & self.debug): + print "ADS1x15: Invalid sps specified: %d, using 250sps" % sps + config |= self.spsADS1115.setdefault(sps, self.__ADS1115_REG_CONFIG_DR_250SPS) + + # Set PGA/voltage range, defaults to +-6.144V + if ( (pga not in self.pgaADS1x15) & self.debug): + print "ADS1x15: Invalid pga specified: %d, using 6144mV" % pga + config |= self.pgaADS1x15.setdefault(pga, self.__ADS1015_REG_CONFIG_PGA_6_144V) + self.pga = pga + + # Set channels + if ( (chP == 0) & (chN == 1) ): + config |= self.__ADS1015_REG_CONFIG_MUX_DIFF_0_1 + elif ( (chP == 0) & (chN == 3) ): + config |= self.__ADS1015_REG_CONFIG_MUX_DIFF_0_3 + elif ( (chP == 2) & (chN == 3) ): + config |= self.__ADS1015_REG_CONFIG_MUX_DIFF_2_3 + elif ( (chP == 1) & (chN == 3) ): + config |= self.__ADS1015_REG_CONFIG_MUX_DIFF_1_3 + else: + if (self.debug): + print "ADS1x15: Invalid channels specified: %d, %d" % (chP, chN) + return -1 + + # Set 'start single-conversion' bit to begin conversions + config |= self.__ADS1015_REG_CONFIG_OS_SINGLE + + # Write threshold high and low registers to the ADC + # V_digital = (2^(n-1)-1)/pga*V_analog + if (self.ic == self.__IC_ADS1015): + thresholdHighWORD = int(thresholdHigh*(2048.0/pga)) + else: + thresholdHighWORD = int(thresholdHigh*(32767.0/pga)) + bytes = [(thresholdHighWORD >> 8) & 0xFF, thresholdHighWORD & 0xFF] + self.i2c.writeList(self.__ADS1015_REG_POINTER_HITHRESH, bytes) + + if (self.ic == self.__IC_ADS1015): + thresholdLowWORD = int(thresholdLow*(2048.0/pga)) + else: + thresholdLowWORD = int(thresholdLow*(32767.0/pga)) + bytes = [(thresholdLowWORD >> 8) & 0xFF, thresholdLowWORD & 0xFF] + self.i2c.writeList(self.__ADS1015_REG_POINTER_LOWTHRESH, bytes) + + # Write config register to the ADC + # Once we write the ADC will convert continously and alert when things happen, + # we can read the converted values using getLastConversionResult + bytes = [(config >> 8) & 0xFF, config & 0xFF] + self.i2c.writeList(self.__ADS1015_REG_POINTER_CONFIG, bytes) + diff --git a/Adafruit_ADS1x15/ads1015_example.py b/Adafruit_ADS1x15/ads1015_example.py deleted file mode 100644 index 2a4d6285..00000000 --- a/Adafruit_ADS1x15/ads1015_example.py +++ /dev/null @@ -1,35 +0,0 @@ -#!/usr/bin/python - -from Adafruit_ADS1x15 import ADS1x15 - -# ============================================================================ -# Example Code -# ============================================================================ -ADS1015 = 0x00 # 12-bit ADC -ADS1115 = 0x01 # 16-bit ADC - -# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -# ToDo: Change the value below depending on which chip you're using! -# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -ADS_Current = ADS1115 - -# Initialise the ADC using the default mode (use default I2C address) -adc = ADS1x15(ic=ADS_Current) - -# Read channel 0 in single-ended mode -result = adc.readADCSingleEnded(0) -if ADS_Current == ADS1015: - # For ADS1015 at max range (+/-6.144V) 1 bit = 3mV (12-bit values) - print "Channel 0 = %.3f V" % (result * 0.003) -else: - # For ADS1115 at max range (+/-6.144V) 1-bit = 0.1875mV (16-bit values) - print "Channel 0 = %.3f V" % (result * 0.0001875) - -# Read channel 1 in single-ended mode -result = adc.readADCSingleEnded(1) -if ADS_Current == ADS1015: - # For ADS1015 at max range (+/-6.144V) 1 bit = 3mV (12-bit values) - print "Channel 1 = %.3f V" % (result * 0.003) -else: - # For ADS1115 at max range (+/-6.144V) 1-bit = 0.1875mV (16-bit values) - print "Channel 1 = %.3f V" % (result * 0.0001875) diff --git a/Adafruit_ADS1x15/ads1x15_ex_comparator.py b/Adafruit_ADS1x15/ads1x15_ex_comparator.py new file mode 100644 index 00000000..e10eb6cb --- /dev/null +++ b/Adafruit_ADS1x15/ads1x15_ex_comparator.py @@ -0,0 +1,30 @@ +#!/usr/bin/python + +import time, signal, sys +from Adafruit_ADS1x15 import ADS1x15 + +def signal_handler(signal, frame): + print 'You pressed Ctrl+C!' + print adc.getLastConversionResults()/1000.0 + adc.stopContinuousConversion() + sys.exit(0) + +signal.signal(signal.SIGINT, signal_handler) +# Print 'Press Ctrl+C to exit' + +ADS1015 = 0x00 # 12-bit ADC +ADS1115 = 0x01 # 16-bit ADC + +# Initialise the ADC using the default mode (use default I2C address) +# Set this to ADS1015 or ADS1115 depending on the ADC you are using! +adc = ADS1x15(ic=ADS1115) + +# start comparator on channel 2 with a thresholdHigh=200mV and low=100mV +# in traditional mode, non-latching, +/-1.024V and 250sps +adc.startSingleEndedComparator(2, 200, 100, pga=1024, sps=250, activeLow=True, traditionalMode=True, latching=False, numReadings=1) + +while True: + print adc.getLastConversionResults()/1000.0 + time.sleep(0.25) + +#time.sleep(0.1) diff --git a/Adafruit_ADS1x15/ads1x15_ex_differential.py b/Adafruit_ADS1x15/ads1x15_ex_differential.py new file mode 100644 index 00000000..01614fdd --- /dev/null +++ b/Adafruit_ADS1x15/ads1x15_ex_differential.py @@ -0,0 +1,27 @@ +#!/usr/bin/python + +import time, signal, sys +from Adafruit_ADS1x15 import ADS1x15 + +def signal_handler(signal, frame): + #print 'You pressed Ctrl+C!' + sys.exit(0) +signal.signal(signal.SIGINT, signal_handler) +#print 'Press Ctrl+C to exit' + +ADS1015 = 0x00 # 12-bit ADC +ADS1115 = 0x01 # 16-bit ADC + +# Initialise the ADC using the default mode (use default I2C address) +# Set this to ADS1015 or ADS1115 depending on the ADC you are using! +adc = ADS1x15(ic=ADS1115) + +# Read channels 2 and 3 in single-ended mode, at +/-4.096V and 250sps +volts2 = adc.readADCSingleEnded(2, 4096, 250)/1000.0 +volts3 = adc.readADCSingleEnded(3, 4096, 250)/1000.0 + +# Now do a differential reading of channels 2 and 3 +voltsdiff = adc.readADCDifferential23(4096, 250)/1000.0 + +# Display the two different reading for comparison purposes +print "%.8f %.8f %.8f %.8f" % (volts2, volts3, volts3-volts2, -voltsdiff) diff --git a/Adafruit_ADS1x15/ads1x15_ex_singleended.py b/Adafruit_ADS1x15/ads1x15_ex_singleended.py new file mode 100644 index 00000000..190288b2 --- /dev/null +++ b/Adafruit_ADS1x15/ads1x15_ex_singleended.py @@ -0,0 +1,25 @@ +#!/usr/bin/python + +import time, signal, sys +from Adafruit_ADS1x15 import ADS1x15 + +def signal_handler(signal, frame): + print 'You pressed Ctrl+C!' + sys.exit(0) +signal.signal(signal.SIGINT, signal_handler) +#print 'Press Ctrl+C to exit' + +ADS1015 = 0x00 # 12-bit ADC +ADS1115 = 0x01 # 16-bit ADC + +# Initialise the ADC using the default mode (use default I2C address) +# Set this to ADS1015 or ADS1115 depending on the ADC you are using! +adc = ADS1x15(ic=ADS1115) + +# Read channel 0 in single-ended mode, +/-4.096V, 250sps +volts = adc.readADCSingleEnded(0, 4096, 250) / 1000 + +# To read channel 3 in single-ended mode, +/- 1.024V, 860 sps use: +# volts = adc.readADCSingleEnded(3, 1024, 860) + +print "%.6f" % (volts) From 19dbc7ff11a48987eeaaf0f2b32361781e7250cd Mon Sep 17 00:00:00 2001 From: KTOWN Date: Fri, 19 Apr 2013 11:38:32 +0200 Subject: [PATCH 24/79] Reverted to old U16/S16 functions --- Adafruit_I2C/Adafruit_I2C.py | 46 +++++++++++++++++++++++++++--------- 1 file changed, 35 insertions(+), 11 deletions(-) diff --git a/Adafruit_I2C/Adafruit_I2C.py b/Adafruit_I2C/Adafruit_I2C.py index 77f3795f..926407c7 100755 --- a/Adafruit_I2C/Adafruit_I2C.py +++ b/Adafruit_I2C/Adafruit_I2C.py @@ -117,26 +117,50 @@ def readS8(self, reg): def readU16(self, reg): "Reads an unsigned 16-bit value from the I2C device" try: - result = self.bus.read_word_data(self.address, reg) - if self.debug: - print ("I2C: Device 0x%02X returned 0x%04X from reg 0x%02X" % - (self.address, result & 0xFFFF, reg)) + hibyte = self.readU8(reg) + lobyte = self.readU8(reg+1) + result = (hibyte << 8) + lobyte + if (self.debug): + print "I2C: Device 0x%02X returned 0x%04X from reg 0x%02X" % (self.address, result & 0xFFFF, reg) return result except IOError, err: - return self.errMsg() + return self.errMsg(); def readS16(self, reg): "Reads a signed 16-bit value from the I2C device" try: - result = self.bus.read_word_data(self.address, reg) - if result > 32767: result -= 65536 - if self.debug: - print ("I2C: Device 0x%02X returned 0x%04X from reg 0x%02X" % - (self.address, result & 0xFFFF, reg)) + hibyte = self.readS8(reg) + lobyte = self.readU8(reg+1) + result = (hibyte << 8) + lobyte + if (self.debug): + print "I2C: Device 0x%02X returned 0x%04X from reg 0x%02X" % (self.address, result & 0xFFFF, reg) return result except IOError, err: - return self.errMsg() + return self.errMsg(); + def readU16Rev(self, reg): + "Reads an unsigned 16-bit value from the I2C device with rev byte order" + try: + lobyte = self.readU8(reg) + hibyte = self.readU8(reg+1) + result = (hibyte << 8) + lobyte + if (self.debug): + print "I2C: Device 0x%02X returned 0x%04X from reg 0x%02X" % (self.address, result & 0xFFFF, reg) + return result + except IOError, err: + return self.errMsg(); + + def readS16Rev(self, reg): + "Reads a signed 16-bit value from the I2C device with rev byte order" + try: + lobyte = self.readS8(reg) + hibyte = self.readU8(reg+1) + result = (hibyte << 8) + lobyte + if (self.debug): + print "I2C: Device 0x%02X returned 0x%04X from reg 0x%02X" % (self.address, result & 0xFFFF, reg) + return result + except IOError, err: + return self.errMsg(); if __name__ == '__main__': try: From d32312353a5c978a5ea50f6ad98711bb5045ee2b Mon Sep 17 00:00:00 2001 From: KTOWN Date: Fri, 19 Apr 2013 11:38:55 +0200 Subject: [PATCH 25/79] Fixed value typo --- Adafruit_BMP085/Adafruit_BMP085.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Adafruit_BMP085/Adafruit_BMP085.py b/Adafruit_BMP085/Adafruit_BMP085.py index 191be94d..87db0fb6 100755 --- a/Adafruit_BMP085/Adafruit_BMP085.py +++ b/Adafruit_BMP085/Adafruit_BMP085.py @@ -165,6 +165,7 @@ def readPressure(self): UP = 23843 self._cal_AC6 = 23153 self._cal_AC5 = 32757 + self._cal_MB = -32768; self._cal_MC = -8711 self._cal_MD = 2868 self._cal_B1 = 6190 @@ -197,6 +198,7 @@ def readPressure(self): print "DBG: B6 = %d" % (B6) print "DBG: X1 = %d" % (X1) print "DBG: X2 = %d" % (X2) + print "DBG: X3 = %d" % (X3) print "DBG: B3 = %d" % (B3) X1 = (self._cal_AC3 * B6) >> 13 @@ -207,6 +209,7 @@ def readPressure(self): if (self.debug): print "DBG: X1 = %d" % (X1) print "DBG: X2 = %d" % (X2) + print "DBG: X3 = %d" % (X3) print "DBG: B4 = %d" % (B4) print "DBG: B7 = %d" % (B7) @@ -215,9 +218,12 @@ def readPressure(self): else: p = (B7 / B4) * 2 + if (self.debug): + print "DBG: X1 = %d" % (X1) + X1 = (p >> 8) * (p >> 8) X1 = (X1 * 3038) >> 16 - X2 = (-7375 * p) >> 16 + X2 = (-7357 * p) >> 16 if (self.debug): print "DBG: p = %d" % (p) print "DBG: X1 = %d" % (X1) From baccabb86cbb4d09c378fa06eb0db7e1cf002ee0 Mon Sep 17 00:00:00 2001 From: Kevin Townsend Date: Fri, 19 Apr 2013 12:41:53 +0300 Subject: [PATCH 26/79] Removed trailing semis (crusty C programmer!) --- Adafruit_I2C/Adafruit_I2C.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Adafruit_I2C/Adafruit_I2C.py b/Adafruit_I2C/Adafruit_I2C.py index 926407c7..3423461d 100755 --- a/Adafruit_I2C/Adafruit_I2C.py +++ b/Adafruit_I2C/Adafruit_I2C.py @@ -124,7 +124,7 @@ def readU16(self, reg): print "I2C: Device 0x%02X returned 0x%04X from reg 0x%02X" % (self.address, result & 0xFFFF, reg) return result except IOError, err: - return self.errMsg(); + return self.errMsg() def readS16(self, reg): "Reads a signed 16-bit value from the I2C device" @@ -136,7 +136,7 @@ def readS16(self, reg): print "I2C: Device 0x%02X returned 0x%04X from reg 0x%02X" % (self.address, result & 0xFFFF, reg) return result except IOError, err: - return self.errMsg(); + return self.errMsg() def readU16Rev(self, reg): "Reads an unsigned 16-bit value from the I2C device with rev byte order" @@ -148,7 +148,7 @@ def readU16Rev(self, reg): print "I2C: Device 0x%02X returned 0x%04X from reg 0x%02X" % (self.address, result & 0xFFFF, reg) return result except IOError, err: - return self.errMsg(); + return self.errMsg() def readS16Rev(self, reg): "Reads a signed 16-bit value from the I2C device with rev byte order" @@ -160,7 +160,7 @@ def readS16Rev(self, reg): print "I2C: Device 0x%02X returned 0x%04X from reg 0x%02X" % (self.address, result & 0xFFFF, reg) return result except IOError, err: - return self.errMsg(); + return self.errMsg() if __name__ == '__main__': try: From e28539734dfbd6965395f0f0478ecad44ca0eaea Mon Sep 17 00:00:00 2001 From: Ken Bell Date: Thu, 2 May 2013 21:09:51 -0700 Subject: [PATCH 27/79] Update Adafruit_CharLCDPlate.py Setting read/write on wrong bit in GPIOB. Bit 7 from display is in bit 1 of GPIOB. Need to set/clear correct bit in IODIRB. --- Adafruit_CharLCDPlate/Adafruit_CharLCDPlate.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Adafruit_CharLCDPlate/Adafruit_CharLCDPlate.py b/Adafruit_CharLCDPlate/Adafruit_CharLCDPlate.py index 06b9300c..02fd782d 100644 --- a/Adafruit_CharLCDPlate/Adafruit_CharLCDPlate.py +++ b/Adafruit_CharLCDPlate/Adafruit_CharLCDPlate.py @@ -82,7 +82,7 @@ def __init__(self, busnum=-1, addr=0x20, debug=False): # I2C is relatively slow. MCP output port states are cached # so we don't need to constantly poll-and-change bit states. - self.porta, self.portb, self.ddrb = 0, 0, 0b00010000 + self.porta, self.portb, self.ddrb = 0, 0, 0b00000010 # Set MCP23017 IOCON register to Bank 0 with sequential operation. # If chip is already set for Bank 0, this will just write to OLATB, @@ -187,7 +187,7 @@ def write(self, value, char_mode=False): """ Send command/data to LCD """ # If pin D7 is in input state, poll LCD busy flag until clear. - if self.ddrb & 0b00010000: + if self.ddrb & 0b00000010: lo = (self.portb & 0b00000001) | 0b01000000 hi = lo | 0b00100000 # E=1 (strobe) self.i2c.bus.write_byte_data( @@ -204,7 +204,7 @@ def write(self, value, char_mode=False): self.portb = lo # Polling complete, change D7 pin to output - self.ddrb &= 0b11101111 + self.ddrb &= 0b11111101 self.i2c.bus.write_byte_data(self.i2c.address, self.MCP23017_IODIRB, self.ddrb) @@ -249,7 +249,7 @@ def write(self, value, char_mode=False): # If a poll-worthy instruction was issued, reconfigure D7 # pin as input to indicate need for polling on next call. if (not char_mode) and (value in self.pollables): - self.ddrb |= 0b00010000 + self.ddrb |= 0b00000010 self.i2c.bus.write_byte_data(self.i2c.address, self.MCP23017_IODIRB, self.ddrb) From d1a04873ec9cf0a72c58ec26111b902a0aea7542 Mon Sep 17 00:00:00 2001 From: Justin Cooper Date: Mon, 6 May 2013 11:16:05 -0500 Subject: [PATCH 28/79] Add Adafruit TCS34725 Breakout Code and Example --- Adafruit_TCS34725/Adafruit_I2C.py | 170 ++++++++++++++ Adafruit_TCS34725/Adafruit_TCS34725.py | 220 ++++++++++++++++++ .../Adafruit_TCS34725_Example.py | 23 ++ 3 files changed, 413 insertions(+) create mode 100644 Adafruit_TCS34725/Adafruit_I2C.py create mode 100644 Adafruit_TCS34725/Adafruit_TCS34725.py create mode 100644 Adafruit_TCS34725/Adafruit_TCS34725_Example.py diff --git a/Adafruit_TCS34725/Adafruit_I2C.py b/Adafruit_TCS34725/Adafruit_I2C.py new file mode 100644 index 00000000..3423461d --- /dev/null +++ b/Adafruit_TCS34725/Adafruit_I2C.py @@ -0,0 +1,170 @@ +#!/usr/bin/python + +import smbus + +# =========================================================================== +# Adafruit_I2C Class +# =========================================================================== + +class Adafruit_I2C : + + @staticmethod + def getPiRevision(): + "Gets the version number of the Raspberry Pi board" + # Courtesy quick2wire-python-api + # https://github.com/quick2wire/quick2wire-python-api + try: + with open('/proc/cpuinfo','r') as f: + for line in f: + if line.startswith('Revision'): + return 1 if line.rstrip()[-1] in ['1','2'] else 2 + except: + return 0 + + @staticmethod + def getPiI2CBusNumber(): + # Gets the I2C bus number /dev/i2c# + return 1 if Adafruit_I2C.getPiRevision() > 1 else 0 + + def __init__(self, address, busnum=-1, debug=False): + self.address = address + # By default, the correct I2C bus is auto-detected using /proc/cpuinfo + # Alternatively, you can hard-code the bus version below: + # self.bus = smbus.SMBus(0); # Force I2C0 (early 256MB Pi's) + # self.bus = smbus.SMBus(1); # Force I2C1 (512MB Pi's) + self.bus = smbus.SMBus( + busnum if busnum >= 0 else Adafruit_I2C.getPiI2CBusNumber()) + self.debug = debug + + def reverseByteOrder(self, data): + "Reverses the byte order of an int (16-bit) or long (32-bit) value" + # Courtesy Vishal Sapre + byteCount = len(hex(data)[2:].replace('L','')[::2]) + val = 0 + for i in range(byteCount): + val = (val << 8) | (data & 0xff) + data >>= 8 + return val + + def errMsg(self): + print "Error accessing 0x%02X: Check your I2C address" % self.address + return -1 + + def write8(self, reg, value): + "Writes an 8-bit value to the specified register/address" + try: + self.bus.write_byte_data(self.address, reg, value) + if self.debug: + print "I2C: Wrote 0x%02X to register 0x%02X" % (value, reg) + except IOError, err: + return self.errMsg() + + def write16(self, reg, value): + "Writes a 16-bit value to the specified register/address pair" + try: + self.bus.write_word_data(self.address, reg, value) + if self.debug: + print ("I2C: Wrote 0x%02X to register pair 0x%02X,0x%02X" % + (value, reg, reg+1)) + except IOError, err: + return self.errMsg() + + def writeList(self, reg, list): + "Writes an array of bytes using I2C format" + try: + if self.debug: + print "I2C: Writing list to register 0x%02X:" % reg + print list + self.bus.write_i2c_block_data(self.address, reg, list) + except IOError, err: + return self.errMsg() + + def readList(self, reg, length): + "Read a list of bytes from the I2C device" + try: + results = self.bus.read_i2c_block_data(self.address, reg, length) + if self.debug: + print ("I2C: Device 0x%02X returned the following from reg 0x%02X" % + (self.address, reg)) + print results + return results + except IOError, err: + return self.errMsg() + + def readU8(self, reg): + "Read an unsigned byte from the I2C device" + try: + result = self.bus.read_byte_data(self.address, reg) + if self.debug: + print ("I2C: Device 0x%02X returned 0x%02X from reg 0x%02X" % + (self.address, result & 0xFF, reg)) + return result + except IOError, err: + return self.errMsg() + + def readS8(self, reg): + "Reads a signed byte from the I2C device" + try: + result = self.bus.read_byte_data(self.address, reg) + if result > 127: result -= 256 + if self.debug: + print ("I2C: Device 0x%02X returned 0x%02X from reg 0x%02X" % + (self.address, result & 0xFF, reg)) + return result + except IOError, err: + return self.errMsg() + + def readU16(self, reg): + "Reads an unsigned 16-bit value from the I2C device" + try: + hibyte = self.readU8(reg) + lobyte = self.readU8(reg+1) + result = (hibyte << 8) + lobyte + if (self.debug): + print "I2C: Device 0x%02X returned 0x%04X from reg 0x%02X" % (self.address, result & 0xFFFF, reg) + return result + except IOError, err: + return self.errMsg() + + def readS16(self, reg): + "Reads a signed 16-bit value from the I2C device" + try: + hibyte = self.readS8(reg) + lobyte = self.readU8(reg+1) + result = (hibyte << 8) + lobyte + if (self.debug): + print "I2C: Device 0x%02X returned 0x%04X from reg 0x%02X" % (self.address, result & 0xFFFF, reg) + return result + except IOError, err: + return self.errMsg() + + def readU16Rev(self, reg): + "Reads an unsigned 16-bit value from the I2C device with rev byte order" + try: + lobyte = self.readU8(reg) + hibyte = self.readU8(reg+1) + result = (hibyte << 8) + lobyte + if (self.debug): + print "I2C: Device 0x%02X returned 0x%04X from reg 0x%02X" % (self.address, result & 0xFFFF, reg) + return result + except IOError, err: + return self.errMsg() + + def readS16Rev(self, reg): + "Reads a signed 16-bit value from the I2C device with rev byte order" + try: + lobyte = self.readS8(reg) + hibyte = self.readU8(reg+1) + result = (hibyte << 8) + lobyte + if (self.debug): + print "I2C: Device 0x%02X returned 0x%04X from reg 0x%02X" % (self.address, result & 0xFFFF, reg) + return result + except IOError, err: + return self.errMsg() + +if __name__ == '__main__': + try: + bus = Adafruit_I2C(address=0) + print "Default I2C bus is accessible" + except: + print "Error accessing default I2C bus" diff --git a/Adafruit_TCS34725/Adafruit_TCS34725.py b/Adafruit_TCS34725/Adafruit_TCS34725.py new file mode 100644 index 00000000..04cc9356 --- /dev/null +++ b/Adafruit_TCS34725/Adafruit_TCS34725.py @@ -0,0 +1,220 @@ +#!/usr/bin/python + +import time +from Adafruit_I2C import Adafruit_I2C + +# =========================================================================== +# TCS3472 Class +# =========================================================================== + + +class TCS34725: + i2c = None + + __TCS34725_ADDRESS = 0x29 + __TCS34725_ID = 0x12 # 0x44 = TCS34721/TCS34725, 0x4D = TCS34723/TCS34727 + + __TCS34725_COMMAND_BIT = 0x80 + + __TCS34725_ENABLE = 0x00 + __TCS34725_ENABLE_AIEN = 0x10 # RGBC Interrupt Enable + __TCS34725_ENABLE_WEN = 0x08 # Wait enable - Writing 1 activates the wait timer + __TCS34725_ENABLE_AEN = 0x02 # RGBC Enable - Writing 1 actives the ADC, 0 disables it + __TCS34725_ENABLE_PON = 0x01 # Power on - Writing 1 activates the internal oscillator, 0 disables it + __TCS34725_ATIME = 0x01 # Integration time + __TCS34725_WTIME = 0x03 # Wait time (if TCS34725_ENABLE_WEN is asserted) + __TCS34725_WTIME_2_4MS = 0xFF # WLONG0 = 2.4ms WLONG1 = 0.029s + __TCS34725_WTIME_204MS = 0xAB # WLONG0 = 204ms WLONG1 = 2.45s + __TCS34725_WTIME_614MS = 0x00 # WLONG0 = 614ms WLONG1 = 7.4s + __TCS34725_AILTL = 0x04 # Clear channel lower interrupt threshold + __TCS34725_AILTH = 0x05 + __TCS34725_AIHTL = 0x06 # Clear channel upper interrupt threshold + __TCS34725_AIHTH = 0x07 + __TCS34725_PERS = 0x0C # Persistence register - basic SW filtering mechanism for interrupts + __TCS34725_PERS_NONE = 0b0000 # Every RGBC cycle generates an interrupt + __TCS34725_PERS_1_CYCLE = 0b0001 # 1 clean channel value outside threshold range generates an interrupt + __TCS34725_PERS_2_CYCLE = 0b0010 # 2 clean channel values outside threshold range generates an interrupt + __TCS34725_PERS_3_CYCLE = 0b0011 # 3 clean channel values outside threshold range generates an interrupt + __TCS34725_PERS_5_CYCLE = 0b0100 # 5 clean channel values outside threshold range generates an interrupt + __TCS34725_PERS_10_CYCLE = 0b0101 # 10 clean channel values outside threshold range generates an interrupt + __TCS34725_PERS_15_CYCLE = 0b0110 # 15 clean channel values outside threshold range generates an interrupt + __TCS34725_PERS_20_CYCLE = 0b0111 # 20 clean channel values outside threshold range generates an interrupt + __TCS34725_PERS_25_CYCLE = 0b1000 # 25 clean channel values outside threshold range generates an interrupt + __TCS34725_PERS_30_CYCLE = 0b1001 # 30 clean channel values outside threshold range generates an interrupt + __TCS34725_PERS_35_CYCLE = 0b1010 # 35 clean channel values outside threshold range generates an interrupt + __TCS34725_PERS_40_CYCLE = 0b1011 # 40 clean channel values outside threshold range generates an interrupt + __TCS34725_PERS_45_CYCLE = 0b1100 # 45 clean channel values outside threshold range generates an interrupt + __TCS34725_PERS_50_CYCLE = 0b1101 # 50 clean channel values outside threshold range generates an interrupt + __TCS34725_PERS_55_CYCLE = 0b1110 # 55 clean channel values outside threshold range generates an interrupt + __TCS34725_PERS_60_CYCLE = 0b1111 # 60 clean channel values outside threshold range generates an interrupt + __TCS34725_CONFIG = 0x0D + __TCS34725_CONFIG_WLONG = 0x02 # Choose between short and long (12x) wait times via TCS34725_WTIME + __TCS34725_CONTROL = 0x0F # Set the gain level for the sensor + __TCS34725_ID = 0x12 # 0x44 = TCS34721/TCS34725, 0x4D = TCS34723/TCS34727 + __TCS34725_STATUS = 0x13 + __TCS34725_STATUS_AINT = 0x10 # RGBC Clean channel interrupt + __TCS34725_STATUS_AVALID = 0x01 # Indicates that the RGBC channels have completed an integration cycle + + __TCS34725_CDATAL = 0x14 # Clear channel data + __TCS34725_CDATAH = 0x15 + __TCS34725_RDATAL = 0x16 # Red channel data + __TCS34725_RDATAH = 0x17 + __TCS34725_GDATAL = 0x18 # Green channel data + __TCS34725_GDATAH = 0x19 + __TCS34725_BDATAL = 0x1A # Blue channel data + __TCS34725_BDATAH = 0x1B + + __TCS34725_INTEGRATIONTIME_2_4MS = 0xFF # 2.4ms - 1 cycle - Max Count: 1024 + __TCS34725_INTEGRATIONTIME_24MS = 0xF6 # 24ms - 10 cycles - Max Count: 10240 + __TCS34725_INTEGRATIONTIME_50MS = 0xEB # 50ms - 20 cycles - Max Count: 20480 + __TCS34725_INTEGRATIONTIME_101MS = 0xD5 # 101ms - 42 cycles - Max Count: 43008 + __TCS34725_INTEGRATIONTIME_154MS = 0xC0 # 154ms - 64 cycles - Max Count: 65535 + __TCS34725_INTEGRATIONTIME_700MS = 0x00 # 700ms - 256 cycles - Max Count: 65535 + + __TCS34725_GAIN_1X = 0x00 # No gain + __TCS34725_GAIN_4X = 0x01 # 2x gain + __TCS34725_GAIN_16X = 0x02 # 16x gain + __TCS34725_GAIN_60X = 0x03 # 60x gain + + __integrationTimeDelay = { + 0xFF: 0.0024, # 2.4ms - 1 cycle - Max Count: 1024 + 0xF6: 0.024, # 24ms - 10 cycles - Max Count: 10240 + 0xEB: 0.050, # 50ms - 20 cycles - Max Count: 20480 + 0xD5: 0.101, # 101ms - 42 cycles - Max Count: 43008 + 0xC0: 0.154, # 154ms - 64 cycles - Max Count: 65535 + 0x00: 0.700 # 700ms - 256 cycles - Max Count: 65535 + } + + # Private Methods + def __readU8(self, reg): + return self.i2c.readU8(self.__TCS34725_COMMAND_BIT | reg) + + def __readU16Rev(self, reg): + return self.i2c.readU16Rev(self.__TCS34725_COMMAND_BIT | reg) + + def __write8(self, reg, value): + self.i2c.write8(self.__TCS34725_COMMAND_BIT | reg, value & 0xff) + + # Constructor + def __init__(self, address=0x29, debug=False, integrationTime=0xFF, gain=0x01): + self.i2c = Adafruit_I2C(address) + + self.address = address + self.debug = debug + self.integrationTime = integrationTime + self.initialize(integrationTime, gain) + + def initialize(self, integrationTime, gain): + "Initializes I2C and configures the sensor (call this function before \ + doing anything else)" + # Make sure we're actually connected + result = self.__readU8(self.__TCS34725_ID) + if (result != 0x44): + return -1 + + # Set default integration time and gain + self.setIntegrationTime(integrationTime) + self.setGain(gain) + + # Note: by default, the device is in power down mode on bootup + self.enable() + + def enable(self): + self.__write8(self.__TCS34725_ENABLE, self.__TCS34725_ENABLE_PON) + time.sleep(0.01) + self.__write8(self.__TCS34725_ENABLE, (self.__TCS34725_ENABLE_PON | self.__TCS34725_ENABLE_AEN)) + + def disable(self): + reg = 0 + reg = self.__readU8(self.__TCS34725_ENABLE) + self.__write8(self.__TCS34725_ENABLE, (reg & ~(self.__TCS34725_ENABLE_PON | self.__TCS34725_ENABLE_AEN))) + + def setIntegrationTime(self, integrationTime): + "Sets the integration time for the TC34725" + self.integrationTime = integrationTime + + self.__write8(self.__TCS34725_ATIME, integrationTime) + + def getIntegrationTime(self): + return self.__readU8(self.__TCS34725_ATIME) + + def setGain(self, gain): + "Adjusts the gain on the TCS34725 (adjusts the sensitivity to light)" + self.__write8(self.__TCS34725_CONTROL, gain) + + def getGain(self): + return self.__readU8(self.__TCS34725_CONTROL) + + def getRawData(self): + "Reads the raw red, green, blue and clear channel values" + + color = {} + + color["r"] = self.__readU16Rev(self.__TCS34725_RDATAL) + color["b"] = self.__readU16Rev(self.__TCS34725_BDATAL) + color["g"] = self.__readU16Rev(self.__TCS34725_GDATAL) + color["c"] = self.__readU16Rev(self.__TCS34725_CDATAL) + + # Set a delay for the integration time + delay = self.__integrationTimeDelay.get(self.integrationTime) + time.sleep(delay) + + return color + + def setInterrupt(self, int): + r = self.__readU8(self.__TCS34725_ENABLE) + + if (int): + r |= self.__TCS34725_ENABLE_AIEN + else: + r &= ~self.__TCS34725_ENABLE_AIEN + + self.__write8(self.__TCS34725_ENABLE, r) + + def clearInterrupt(self): + self.i2c.write8(0x66 & 0xff) + + def setIntLimits(self, low, high): + self.i2c.write8(0x04, low & 0xFF) + self.i2c.write8(0x05, low >> 8) + self.i2c.write8(0x06, high & 0xFF) + self.i2c.write8(0x07, high >> 8) + + #Static Utility Methods + @staticmethod + def calculateColorTemperature(rgb): + "Converts the raw R/G/B values to color temperature in degrees Kelvin" + + if not isinstance(rgb, dict): + raise ValueError('calculateColorTemperature expects dict as parameter') + + # 1. Map RGB values to their XYZ counterparts. + # Based on 6500K fluorescent, 3000K fluorescent + # and 60W incandescent values for a wide range. + # Note: Y = Illuminance or lux + X = (-0.14282 * rgb['r']) + (1.54924 * rgb['g']) + (-0.95641 * rgb['b']) + Y = (-0.32466 * rgb['r']) + (1.57837 * rgb['g']) + (-0.73191 * rgb['b']) + Z = (-0.68202 * rgb['r']) + (0.77073 * rgb['g']) + ( 0.56332 * rgb['b']) + + # 2. Calculate the chromaticity co-ordinates + xc = (X) / (X + Y + Z) + yc = (Y) / (X + Y + Z) + + # 3. Use McCamy's formula to determine the CCT + n = (xc - 0.3320) / (0.1858 - yc) + + # Calculate the final CCT + cct = (449.0 * (n ** 3.0)) + (3525.0 *(n ** 2.0)) + (6823.3 * n) + 5520.33 + + return int(cct) + + @staticmethod + def calculateLux(rgb): + "Converts the raw R/G/B values to color temperature in degrees Kelvin" + + if not isinstance(rgb, dict): + raise ValueError('calculateLux expects dict as parameter') + + illuminance = (-0.32466 * rgb['r']) + (1.57837 * rgb['g']) + (-0.73191 * rgb['b']) + + return int(illuminance) diff --git a/Adafruit_TCS34725/Adafruit_TCS34725_Example.py b/Adafruit_TCS34725/Adafruit_TCS34725_Example.py new file mode 100644 index 00000000..63b35977 --- /dev/null +++ b/Adafruit_TCS34725/Adafruit_TCS34725_Example.py @@ -0,0 +1,23 @@ +#!/usr/bin/python +from time import sleep +from Adafruit_TCS34725 import TCS34725 + +# =========================================================================== +# Example Code +# =========================================================================== + +# Initialize the TCS34725 and use default integration time and gain +# tcs34725 = TCS34725(debug=True) +tcs = TCS34725(integrationTime=0xEB, gain=0x01) +tcs.setInterrupt(False) +sleep(1) + +rgb = tcs.getRawData() +colorTemp = tcs.calculateColorTemperature(rgb) +lux = tcs.calculateLux(rgb) +print rgb +print colorTemp +print lux +tcs.setInterrupt(True) +sleep(1) +tcs.disable() From 28de85223893075ccd8f5cbd852506ec5f5f5769 Mon Sep 17 00:00:00 2001 From: Jason Travis Date: Fri, 17 May 2013 12:55:49 -0700 Subject: [PATCH 29/79] Update Adafruit_I2C to use new-style classes --- Adafruit_I2C/Adafruit_I2C.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Adafruit_I2C/Adafruit_I2C.py b/Adafruit_I2C/Adafruit_I2C.py index 3423461d..6902a9d0 100755 --- a/Adafruit_I2C/Adafruit_I2C.py +++ b/Adafruit_I2C/Adafruit_I2C.py @@ -6,7 +6,7 @@ # Adafruit_I2C Class # =========================================================================== -class Adafruit_I2C : +class Adafruit_I2C(object): @staticmethod def getPiRevision(): From 69bb1f2694bb1fd4663bada4a226c4b652da11a8 Mon Sep 17 00:00:00 2001 From: KTOWN Date: Mon, 19 Aug 2013 17:00:49 +0200 Subject: [PATCH 30/79] Removed readU16Rev, readS16Rev --- Adafruit_I2C/Adafruit_I2C.py | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/Adafruit_I2C/Adafruit_I2C.py b/Adafruit_I2C/Adafruit_I2C.py index 3423461d..8a0bd885 100755 --- a/Adafruit_I2C/Adafruit_I2C.py +++ b/Adafruit_I2C/Adafruit_I2C.py @@ -138,30 +138,6 @@ def readS16(self, reg): except IOError, err: return self.errMsg() - def readU16Rev(self, reg): - "Reads an unsigned 16-bit value from the I2C device with rev byte order" - try: - lobyte = self.readU8(reg) - hibyte = self.readU8(reg+1) - result = (hibyte << 8) + lobyte - if (self.debug): - print "I2C: Device 0x%02X returned 0x%04X from reg 0x%02X" % (self.address, result & 0xFFFF, reg) - return result - except IOError, err: - return self.errMsg() - - def readS16Rev(self, reg): - "Reads a signed 16-bit value from the I2C device with rev byte order" - try: - lobyte = self.readS8(reg) - hibyte = self.readU8(reg+1) - result = (hibyte << 8) + lobyte - if (self.debug): - print "I2C: Device 0x%02X returned 0x%04X from reg 0x%02X" % (self.address, result & 0xFFFF, reg) - return result - except IOError, err: - return self.errMsg() - if __name__ == '__main__': try: bus = Adafruit_I2C(address=0) From 6ce7476dd0a9b103bd4e00b0653e1c8a03787ef5 Mon Sep 17 00:00:00 2001 From: KTOWN Date: Mon, 19 Aug 2013 17:02:04 +0200 Subject: [PATCH 31/79] Updated readU16/readS16 for correct 16-bit reads --- Adafruit_I2C/Adafruit_I2C.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/Adafruit_I2C/Adafruit_I2C.py b/Adafruit_I2C/Adafruit_I2C.py index 8a0bd885..0c4a7d98 100755 --- a/Adafruit_I2C/Adafruit_I2C.py +++ b/Adafruit_I2C/Adafruit_I2C.py @@ -117,9 +117,7 @@ def readS8(self, reg): def readU16(self, reg): "Reads an unsigned 16-bit value from the I2C device" try: - hibyte = self.readU8(reg) - lobyte = self.readU8(reg+1) - result = (hibyte << 8) + lobyte + result = self.bus.read_word_data(self.address,reg) if (self.debug): print "I2C: Device 0x%02X returned 0x%04X from reg 0x%02X" % (self.address, result & 0xFFFF, reg) return result @@ -129,9 +127,7 @@ def readU16(self, reg): def readS16(self, reg): "Reads a signed 16-bit value from the I2C device" try: - hibyte = self.readS8(reg) - lobyte = self.readU8(reg+1) - result = (hibyte << 8) + lobyte + result = self.bus.read_word_data(self.address,reg) if (self.debug): print "I2C: Device 0x%02X returned 0x%04X from reg 0x%02X" % (self.address, result & 0xFFFF, reg) return result From 457b4d0ff8e0f928b95fa6d48e77e81aa97752cb Mon Sep 17 00:00:00 2001 From: KTOWN Date: Mon, 19 Aug 2013 18:46:40 +0200 Subject: [PATCH 32/79] More accurate altitude calculations --- Adafruit_BMP085/Adafruit_BMP085_example.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/Adafruit_BMP085/Adafruit_BMP085_example.py b/Adafruit_BMP085/Adafruit_BMP085_example.py index 5e0d0bef..e7143c8a 100755 --- a/Adafruit_BMP085/Adafruit_BMP085_example.py +++ b/Adafruit_BMP085/Adafruit_BMP085_example.py @@ -17,9 +17,19 @@ # bmp = BMP085(0x77, 3) # ULTRAHIRES Mode temp = bmp.readTemperature() + +# Read the current barometric pressure level pressure = bmp.readPressure() + +# To calculate altitude based on an estimated mean sea level pressure +# (1013.25 hPa) call the function as follows, but this won't be very accurate altitude = bmp.readAltitude() +# To specify a more accurate altitude, enter the correct mean sea level +# pressure level. For example, if the current pressure level is 1023.50 hPa +# enter 102350 since we include two decimal places in the integer value +# altitude = bmp.readAltitude(102350) + print "Temperature: %.2f C" % temp print "Pressure: %.2f hPa" % (pressure / 100.0) print "Altitude: %.2f" % altitude From 4c46868f527c794163abb696d9df965fe0f71c3a Mon Sep 17 00:00:00 2001 From: KTOWN Date: Mon, 19 Aug 2013 21:19:54 +0200 Subject: [PATCH 33/79] Labeled values --- Adafruit_TCS34725/Adafruit_TCS34725_Example.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Adafruit_TCS34725/Adafruit_TCS34725_Example.py b/Adafruit_TCS34725/Adafruit_TCS34725_Example.py index 63b35977..d76ba40a 100644 --- a/Adafruit_TCS34725/Adafruit_TCS34725_Example.py +++ b/Adafruit_TCS34725/Adafruit_TCS34725_Example.py @@ -16,8 +16,8 @@ colorTemp = tcs.calculateColorTemperature(rgb) lux = tcs.calculateLux(rgb) print rgb -print colorTemp -print lux +print "Color Temperature: %d K" % colorTemp +print "Luminosity: %d lux" % lux tcs.setInterrupt(True) sleep(1) tcs.disable() From 3c5d3af876fa06c3a762b7e1a1bb6b624899dbee Mon Sep 17 00:00:00 2001 From: KTOWN Date: Tue, 20 Aug 2013 13:11:09 +0200 Subject: [PATCH 34/79] Fixed bug with bits 8-15, improved sample code --- Adafruit_MCP230xx/Adafruit_MCP230xx.py | 330 ++++++++++++------------- 1 file changed, 155 insertions(+), 175 deletions(-) diff --git a/Adafruit_MCP230xx/Adafruit_MCP230xx.py b/Adafruit_MCP230xx/Adafruit_MCP230xx.py index 19bc3721..5f93b886 100755 --- a/Adafruit_MCP230xx/Adafruit_MCP230xx.py +++ b/Adafruit_MCP230xx/Adafruit_MCP230xx.py @@ -1,193 +1,170 @@ #!/usr/bin/python -# Copyright 2012 Daniel Berlin (with some changes by Limor Fried, -# Adafruit Industries) - -# Permission is hereby granted, free of charge, to any person obtaining a -# copy of this software and associated documentation files (the "Software"), -# to deal in the Software without restriction, including without limitation -# the rights to use, copy, modify, merge, publish, distribute, sublicense, -# and/or sell copies of the Software, and to permit persons to whom the -# Software is furnished to do so, subject to the following conditions: - -# The above copyright notice and this permission notice shall be included -# in all copies or substantial portions of the Software. +# Copyright 2012 Daniel Berlin (with some changes by Adafruit Industries/Limor Fried) +# +# Permission is hereby granted, free of charge, to any person obtaining a copy of +# this software and associated documentation files (the "Software"), to deal MCP230XX_GPIO(1, 0xin +# the Software without restriction, including without limitation the rights to +# use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies +# of the Software, and to permit persons to whom the Software is furnished to do +# so, subject to the following conditions: + +# The above copyright notice and this permission notice shall be included in all +# copies or substantial portions of the Software. # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -# DEALINGS IN THE SOFTWARE. +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION 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 Adafruit_I2C import Adafruit_I2C - -class Adafruit_MCP230XX(Adafruit_I2C): - - INPUT = True - OUTPUT = False - - MCP23017_IODIRA = 0x00 - MCP23017_IODIRB = 0x01 - MCP23017_GPPUA = 0x0C - MCP23017_GPPUB = 0x0D - MCP23017_GPIOA = 0x12 - MCP23017_GPIOB = 0x13 - MCP23017_OLATA = 0x14 - MCP23017_OLATB = 0x15 - MCP23008_IODIR = 0x00 - MCP23008_GPIO = 0x09 - MCP23008_GPPU = 0x06 - MCP23008_OLAT = 0x0A - - - def __init__(self, address, num_gpios=8, busnum=-1, debug=False): - - assert 0 < num_gpios < 17, "Number of GPIOs must be between 1 and 16" - - self.i2c = Adafruit_I2C(address, busnum, debug) +import smbus +import time + +MCP23017_IODIRA = 0x00 +MCP23017_IODIRB = 0x01 +MCP23017_GPIOA = 0x12 +MCP23017_GPIOB = 0x13 +MCP23017_GPPUA = 0x0C +MCP23017_GPPUB = 0x0D +MCP23017_OLATA = 0x14 +MCP23017_OLATB = 0x15 +MCP23008_GPIOA = 0x09 +MCP23008_GPPUA = 0x06 +MCP23008_OLATA = 0x0A + +class Adafruit_MCP230XX(object): + OUTPUT = 0 + INPUT = 1 + + def __init__(self, address, num_gpios): + assert num_gpios >= 0 and num_gpios <= 16, "Number of GPIOs must be between 0 and 16" + self.i2c = Adafruit_I2C(address=address) + self.address = address self.num_gpios = num_gpios - self.pullups = 0 - # Set default pin values -- all inputs with pull-ups disabled. - # Current OLAT (output) value is polled, not set. + # set defaults if num_gpios <= 8: - self.direction = 0xFF - self.i2c.write8(self.MCP23008_IODIR, self.direction) - self.i2c.write8(self.MCP23008_GPPU , self.pullups) - self.outputvalue = self.i2c.readU8(self.MCP23008_OLAT) - else: - self.direction = 0xFFFF - self.i2c.write16(self.MCP23017_IODIRA, self.direction) - self.i2c.write16(self.MCP23017_GPPUA , self.pullups) - self.outputvalue = self.i2c.readU16(self.MCP23017_OLATA) - - - # Set single pin to either INPUT or OUTPUT mode - def config(self, pin, mode): - - assert 0 <= pin < self.num_gpios, "Pin number %s is invalid, must be between 0 and %s" % (pin, self.num_gpios-1) + self.i2c.write8(MCP23017_IODIRA, 0xFF) # all inputs on port A + self.direction = self.i2c.readU8(MCP23017_IODIRA) + self.i2c.write8(MCP23008_GPPUA, 0x00) + elif num_gpios > 8 and num_gpios <= 16: + self.i2c.write8(MCP23017_IODIRA, 0xFF) # all inputs on port A + self.i2c.write8(MCP23017_IODIRB, 0xFF) # all inputs on port B + self.direction = self.i2c.readU8(MCP23017_IODIRA) + self.direction |= self.i2c.readU8(MCP23017_IODIRB) << 8 + self.i2c.write8(MCP23017_GPPUA, 0x00) + self.i2c.write8(MCP23017_GPPUB, 0x00) + + def _changebit(self, bitmap, bit, value): + assert value == 1 or value == 0, "Value is %s must be 1 or 0" % value + if value == 0: + return bitmap & ~(1 << bit) + elif value == 1: + return bitmap | (1 << bit) + + def _readandchangepin(self, port, pin, value, currvalue = None): + assert pin >= 0 and pin < self.num_gpios, "Pin number %s is invalid, only 0-%s are valid" % (pin, self.num_gpios) + #assert self.direction & (1 << pin) == 0, "Pin %s not set to output" % pin + if not currvalue: + currvalue = self.i2c.readU8(port) + newvalue = self._changebit(currvalue, pin, value) + self.i2c.write8(port, newvalue) + return newvalue - if mode is self.INPUT: self.direction |= (1 << pin) - else: self.direction &= ~(1 << pin) + def pullup(self, pin, value): if self.num_gpios <= 8: - self.i2c.write8(self.MCP23008_IODIR, self.direction) - elif pin < 8: - # Replace low bits (IODIRA) - self.i2c.write8(self.MCP23017_IODIRA, self.direction & 0xFF) - else: - # Replace high bits (IODIRB) - self.i2c.write8(self.MCP23017_IODIRB, self.direction >> 8) - - return self.direction - - - # Enable pull-up resistor on single input pin - def pullup(self, pin, enable, check=False): - - assert 0 <= pin < self.num_gpios, "Pin number %s is invalid, must be between 0 and %s" % (pin, self.num_gpios-1) - if check: - assert (self.direction & (1 << pin)) != 0, "Pin %s not set to input" % pin - - if enable: self.pullups |= (1 << pin) - else: self.pullups &= ~(1 << pin) + return self._readandchangepin(MCP23008_GPPUA, pin, value) + if self.num_gpios <= 16: + if (pin < 8): + return self._readandchangepin(MCP23017_GPPUA, pin, value) + else: + return self._readandchangepin(MCP23017_GPPUB, pin-8, value) << 8 + # Set pin to either input or output mode + def config(self, pin, mode): if self.num_gpios <= 8: - self.i2c.write8(self.MCP23008_GPPU, self.pullups) - elif pin < 8: - # Replace low bits (GPPUA) - self.i2c.write8(self.MCP23017_GPPUA, self.pullups & 0xFF) - else: - # Replace high bits (GPPUB) - self.i2c.write8(self.MCP23017_GPPUB, self.pullups >> 8) - - return self.pullups - - - # Read value from single input pin - def input(self, pin, check=True): + self.direction = self._readandchangepin(MCP23017_IODIRA, pin, mode) + if self.num_gpios <= 16: + if (pin < 8): + self.direction = self._readandchangepin(MCP23017_IODIRA, pin, mode) + else: + self.direction |= self._readandchangepin(MCP23017_IODIRB, pin-8, mode) << 8 - assert 0 <= pin < self.num_gpios, "Pin number %s is invalid, must be between 0 and %s" % (pin, self.num_gpios-1) - if check: - assert (self.direction & (1 << pin)) != 0, "Pin %s not set to input" % pin + return self.direction - if self.num_gpios <= 8: - value = self.i2c.readU8(self.MCP23008_GPIO) - return (value >> pin) & 1 - elif pin < 8: - # Read from low bits (GPIOA) - value = self.i2c.readU8(self.MCP23017_GPIOA) - return (value >> pin) & 1 - else: - # Read from high bits (GPIOB) - value = self.i2c.readU8(self.MCP23017_GPIOB) - return (value >> (pin - 8)) & 1 - - - # Write value to single output pin def output(self, pin, value): - assert 0 <= pin < self.num_gpios, "Pin number %s is invalid, must be between 0 and %s" % (pin, self.num_gpios-1) # assert self.direction & (1 << pin) == 0, "Pin %s not set to output" % pin - - if value: new = self.outputvalue | (1 << pin) - else: new = self.outputvalue & ~(1 << pin) - - # Only write if pin value has changed: - if new is not self.outputvalue: - self.outputvalue = new - if self.num_gpios <= 8: - self.i2c.write8(self.MCP23008_OLAT, new) - elif pin < 8: - # Write to low bits (OLATA) - self.i2c.write8(self.MCP23017_OLATA, new & 0xFF) + if self.num_gpios <= 8: + self.outputvalue = self._readandchangepin(MCP23008_GPIOA, pin, value, self.i2c.readU8(MCP23008_OLATA)) + if self.num_gpios <= 16: + if (pin < 8): + self.outputvalue = self._readandchangepin(MCP23017_GPIOA, pin, value, self.i2c.readU8(MCP23017_OLATA)) else: - # Write to high bits (OLATB) - self.i2c.write8(self.MCP23017_OLATB, new >> 8) - - return new - + self.outputvalue = self._readandchangepin(MCP23017_GPIOB, pin-8, value, self.i2c.readU8(MCP23017_OLATB)) << 8 -# The following two methods (inputAll and outputAll) neither assert -# inputs nor invoke the base class methods that handle I/O exceptions. -# The underlying smbus calls are invoked directly for expediency, the -# expectation being that any I2C access or address type errors have -# already been identified during initialization. + return self.outputvalue - # Read contiguous value from all input pins - def inputAll(self): - if self.num_gpios <= 8: - return self.i2c.bus.read_byte_data(self.i2c.address, - self.MCP23008_GPIO) - else: - return self.i2c.bus.read_word_data(self.i2c.address, - self.MCP23017_GPIOA) - - - # Write contiguous value to all output pins - def outputAll(self, value): - self.outputvalue = value - if self.num_gpios <= 8: - self.i2c.bus.write_byte_data(self.i2c.address, - self.MCP23008_OLAT, value) - else: - self.i2c.bus.write_word_data(self.i2c.address, - self.MCP23017_OLATA, value) + self.outputvalue = self._readandchangepin(MCP23017_IODIRA, pin, value, self.outputvalue) + return self.outputvalue + + def input(self, pin): + assert pin >= 0 and pin < self.num_gpios, "Pin number %s is invalid, only 0-%s are valid" % (pin, self.num_gpios) + assert self.direction & (1 << pin) != 0, "Pin %s not set to input" % pin + if self.num_gpios <= 8: + value = self.i2c.readU8(MCP23008_GPIOA) + elif self.num_gpios > 8 and self.num_gpios <= 16: + value = self.i2c.readU8(MCP23017_GPIOA) + value |= self.i2c.readU8(MCP23017_GPIOB) << 8 + return value & (1 << pin) + + def readU8(self): + result = self.i2c.readU8(MCP23008_OLATA) + return(result) + + def readS8(self): + result = self.i2c.readU8(MCP23008_OLATA) + if (result > 127): result -= 256 + return result + + def readU16(self): + assert self.num_gpios >= 16, "16bits required" + lo = self.i2c.readU8(MCP23017_OLATA) + hi = self.i2c.readU8(MCP23017_OLATB) + return((hi << 8) | lo) + + def readS16(self): + assert self.num_gpios >= 16, "16bits required" + lo = self.i2c.readU8(MCP23017_OLATA) + hi = self.i2c.readU8(MCP23017_OLATB) + if (hi > 127): hi -= 256 + return((hi << 8) | lo) + + def write8(self, value): + self.i2c.write8(MCP23008_OLATA, value) + + def write16(self, value): + assert self.num_gpios >= 16, "16bits required" + self.i2c.write8(MCP23017_OLATA, value & 0xFF) + self.i2c.write8(MCP23017_OLATB, (value >> 8) & 0xFF) # RPi.GPIO compatible interface for MCP23017 and MCP23008 class MCP230XX_GPIO(object): - OUT = 0 - IN = 1 - BCM = 0 + OUT = 0 + IN = 1 + BCM = 0 BOARD = 0 - def __init__(self, busnum, address, num_gpios): self.chip = Adafruit_MCP230XX(busnum, address, num_gpios) def setmode(self, mode): - pass # do nothing + # do nothing + pass def setup(self, pin, mode): self.chip.config(pin, mode) def input(self, pin): @@ -196,28 +173,31 @@ def output(self, pin, value): self.chip.output(pin, value) def pullup(self, pin, value): self.chip.pullup(pin, value) - + if __name__ == '__main__': - - # **************************************************** + # *************************************************** # Set num_gpios to 8 for MCP23008 or 16 for MCP23017! - # If you have a new Pi you may also need to add: bus=1 - # **************************************************** - mcp = Adafruit_MCP230XX(address=0x20, num_gpios=16) - - # Set pins 0, 1, 2 as outputs + # *************************************************** + mcp = Adafruit_MCP230XX(address = 0x20, num_gpios = 8) # MCP23008 + # mcp = Adafruit_MCP230XX(address = 0x20, num_gpios = 16) # MCP23017 + + # Set pins 0, 1 and 2 to output (you can set pins 0..15 this way) mcp.config(0, mcp.OUTPUT) mcp.config(1, mcp.OUTPUT) mcp.config(2, mcp.OUTPUT) - + # Set pin 3 to input with the pullup resistor enabled - mcp.pullup(3, True) - - # Read pin 3 and display the results - print "%d: %x" % (3, mcp.input(3)) + mcp.config(3, mcp.INPUT) + mcp.pullup(3, 1) + # Read input pin and display the results + print "Pin 3 = %d" % (mcp.input(3) >> 3) + # Python speed test on output 0 toggling at max speed - while True: - mcp.output(0, 1) # Pin 0 High - mcp.output(0, 0) # Pin 0 Low + print "Starting blinky on pin 0 (CTRL+C to quit)" + while (True): + mcp.output(0, 1) # Pin 0 High + time.sleep(1); + mcp.output(0, 0) # Pin 0 Low + time.sleep(1); From b72da09387e7854b5674a9e47cfb8a4e6e8d1175 Mon Sep 17 00:00:00 2001 From: KTOWN Date: Tue, 20 Aug 2013 13:22:28 +0200 Subject: [PATCH 35/79] Fixed indents --- Adafruit_MCP230xx/Adafruit_MCP230xx.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Adafruit_MCP230xx/Adafruit_MCP230xx.py b/Adafruit_MCP230xx/Adafruit_MCP230xx.py index 5f93b886..98c26a80 100755 --- a/Adafruit_MCP230xx/Adafruit_MCP230xx.py +++ b/Adafruit_MCP230xx/Adafruit_MCP230xx.py @@ -80,8 +80,9 @@ def pullup(self, pin, value): if self.num_gpios <= 8: return self._readandchangepin(MCP23008_GPPUA, pin, value) if self.num_gpios <= 16: + lvalue = self._readandchangepin(MCP23017_GPPUA, pin, value) if (pin < 8): - return self._readandchangepin(MCP23017_GPPUA, pin, value) + return else: return self._readandchangepin(MCP23017_GPPUB, pin-8, value) << 8 From 339d4b32892353644e526b851ea2b9655ebaa673 Mon Sep 17 00:00:00 2001 From: "Limor \"Ladyada\" Fried" Date: Wed, 28 Aug 2013 15:34:03 -0400 Subject: [PATCH 36/79] Update README.md add license specifically --- README.md | 30 ++++++++++++++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 1fc20901..aba2ae53 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,33 @@ Adafruit's Raspberry-Pi Python Code Library products from Adafruit! Written by Limor Fried, Kevin Townsend and Mikey Sklar for Adafruit Industries. - BSD license, all text above must be included in any redistribution + BSD license, all text above and below must be included in any redistribution To download, we suggest logging into your Pi with Internet accessibility and typing: - git clone https://github.com/adafruit/Adafruit-Raspberry-Pi-Python-Code.git \ No newline at end of file + git clone https://github.com/adafruit/Adafruit-Raspberry-Pi-Python-Code.git + +============ +Copyright (c) 2012-2013 Limor Fried, Kevin Townsend and Mikey Sklar for Adafruit Industries. +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + * Neither the name of the nor the + names of its contributors may be used to endorse or promote products + derived from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL BE LIABLE FOR ANY +DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND +ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. From 7e950cf19bc5ca7ba511dcc22e960fe4c7ec3b91 Mon Sep 17 00:00:00 2001 From: KTOWN Date: Mon, 2 Sep 2013 21:12:45 +0200 Subject: [PATCH 37/79] Updated 16 bit reads to local functions --- Adafruit_BMP085/Adafruit_BMP085.py | 36 ++++++++++++++++++++---------- 1 file changed, 24 insertions(+), 12 deletions(-) diff --git a/Adafruit_BMP085/Adafruit_BMP085.py b/Adafruit_BMP085/Adafruit_BMP085.py index 87db0fb6..e8d0e314 100755 --- a/Adafruit_BMP085/Adafruit_BMP085.py +++ b/Adafruit_BMP085/Adafruit_BMP085.py @@ -63,19 +63,31 @@ def __init__(self, address=0x77, mode=1, debug=False): # Read the calibration data self.readCalibrationData() + def readS16(self, register): + "Reads a signed 16-bit value" + hi = self.i2c.readS8(register) + lo = self.i2c.readU8(register+1) + return (hi << 8) + lo + + def readU16(self, register): + "Reads an unsigned 16-bit value" + hi = self.i2c.readU8(register) + lo = self.i2c.readU8(register+1) + return (hi << 8) + lo + def readCalibrationData(self): "Reads the calibration data from the IC" - self._cal_AC1 = self.i2c.readS16(self.__BMP085_CAL_AC1) # INT16 - self._cal_AC2 = self.i2c.readS16(self.__BMP085_CAL_AC2) # INT16 - self._cal_AC3 = self.i2c.readS16(self.__BMP085_CAL_AC3) # INT16 - self._cal_AC4 = self.i2c.readU16(self.__BMP085_CAL_AC4) # UINT16 - self._cal_AC5 = self.i2c.readU16(self.__BMP085_CAL_AC5) # UINT16 - self._cal_AC6 = self.i2c.readU16(self.__BMP085_CAL_AC6) # UINT16 - self._cal_B1 = self.i2c.readS16(self.__BMP085_CAL_B1) # INT16 - self._cal_B2 = self.i2c.readS16(self.__BMP085_CAL_B2) # INT16 - self._cal_MB = self.i2c.readS16(self.__BMP085_CAL_MB) # INT16 - self._cal_MC = self.i2c.readS16(self.__BMP085_CAL_MC) # INT16 - self._cal_MD = self.i2c.readS16(self.__BMP085_CAL_MD) # INT16 + self._cal_AC1 = self.readS16(self.__BMP085_CAL_AC1) # INT16 + self._cal_AC2 = self.readS16(self.__BMP085_CAL_AC2) # INT16 + self._cal_AC3 = self.readS16(self.__BMP085_CAL_AC3) # INT16 + self._cal_AC4 = self.readU16(self.__BMP085_CAL_AC4) # UINT16 + self._cal_AC5 = self.readU16(self.__BMP085_CAL_AC5) # UINT16 + self._cal_AC6 = self.readU16(self.__BMP085_CAL_AC6) # UINT16 + self._cal_B1 = self.readS16(self.__BMP085_CAL_B1) # INT16 + self._cal_B2 = self.readS16(self.__BMP085_CAL_B2) # INT16 + self._cal_MB = self.readS16(self.__BMP085_CAL_MB) # INT16 + self._cal_MC = self.readS16(self.__BMP085_CAL_MC) # INT16 + self._cal_MD = self.readS16(self.__BMP085_CAL_MD) # INT16 if (self.debug): self.showCalibrationData() @@ -97,7 +109,7 @@ def readRawTemp(self): "Reads the raw (uncompensated) temperature from the sensor" self.i2c.write8(self.__BMP085_CONTROL, self.__BMP085_READTEMPCMD) time.sleep(0.005) # Wait 5ms - raw = self.i2c.readU16(self.__BMP085_TEMPDATA) + raw = self.readU16(self.__BMP085_TEMPDATA) if (self.debug): print "DBG: Raw Temp: 0x%04X (%d)" % (raw & 0xFFFF, raw) return raw From 3e05872a2ef112e51ce1b5e601c5f27897e00ad8 Mon Sep 17 00:00:00 2001 From: Qingping Hou Date: Fri, 20 Sep 2013 11:53:14 +0800 Subject: [PATCH 38/79] add dhtreader example --- Adafruit_DHT_Driver_Python/README.md | 25 ++++ Adafruit_DHT_Driver_Python/dhtreader.c | 179 +++++++++++++++++++++++++ Adafruit_DHT_Driver_Python/setup.py | 14 ++ 3 files changed, 218 insertions(+) create mode 100644 Adafruit_DHT_Driver_Python/README.md create mode 100644 Adafruit_DHT_Driver_Python/dhtreader.c create mode 100644 Adafruit_DHT_Driver_Python/setup.py diff --git a/Adafruit_DHT_Driver_Python/README.md b/Adafruit_DHT_Driver_Python/README.md new file mode 100644 index 00000000..4e5254e8 --- /dev/null +++ b/Adafruit_DHT_Driver_Python/README.md @@ -0,0 +1,25 @@ +Build dependencies for dhtreader python library + +* python-dev +* bcm2835 library: http://www.airspayce.com/mikem/bcm2835/ + +Run following command to build the library: +``` +python setup.py build +``` + +After that you should be able to find a dhtreader.so file inside `build` +directory. Put that library file in the same directory with your Python script, +then you are good to go. + +Usage example: + +```python +import dhtreader + +type = 22 +pin = 24 + +dhtreader.init() +print dhtreader(type, pin) +``` diff --git a/Adafruit_DHT_Driver_Python/dhtreader.c b/Adafruit_DHT_Driver_Python/dhtreader.c new file mode 100644 index 00000000..9856c138 --- /dev/null +++ b/Adafruit_DHT_Driver_Python/dhtreader.c @@ -0,0 +1,179 @@ +/* Python module for DHT temperature/humidity sensors + * + * Modified by Qingping Hou from DHT reader example, original header: + * + * How to access GPIO registers from C-code on the Raspberry-Pi + * Example program + * 15-January-2012 + * Dom and Gert + */ + + +/* for usleep */ +#define _BSD_SOURCE + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include + +#define MAXTIMINGS 100 + +//#define DEBUG + +#define DHT11 11 +#define DHT22 22 +#define AM2302 22 + +int readDHT(int type, int pin, float *temp_p, float *hum_p) +{ + int counter = 0; + int laststate = HIGH; + int i = 0; + int j = 0; + int checksum = 0; +#ifdef DEBUG + int bitidx = 0; + int bits[250]; +#endif + int data[100]; + + // Set GPIO pin to output + bcm2835_gpio_fsel(pin, BCM2835_GPIO_FSEL_OUTP); + + bcm2835_gpio_write(pin, HIGH); + usleep(500000); // 500 ms + bcm2835_gpio_write(pin, LOW); + usleep(20000); + + bcm2835_gpio_fsel(pin, BCM2835_GPIO_FSEL_INPT); + + data[0] = data[1] = data[2] = data[3] = data[4] = 0; + + // wait for pin to drop? + while (bcm2835_gpio_lev(pin) == 1) { + usleep(1); + } + + // read data! + for (i = 0; i < MAXTIMINGS; i++) { + counter = 0; + while ( bcm2835_gpio_lev(pin) == laststate) { + counter++; + //nanosleep(1); // overclocking might change this? + if (counter == 1000) + break; + } + laststate = bcm2835_gpio_lev(pin); + if (counter == 1000) break; +#ifdef DEBUG + bits[bitidx++] = counter; +#endif + + if ((i>3) && (i%2 == 0)) { + // shove each bit into the storage bytes + data[j/8] <<= 1; + if (counter > 200) + data[j/8] |= 1; + j++; + } + } + +#ifdef DEBUG + for (int i=3; i 200); + } + printf("Data (%d): 0x%x 0x%x 0x%x 0x%x 0x%x\n", j, data[0], data[1], data[2], data[3], data[4]); +#endif + + if (j >= 39) { + checksum = (data[0] + data[1] + data[2] + data[3]) & 0xFF; + if (data[4] == checksum) { + /* yay! checksum is valid */ + if (type == DHT11) { + /*printf("Temp = %d *C, Hum = %d \%\n", data[2], data[0]);*/ + *temp_p = (float)data[2]; + *hum_p = (float)data[0]; + } else if (type == DHT22) { + *hum_p = data[0] * 256 + data[1]; + *hum_p /= 10; + + *temp_p = (data[2] & 0x7F)* 256 + data[3]; + *temp_p /= 10.0; + if (data[2] & 0x80) + *temp_p *= -1; + /*printf("Temp = %.1f *C, Hum = %.1f \%\n", f, h);*/ + } + return 0; + } + return -2; + } + + return -1; +} + + +static PyObject * +dhtreader_init(PyObject *self, PyObject *args) +{ + return Py_BuildValue("i", bcm2835_init()); +} + +static PyObject * +dhtreader_read(PyObject *self, PyObject *args) +{ + int type, dhtpin; + + if (!PyArg_ParseTuple(args, "ii", &type, &dhtpin)) + return NULL; + + float t, h; + int re = readDHT(type, dhtpin, &t, &h); + + if (re == 0) { + return Py_BuildValue("(d,d)", t, h); + } else if (re == -1) { +#ifdef DEBUG + printf("sensor read failed! not enough data received\n"); +#endif + } else if (re == -2) { +#ifdef DEBUG + printf("sensor read failed! checksum failed!\n"); +#endif + } + + return Py_BuildValue(""); +} + + +static PyMethodDef DHTReaderMethods[] = { + {"init", dhtreader_init, METH_VARARGS, + "initialize dht reader"}, + {"read", dhtreader_read, METH_VARARGS, + "temperature and humidity from sensor"}, + {NULL, NULL, 0, NULL} /* Sentinel */ +}; + +PyMODINIT_FUNC +initdhtreader(void) +{ + PyObject *m; + + m = Py_InitModule("dhtreader", DHTReaderMethods); + if (m == NULL) + return; +} + + diff --git a/Adafruit_DHT_Driver_Python/setup.py b/Adafruit_DHT_Driver_Python/setup.py new file mode 100644 index 00000000..61d551ff --- /dev/null +++ b/Adafruit_DHT_Driver_Python/setup.py @@ -0,0 +1,14 @@ +#!/usr/bin/env python +# -*- coding:utf-8 -*- + +from distutils.core import setup, Extension + +dht_mod = Extension('dhtreader', + include_dirs = ['.'], + libraries = ['bcm2835'], + sources = ['dhtreader.c']) + +setup (name = 'dhtreader', + version = '1.0', + description = 'Python library to interface with dht sensors', + ext_modules = [dht_mod]) From 23afef46d59b8ebf80bd3455514b2c90c8d31188 Mon Sep 17 00:00:00 2001 From: Qingping Hou Date: Fri, 20 Sep 2013 12:18:15 +0800 Subject: [PATCH 39/79] add Adafruit_DHT python implementation --- Adafruit_DHT_Driver_Python/Adafruit_DHT.py | 40 ++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 Adafruit_DHT_Driver_Python/Adafruit_DHT.py diff --git a/Adafruit_DHT_Driver_Python/Adafruit_DHT.py b/Adafruit_DHT_Driver_Python/Adafruit_DHT.py new file mode 100644 index 00000000..69cd4a82 --- /dev/null +++ b/Adafruit_DHT_Driver_Python/Adafruit_DHT.py @@ -0,0 +1,40 @@ +#!/usr/bin/env python +# -*- coding:utf-8 -*- + +import sys +import dhtreader + +DHT11 = 11 +DHT22 = 22 +AM2302 = 22 + + +dhtreader.init() + +if len(sys.argv) != 3: + print("usage: {0} [11|22|2302] GPIOpin#".format(sys.argv[0])) + print("example: {0} 2302 Read from an AM2302 connected to GPIO #4".format(sys.argv[0])) + sys.exit(2) + +dev_type = None +if sys.argv[1] == "11": + dev_type = DHT11 +elif sys.argv[1] == "22": + dev_type = DHT22 +elif sys.argv[1] == "2302": + dev_type = AM2302 +else: + print("invalid type, only 11, 22 and 2302 are supported for now!") + sys.exit(3) + +dhtpin = int(sys.argv[2]) +if dhtpin <= 0: + print("invalid GPIO pin#") + sys.exit(3) + +print("using pin #{0}".format(dhtpin)) +t, h = dhtreader.read(dev_type, dhtpin) +if t and h: + print("Temp = {0} *C, Hum = {1} %".format(t, h)) +else: + print("Failed to read from sensor, maybe try again?") From 71fc4a32edb6f5094be47503797aecb3aca9b40f Mon Sep 17 00:00:00 2001 From: Phillip Burgess Date: Sat, 21 Sep 2013 20:33:41 -0700 Subject: [PATCH 40/79] Added code for ADXL345 accelerometer --- Adafruit_ADXL345/Adafruit_ADXL345.py | 114 +++++++++++++++++++++++++++ Adafruit_ADXL345/Adafruit_I2C.py | 1 + 2 files changed, 115 insertions(+) create mode 100755 Adafruit_ADXL345/Adafruit_ADXL345.py create mode 120000 Adafruit_ADXL345/Adafruit_I2C.py diff --git a/Adafruit_ADXL345/Adafruit_ADXL345.py b/Adafruit_ADXL345/Adafruit_ADXL345.py new file mode 100755 index 00000000..50b00abe --- /dev/null +++ b/Adafruit_ADXL345/Adafruit_ADXL345.py @@ -0,0 +1,114 @@ +#!/usr/bin/python + +# Python library for ADXL345 accelerometer. + +# Copyright 2013 Adafruit Industries + +# Permission is hereby granted, free of charge, to any person obtaining a +# copy of this software and associated documentation files (the "Software"), +# to deal in the Software without restriction, including without limitation +# the rights to use, copy, modify, merge, publish, distribute, sublicense, +# and/or sell copies of the Software, and to permit persons to whom the +# Software is furnished to do so, subject to the following conditions: + +# The above copyright notice and this permission notice shall be included +# in all copies or substantial portions of the Software. + +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION 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 Adafruit_I2C import Adafruit_I2C + + +class Adafruit_ADXL345(Adafruit_I2C): + + # Minimal constants carried over from Arduino library + + ADXL345_ADDRESS = 0x53 + + ADXL345_REG_DEVID = 0x00 # Device ID + ADXL345_REG_DATAX0 = 0x32 # X-axis data 0 (6 bytes for X/Y/Z) + ADXL345_REG_POWER_CTL = 0x2D # Power-saving features control + + ADXL345_DATARATE_0_10_HZ = 0x00 + ADXL345_DATARATE_0_20_HZ = 0x01 + ADXL345_DATARATE_0_39_HZ = 0x02 + ADXL345_DATARATE_0_78_HZ = 0x03 + ADXL345_DATARATE_1_56_HZ = 0x04 + ADXL345_DATARATE_3_13_HZ = 0x05 + ADXL345_DATARATE_6_25HZ = 0x06 + ADXL345_DATARATE_12_5_HZ = 0x07 + ADXL345_DATARATE_25_HZ = 0x08 + ADXL345_DATARATE_50_HZ = 0x09 + ADXL345_DATARATE_100_HZ = 0x0A # (default) + ADXL345_DATARATE_200_HZ = 0x0B + ADXL345_DATARATE_400_HZ = 0x0C + ADXL345_DATARATE_800_HZ = 0x0D + ADXL345_DATARATE_1600_HZ = 0x0E + ADXL345_DATARATE_3200_HZ = 0x0F + + ADXL345_RANGE_2_G = 0x00 # +/- 2g (default) + ADXL345_RANGE_4_G = 0x01 # +/- 4g + ADXL345_RANGE_8_G = 0x02 # +/- 8g + ADXL345_RANGE_16_G = 0x03 # +/- 16g + + + def __init__(self, busnum=-1, debug=False): + + self.accel = Adafruit_I2C(self.ADXL345_ADDRESS, busnum, debug) + + if self.accel.readU8(self.ADXL345_REG_DEVID) == 0xE5: + # Enable the accelerometer + self.accel.write8(self.ADXL345_REG_POWER_CTL, 0x08) + + + def setRange(self, range): + # Read the data format register to preserve bits. Update the data + # rate, make sure that the FULL-RES bit is enabled for range scaling + format = ((self.accel.readU8(self.ADXL345_REG_DATA_FORMAT) & ~0x0F) | + range | 0x08) + # Write the register back to the IC + seld.accel.write8(self.ADXL345_REG_DATA_FORMAT, format) + + + def getRange(self): + return self.accel.readU8(self.ADXL345_REG_DATA_FORMAT) & 0x03 + + + def setDataRate(self, dataRate): + # Note: The LOW_POWER bits are currently ignored, + # we always keep the device in 'normal' mode + self.accel.write8(self.ADXL345_REG_BW_RATE, dataRate & 0x0F) + + + def getDataRate(self): + return self.accel.readU8(self.ADXL345_REG_BW_RATE) & 0x0F + + + # Read the accelerometer + def read(self): + raw = self.accel.readList(self.ADXL345_REG_DATAX0, 6) + res = [] + for i in range(0, 6, 2): + g = raw[i] | (raw[i+1] << 8) + if g > 32767: g -= 65536 + res.append(g) + return res + + +# Simple example prints accelerometer data once per second: +if __name__ == '__main__': + + from time import sleep + + accel = Adafruit_ADXL345() + + print '[Accelerometer X, Y, Z]' + while True: + print accel.read() + sleep(1) # Output is fun to watch if this is commented out diff --git a/Adafruit_ADXL345/Adafruit_I2C.py b/Adafruit_ADXL345/Adafruit_I2C.py new file mode 120000 index 00000000..77f06164 --- /dev/null +++ b/Adafruit_ADXL345/Adafruit_I2C.py @@ -0,0 +1 @@ +../Adafruit_I2C/Adafruit_I2C.py \ No newline at end of file From ee62bcbe35c97fde66eadbcb1517f5e8d16f8944 Mon Sep 17 00:00:00 2001 From: Kevin Townsend Date: Wed, 25 Sep 2013 10:10:16 +0200 Subject: [PATCH 41/79] Tabs to four spaces --- Adafruit_MCP230xx/Adafruit_MCP230xx.py | 68 +++++++++++++------------- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/Adafruit_MCP230xx/Adafruit_MCP230xx.py b/Adafruit_MCP230xx/Adafruit_MCP230xx.py index 98c26a80..b7ad9877 100755 --- a/Adafruit_MCP230xx/Adafruit_MCP230xx.py +++ b/Adafruit_MCP230xx/Adafruit_MCP230xx.py @@ -39,7 +39,7 @@ class Adafruit_MCP230XX(object): OUTPUT = 0 INPUT = 1 - + def __init__(self, address, num_gpios): assert num_gpios >= 0 and num_gpios <= 16, "Number of GPIOs must be between 0 and 16" self.i2c = Adafruit_I2C(address=address) @@ -58,7 +58,7 @@ def __init__(self, address, num_gpios): self.direction |= self.i2c.readU8(MCP23017_IODIRB) << 8 self.i2c.write8(MCP23017_GPPUA, 0x00) self.i2c.write8(MCP23017_GPPUB, 0x00) - + def _changebit(self, bitmap, bit, value): assert value == 1 or value == 0, "Value is %s must be 1 or 0" % value if value == 0: @@ -82,12 +82,12 @@ def pullup(self, pin, value): if self.num_gpios <= 16: lvalue = self._readandchangepin(MCP23017_GPPUA, pin, value) if (pin < 8): - return + return else: return self._readandchangepin(MCP23017_GPPUB, pin-8, value) << 8 # Set pin to either input or output mode - def config(self, pin, mode): + def config(self, pin, mode): if self.num_gpios <= 8: self.direction = self._readandchangepin(MCP23017_IODIRA, pin, mode) if self.num_gpios <= 16: @@ -113,7 +113,7 @@ def output(self, pin, value): self.outputvalue = self._readandchangepin(MCP23017_IODIRA, pin, value, self.outputvalue) return self.outputvalue - + def input(self, pin): assert pin >= 0 and pin < self.num_gpios, "Pin number %s is invalid, only 0-%s are valid" % (pin, self.num_gpios) assert self.direction & (1 << pin) != 0, "Pin %s not set to input" % pin @@ -124,35 +124,35 @@ def input(self, pin): value |= self.i2c.readU8(MCP23017_GPIOB) << 8 return value & (1 << pin) - def readU8(self): - result = self.i2c.readU8(MCP23008_OLATA) - return(result) + def readU8(self): + result = self.i2c.readU8(MCP23008_OLATA) + return(result) - def readS8(self): - result = self.i2c.readU8(MCP23008_OLATA) - if (result > 127): result -= 256 - return result + def readS8(self): + result = self.i2c.readU8(MCP23008_OLATA) + if (result > 127): result -= 256 + return result - def readU16(self): - assert self.num_gpios >= 16, "16bits required" - lo = self.i2c.readU8(MCP23017_OLATA) - hi = self.i2c.readU8(MCP23017_OLATB) - return((hi << 8) | lo) + def readU16(self): + assert self.num_gpios >= 16, "16bits required" + lo = self.i2c.readU8(MCP23017_OLATA) + hi = self.i2c.readU8(MCP23017_OLATB) + return((hi << 8) | lo) - def readS16(self): - assert self.num_gpios >= 16, "16bits required" - lo = self.i2c.readU8(MCP23017_OLATA) - hi = self.i2c.readU8(MCP23017_OLATB) - if (hi > 127): hi -= 256 - return((hi << 8) | lo) + def readS16(self): + assert self.num_gpios >= 16, "16bits required" + lo = self.i2c.readU8(MCP23017_OLATA) + hi = self.i2c.readU8(MCP23017_OLATB) + if (hi > 127): hi -= 256 + return((hi << 8) | lo) - def write8(self, value): - self.i2c.write8(MCP23008_OLATA, value) + def write8(self, value): + self.i2c.write8(MCP23008_OLATA, value) - def write16(self, value): - assert self.num_gpios >= 16, "16bits required" - self.i2c.write8(MCP23017_OLATA, value & 0xFF) - self.i2c.write8(MCP23017_OLATB, (value >> 8) & 0xFF) + def write16(self, value): + assert self.num_gpios >= 16, "16bits required" + self.i2c.write8(MCP23017_OLATA, value & 0xFF) + self.i2c.write8(MCP23017_OLATB, (value >> 8) & 0xFF) # RPi.GPIO compatible interface for MCP23017 and MCP23008 @@ -174,7 +174,7 @@ def output(self, pin, value): self.chip.output(pin, value) def pullup(self, pin, value): self.chip.pullup(pin, value) - + if __name__ == '__main__': # *************************************************** @@ -182,19 +182,19 @@ def pullup(self, pin, value): # *************************************************** mcp = Adafruit_MCP230XX(address = 0x20, num_gpios = 8) # MCP23008 # mcp = Adafruit_MCP230XX(address = 0x20, num_gpios = 16) # MCP23017 - + # Set pins 0, 1 and 2 to output (you can set pins 0..15 this way) mcp.config(0, mcp.OUTPUT) mcp.config(1, mcp.OUTPUT) mcp.config(2, mcp.OUTPUT) - + # Set pin 3 to input with the pullup resistor enabled mcp.config(3, mcp.INPUT) mcp.pullup(3, 1) - + # Read input pin and display the results print "Pin 3 = %d" % (mcp.input(3) >> 3) - + # Python speed test on output 0 toggling at max speed print "Starting blinky on pin 0 (CTRL+C to quit)" while (True): From 15522b5d207c4ac99a80192a7ba4bb76decd1bd3 Mon Sep 17 00:00:00 2001 From: "Limor \"Ladyada\" Fried" Date: Fri, 1 Nov 2013 16:13:25 -0400 Subject: [PATCH 42/79] Update README.md --- Adafruit_DHT_Driver_Python/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Adafruit_DHT_Driver_Python/README.md b/Adafruit_DHT_Driver_Python/README.md index 4e5254e8..d5e5828c 100644 --- a/Adafruit_DHT_Driver_Python/README.md +++ b/Adafruit_DHT_Driver_Python/README.md @@ -21,5 +21,5 @@ type = 22 pin = 24 dhtreader.init() -print dhtreader(type, pin) +print dhtreader.read(type, pin) ``` From 00adf3dbc39ccd73a253edefa60a45809c573713 Mon Sep 17 00:00:00 2001 From: KTOWN Date: Mon, 25 Nov 2013 13:04:58 +0100 Subject: [PATCH 43/79] Added gain and sample rate placeholders --- Adafruit_ADS1x15/ads1x15_ex_singleended.py | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/Adafruit_ADS1x15/ads1x15_ex_singleended.py b/Adafruit_ADS1x15/ads1x15_ex_singleended.py index 190288b2..383927fa 100644 --- a/Adafruit_ADS1x15/ads1x15_ex_singleended.py +++ b/Adafruit_ADS1x15/ads1x15_ex_singleended.py @@ -12,12 +12,30 @@ def signal_handler(signal, frame): ADS1015 = 0x00 # 12-bit ADC ADS1115 = 0x01 # 16-bit ADC +# Select the gain +# gain = 61 # +/- 6.144V +gain = 4096 # +/- 4.096V +# gain = 2048 # +/- 2.048V +# gain = 1024 # +/- 1.024V +# gain = 512 # +/- 0.512V +# gain = 256 # +/- 0.256V + +# Select the sample rate +# sps = 8 # 8 samples per second +# sps = 16 # 16 samples per second +# sps = 32 # 32 samples per second +# sps = 64 # 64 samples per second +# sps = 128 # 128 samples per second +sps = 250 # 250 samples per second +# sps = 475 # 475 samples per second +# sps = 860 # 860 samples per second + # Initialise the ADC using the default mode (use default I2C address) # Set this to ADS1015 or ADS1115 depending on the ADC you are using! adc = ADS1x15(ic=ADS1115) -# Read channel 0 in single-ended mode, +/-4.096V, 250sps -volts = adc.readADCSingleEnded(0, 4096, 250) / 1000 +# Read channel 0 in single-ended mode using the settings above +volts = adc.readADCSingleEnded(0, gain, sps) / 1000 # To read channel 3 in single-ended mode, +/- 1.024V, 860 sps use: # volts = adc.readADCSingleEnded(3, 1024, 860) From 2d4678fdccec1b93d8d69ba7768f6698545b2c5f Mon Sep 17 00:00:00 2001 From: driverblock Date: Mon, 9 Dec 2013 12:58:23 -0500 Subject: [PATCH 44/79] Adding MCP3002.py Modified MCP3008.py to support MCP3002 --- Adafruit_MCP3002/MCP3002.py | 94 +++++++++++++++++++++++++++++++++++++ 1 file changed, 94 insertions(+) create mode 100644 Adafruit_MCP3002/MCP3002.py diff --git a/Adafruit_MCP3002/MCP3002.py b/Adafruit_MCP3002/MCP3002.py new file mode 100644 index 00000000..5b0b68b5 --- /dev/null +++ b/Adafruit_MCP3002/MCP3002.py @@ -0,0 +1,94 @@ +#!/usr/bin/env python + +# just some bitbang code for testing both channels + +import RPi.GPIO as GPIO, time, os + +DEBUG = 1 +GPIO.setmode(GPIO.BCM) + +# this function is not used, its for future reference! +def slowspiwrite(clockpin, datapin, byteout): + GPIO.setup(clockpin, GPIO.OUT) + GPIO.setup(datapin, GPIO.OUT) + for i in range(8): + if (byteout & 0x80): + GPIO.output(datapin, True) + else: + GPIO.output(datapin, False) + byteout <<= 1 + GPIO.output(clockpin, True) + GPIO.output(clockpin, False) + +# this function is not used, its for future reference! +def slowspiread(clockpin, datapin): + GPIO.setup(clockpin, GPIO.OUT) + GPIO.setup(datapin, GPIO.IN) + byteout = 0 + for i in range(8): + GPIO.output(clockpin, False) + GPIO.output(clockpin, True) + byteout <<= 1 + if (GPIO.input(datapin)): + byteout = byteout | 0x1 + return byteout + +# read SPI data from MCP3002 chip, 2 possible adc's (0 thru 1) +def readadc(adcnum, clockpin, mosipin, misopin, cspin): + if ((adcnum > 1) or (adcnum < 0)): + return -1 + GPIO.output(cspin, True) + + GPIO.output(clockpin, False) # start clock low + GPIO.output(cspin, False) # bring CS low + + commandout = adcnum << 1; + commandout |= 0x0D # start bit + single-ended bit + MSBF bit + commandout <<= 4 # we only need to send 4 bits here + + for i in range(4): + if (commandout & 0x80): + GPIO.output(mosipin, True) + else: + GPIO.output(mosipin, False) + commandout <<= 1 + GPIO.output(clockpin, True) + GPIO.output(clockpin, False) + + adcout = 0 + + # read in one null bit and 10 ADC bits + for i in range(11): + GPIO.output(clockpin, True) + GPIO.output(clockpin, False) + adcout <<= 1 + if (GPIO.input(misopin)): + adcout |= 0x1 + GPIO.output(cspin, True) + + adcout /= 2 # first bit is 'null' so drop it + return adcout +# change these as desired +SPICLK = 18 +SPIMOSI = 17 +SPIMISO = 21 +SPICS = 22 + +# set up the SPI interface pins +GPIO.setup(SPIMOSI, GPIO.OUT) +GPIO.setup(SPIMISO, GPIO.IN) +GPIO.setup(SPICLK, GPIO.OUT) +GPIO.setup(SPICS, GPIO.OUT) + +# Note that bitbanging SPI is incredibly slow on the Pi as its not +# a RTOS - reading the ADC takes about 30 ms (~30 samples per second) +# which is awful for a microcontroller but better-than-nothing for Linux + +print "| #0 \t #1|" +print "-----------------------------------------------------------------" +while True: + print "|", + for adcnum in range(2): + ret = readadc(adcnum, SPICLK, SPIMOSI, SPIMISO, SPICS) + print ret,"\t", + print "|" From dbb04b63f8b596402b568b7d75c475550dd51019 Mon Sep 17 00:00:00 2001 From: shinncchen Date: Sat, 28 Dec 2013 16:39:31 -0600 Subject: [PATCH 45/79] Update Adafruit_VCNL4000.py add a function to read ambient light from VCNL4000 sensor --- Adafruit_VCNL4000/Adafruit_VCNL4000.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/Adafruit_VCNL4000/Adafruit_VCNL4000.py b/Adafruit_VCNL4000/Adafruit_VCNL4000.py index 4ebc3a20..4d307536 100755 --- a/Adafruit_VCNL4000/Adafruit_VCNL4000.py +++ b/Adafruit_VCNL4000/Adafruit_VCNL4000.py @@ -51,4 +51,11 @@ def read_proximity(self): return self.i2c.readU16(VCNL4000_PROXIMITYDATA) time.sleep(0.001) - + # Read data from ambient sensor + def read_ambient(self): + self.i2c.write8(VCNL4000_COMMAND, VCNL4000_MEASUREAMBIENT) + while True: + result = self.i2c.readU8(VCNL4000_COMMAND) + if (result and VCNL4000_AMBIENTREADY): + return self.i2c.readU16(VCNL4000_AMBIENTDATA) + time.sleep(0.001) From de1893823e396dd0f630dc8317717ecba8de03aa Mon Sep 17 00:00:00 2001 From: Fernando Fussuma Date: Sat, 11 Jan 2014 00:30:43 -0200 Subject: [PATCH 46/79] Fixed missing blink method and comments change --- Adafruit_CharLCD/Adafruit_CharLCD.py | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/Adafruit_CharLCD/Adafruit_CharLCD.py b/Adafruit_CharLCD/Adafruit_CharLCD.py index 22060c94..af6749ea 100755 --- a/Adafruit_CharLCD/Adafruit_CharLCD.py +++ b/Adafruit_CharLCD/Adafruit_CharLCD.py @@ -94,7 +94,6 @@ def begin(self, cols, lines): if (lines > 1): self.numlines = lines self.displayfunction |= self.LCD_2LINE - self.currline = 0 def home(self): @@ -134,30 +133,30 @@ def display(self): def noCursor(self): - """ Turns the underline cursor on/off """ + """ Turns the underline cursor off """ self.displaycontrol &= ~self.LCD_CURSORON self.write4bits(self.LCD_DISPLAYCONTROL | self.displaycontrol) def cursor(self): - """ Cursor On """ + """ Turns the underline cursor on """ self.displaycontrol |= self.LCD_CURSORON self.write4bits(self.LCD_DISPLAYCONTROL | self.displaycontrol) def noBlink(self): - """ Turn on and off the blinking cursor """ + """ Turn the blinking cursor off """ self.displaycontrol &= ~self.LCD_BLINKON self.write4bits(self.LCD_DISPLAYCONTROL | self.displaycontrol) - def noBlink(self): - """ Turn on and off the blinking cursor """ + def blink(self): + """ Turn the blinking cursor on """ - self.displaycontrol &= ~self.LCD_BLINKON + self.displaycontrol |= self.LCD_BLINKON self.write4bits(self.LCD_DISPLAYCONTROL | self.displaycontrol) From 2bb6dc18897c52f3cc7c373f53a2596dfc4ff4d0 Mon Sep 17 00:00:00 2001 From: shinncchen Date: Tue, 14 Jan 2014 10:38:12 -0600 Subject: [PATCH 47/79] Update mcp3008.py 1) It allows readadc() to be imported and used as a function without the print log on other python file 2) The GPIO is cleanup if there is a KeyboardInterrupt --- Adafruit_MCP3008/mcp3008.py | 56 +++++++++++++++++++++---------------- 1 file changed, 32 insertions(+), 24 deletions(-) diff --git a/Adafruit_MCP3008/mcp3008.py b/Adafruit_MCP3008/mcp3008.py index a1678a7b..73dcd7dd 100644 --- a/Adafruit_MCP3008/mcp3008.py +++ b/Adafruit_MCP3008/mcp3008.py @@ -68,27 +68,35 @@ def readadc(adcnum, clockpin, mosipin, misopin, cspin): adcout /= 2 # first bit is 'null' so drop it return adcout -# change these as desired -SPICLK = 18 -SPIMOSI = 17 -SPIMISO = 21 -SPICS = 22 - -# set up the SPI interface pins -GPIO.setup(SPIMOSI, GPIO.OUT) -GPIO.setup(SPIMISO, GPIO.IN) -GPIO.setup(SPICLK, GPIO.OUT) -GPIO.setup(SPICS, GPIO.OUT) - -# Note that bitbanging SPI is incredibly slow on the Pi as its not -# a RTOS - reading the ADC takes about 30 ms (~30 samples per second) -# which is awful for a microcontroller but better-than-nothing for Linux - -print "| #0 \t #1 \t #2 \t #3 \t #4 \t #5 \t #6 \t #7\t|" -print "-----------------------------------------------------------------" -while True: - print "|", - for adcnum in range(8): - ret = readadc(adcnum, SPICLK, SPIMOSI, SPIMISO, SPICS) - print ret,"\t", - print "|" +if __name__=='__main__': + + try: + # change these as desired + SPICLK = 18 + SPIMISO = 21 + SPIMOSI = 17 + SPICS = 22 + + # set up the SPI interface pins + GPIO.setup(SPICLK, GPIO.OUT) + GPIO.setup(SPIMISO, GPIO.IN) + GPIO.setup(SPIMOSI, GPIO.OUT) + GPIO.setup(SPICS, GPIO.OUT) + + # Note that bitbanging SPI is incredibly slow on the Pi as its not + # a RTOS - reading the ADC takes about 30 ms (~30 samples per second) + # which is awful for a microcontroller but better-than-nothing for Linux + + print "| #0 \t #1 \t #2 \t #3 \t #4 \t #5 \t #6 \t #7\t|" + print "-----------------------------------------------------------------" + while True: + print "|", + for adcnum in range(8): + ret = readadc(adcnum, SPICLK, SPIMOSI, SPIMISO, SPICS) + print ret,"\t", + print "|" + + except KeyboardInterrupt: + pass + + GPIO.cleanup() From eec11162bfed377eb07a80442798d2769e97a771 Mon Sep 17 00:00:00 2001 From: David Miller Date: Sun, 20 Apr 2014 21:46:01 +0000 Subject: [PATCH 48/79] added file .gitignore --- .gitignore | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..6d764cfa --- /dev/null +++ b/.gitignore @@ -0,0 +1,56 @@ +# Python specific .gitignore +# GitHub recommended entries from https://github.com/github/gitignore + +# Byte-compiled / optimized / DLL files +__pycache__/ +*.py[cod] + +# C extensions +*.so + +# Distribution / packaging +.Python +env/ +bin/ +build/ +develop-eggs/ +dist/ +eggs/ +lib/ +lib64/ +parts/ +sdist/ +var/ +*.egg-info/ +.installed.cfg +*.egg + +# Installer logs +pip-log.txt +pip-delete-this-directory.txt + +# Unit test / coverage reports +htmlcov/ +.tox/ +.coverage +.cache +nosetests.xml +coverage.xml + +# Translations +*.mo + +# Mr Developer +.mr.developer.cfg +.project +.pydevproject + +# Rope +.ropeproject + +# Django stuff: +*.log +*.pot + +# Sphinx documentation +docs/_build/ From 35c23798afa2b15116c96dac023dd7704c2f460c Mon Sep 17 00:00:00 2001 From: Sean McIntyre Date: Wed, 14 May 2014 20:25:38 +0000 Subject: [PATCH 49/79] Added bargraph library and example for Adafruit product 1721 --- Adafruit_LEDBackpack/Adafruit_Bargraph.py | 55 ++++++++++++++++++++ Adafruit_LEDBackpack/Adafruit_LEDBackpack.py | 10 +++- Adafruit_LEDBackpack/ex_bargraph.py | 19 +++++++ 3 files changed, 82 insertions(+), 2 deletions(-) create mode 100644 Adafruit_LEDBackpack/Adafruit_Bargraph.py create mode 100644 Adafruit_LEDBackpack/ex_bargraph.py diff --git a/Adafruit_LEDBackpack/Adafruit_Bargraph.py b/Adafruit_LEDBackpack/Adafruit_Bargraph.py new file mode 100644 index 00000000..b2cc09d1 --- /dev/null +++ b/Adafruit_LEDBackpack/Adafruit_Bargraph.py @@ -0,0 +1,55 @@ +#!/usr/bin/python + +import time +import datetime +from Adafruit_LEDBackpack import LEDBackpack + +# =========================================================================== +# Bargraph Display +# =========================================================================== + +# This class is meant to be used with the four-character, seven segment +# displays available from Adafruit + +class Bargraph: + disp = None + + LED_OFF = 0 + LED_RED = 1 + LED_GREEN = 2 + LED_YELLOW = 3 + + # Constructor + def __init__(self, address=0x70, debug=False): + self.debug = debug + + if self.debug: + print "Initializing a new instance of LEDBackpack at 0x%02X" % address + self.disp = LEDBackpack(address=address, debug=debug) + + def setLed(self, bar, color): + if bar > 24: + return + if color > 3: + return + + if bar < 12: + c = bar / 4 + else: + c = (bar - 12) / 4 + + a = bar % 4; + if bar >= 12: + a += 4; + + if self.debug: + print "Ano = %d Cath %d" % (a, c) + + bufRow = self.disp.getBufferRow(c) & ~((1 << a) | (1 << (a+8))) # turn off the LED + + if color == self.LED_RED: + self.disp.setBufferRow(c, bufRow | (1 << a)) + elif color == self.LED_YELLOW: + self.disp.setBufferRow(c, bufRow | (1 << a) | (1 << (a+8))) + elif color == self.LED_GREEN: + self.disp.setBufferRow(c, bufRow | 1 << (a+8)) diff --git a/Adafruit_LEDBackpack/Adafruit_LEDBackpack.py b/Adafruit_LEDBackpack/Adafruit_LEDBackpack.py index a0c58295..5318cb81 100644 --- a/Adafruit_LEDBackpack/Adafruit_LEDBackpack.py +++ b/Adafruit_LEDBackpack/Adafruit_LEDBackpack.py @@ -27,8 +27,8 @@ class LEDBackpack: 0x0000, 0x0000, 0x0000, 0x0000 ] # Constructor - def __init__(self, address=0x70, debug=False): - self.i2c = Adafruit_I2C(address) + def __init__(self, address=0x70, debug=False, bus=-1): + self.i2c = Adafruit_I2C(address, bus) self.address = address self.debug = debug @@ -64,6 +64,12 @@ def setBufferRow(self, row, value, update=True): if (update): self.writeDisplay() # Update the display + def getBufferRow(self, row): + "Returns a single 16-bit entry in the 8*16-bit buffer" + if (row > 7): + return + return self.__buffer[row] + def getBuffer(self): "Returns a copy of the raw buffer contents" bufferCopy = copy(self.__buffer) diff --git a/Adafruit_LEDBackpack/ex_bargraph.py b/Adafruit_LEDBackpack/ex_bargraph.py new file mode 100644 index 00000000..1fa0a31e --- /dev/null +++ b/Adafruit_LEDBackpack/ex_bargraph.py @@ -0,0 +1,19 @@ +#!/usr/bin/python + +import time +import datetime +from Adafruit_Bargraph import Bargraph + +# =========================================================================== +# Scroll through colors example +# =========================================================================== +bargraph = Bargraph(address=0x70) + +print "Press CTRL+C to exit" + +while(True): + for color in range(1, 4): + for i in range(24): + print i + bargraph.setLed(i, color) + time.sleep(0.05) From 1bb8f6de2bfa6fe6264db7dfc9bbfe7961c9182c Mon Sep 17 00:00:00 2001 From: Sean McIntyre Date: Wed, 14 May 2014 20:27:46 +0000 Subject: [PATCH 50/79] updated comments --- Adafruit_LEDBackpack/Adafruit_Bargraph.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Adafruit_LEDBackpack/Adafruit_Bargraph.py b/Adafruit_LEDBackpack/Adafruit_Bargraph.py index b2cc09d1..804991fa 100644 --- a/Adafruit_LEDBackpack/Adafruit_Bargraph.py +++ b/Adafruit_LEDBackpack/Adafruit_Bargraph.py @@ -8,7 +8,7 @@ # Bargraph Display # =========================================================================== -# This class is meant to be used with the four-character, seven segment +# This class is meant to be used with the 24-LED bicolor bargraph # displays available from Adafruit class Bargraph: From c07439a34fc820ee74f9ee3b47f172922cdab73d Mon Sep 17 00:00:00 2001 From: Sean McIntyre Date: Wed, 14 May 2014 20:29:13 +0000 Subject: [PATCH 51/79] removed bus changes --- Adafruit_LEDBackpack/Adafruit_LEDBackpack.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Adafruit_LEDBackpack/Adafruit_LEDBackpack.py b/Adafruit_LEDBackpack/Adafruit_LEDBackpack.py index 5318cb81..b2a20065 100644 --- a/Adafruit_LEDBackpack/Adafruit_LEDBackpack.py +++ b/Adafruit_LEDBackpack/Adafruit_LEDBackpack.py @@ -27,8 +27,8 @@ class LEDBackpack: 0x0000, 0x0000, 0x0000, 0x0000 ] # Constructor - def __init__(self, address=0x70, debug=False, bus=-1): - self.i2c = Adafruit_I2C(address, bus) + def __init__(self, address=0x70, debug=False): + self.i2c = Adafruit_I2C(address) self.address = address self.debug = debug From 7d2ef0ac3d583a2fe4eb2c0f0033395618c532af Mon Sep 17 00:00:00 2001 From: Lars Kellogg-Stedman Date: Thu, 15 May 2014 21:02:31 -0400 Subject: [PATCH 52/79] prevent segfault caused by bitidx++ This patch modifies Adafruit_DHT_Driver/Adafruit_DHT.c so that the code that increments `bitidx` without bound is protected by #ifdef DEBUG. This prevents this code from generating a segfault if readDHT is called several times (which will ultimately cause bitidx to increment beyond the end of the bits array). Resolves github issue #78. --- Adafruit_DHT_Driver/Adafruit_DHT.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Adafruit_DHT_Driver/Adafruit_DHT.c b/Adafruit_DHT_Driver/Adafruit_DHT.c index 9d1746be..a35cf10d 100644 --- a/Adafruit_DHT_Driver/Adafruit_DHT.c +++ b/Adafruit_DHT_Driver/Adafruit_DHT.c @@ -105,7 +105,9 @@ int readDHT(int type, int pin) { } laststate = bcm2835_gpio_lev(pin); if (counter == 1000) break; +#ifdef DEBUG bits[bitidx++] = counter; +#endif if ((i>3) && (i%2 == 0)) { // shove each bit into the storage bytes From fc3dd6c4a2cc6856a4a8858cafb1b90103cb76fb Mon Sep 17 00:00:00 2001 From: Tony DiCola Date: Mon, 9 Jun 2014 16:47:01 -0700 Subject: [PATCH 53/79] Mark Adafruit_DHT_Driver code as deprecated and point at new Adafruit_Python_DHT library. --- Adafruit_DHT_Driver/DEPRECATED.txt | 5 +++++ Adafruit_DHT_Driver_Python/DEPRECATED.txt | 5 +++++ 2 files changed, 10 insertions(+) create mode 100644 Adafruit_DHT_Driver/DEPRECATED.txt create mode 100644 Adafruit_DHT_Driver_Python/DEPRECATED.txt diff --git a/Adafruit_DHT_Driver/DEPRECATED.txt b/Adafruit_DHT_Driver/DEPRECATED.txt new file mode 100644 index 00000000..41c4538a --- /dev/null +++ b/Adafruit_DHT_Driver/DEPRECATED.txt @@ -0,0 +1,5 @@ +This Adafruit_DHT_Driver code is deprecated and has been superseded by the Python library +at https://github.com/adafruit/Adafruit_Python_DHT You can see the new library's C code +for interfacing with the DHT sensors on either a Raspberry Pi or Beaglebone Black in the +source/Raspberry_Pi or source/Beaglebone_Black directory of the new library. See more +details on installing and using the library in the learning guide at: https://learn.adafruit.com/dht-humidity-sensing-on-raspberry-pi-with-gdocs-logging/overview diff --git a/Adafruit_DHT_Driver_Python/DEPRECATED.txt b/Adafruit_DHT_Driver_Python/DEPRECATED.txt new file mode 100644 index 00000000..96dd74ec --- /dev/null +++ b/Adafruit_DHT_Driver_Python/DEPRECATED.txt @@ -0,0 +1,5 @@ +This Adafruit_DHT_Driver_Python code is deprecated and has been superseded by the Python +library at https://github.com/adafruit/Adafruit_Python_DHT You can see the new library's C +code for interfacing with the DHT sensors on either a Raspberry Pi or Beaglebone Black in the +source/Raspberry_Pi or source/Beaglebone_Black directory of the new library. See more details +on installing and using the library in the learning guide at: https://learn.adafruit.com/dht-humidity-sensing-on-raspberry-pi-with-gdocs-logging/overview From fa0a792f17fafe08925bbb78426862bab81600dd Mon Sep 17 00:00:00 2001 From: Tony DiCola Date: Thu, 19 Jun 2014 12:03:42 -0700 Subject: [PATCH 54/79] Add deprecation note to BMP085 code with pointer to new BMP085/180 sensor library. --- Adafruit_BMP085/DEPRECATED.txt | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 Adafruit_BMP085/DEPRECATED.txt diff --git a/Adafruit_BMP085/DEPRECATED.txt b/Adafruit_BMP085/DEPRECATED.txt new file mode 100644 index 00000000..4e7dadf4 --- /dev/null +++ b/Adafruit_BMP085/DEPRECATED.txt @@ -0,0 +1,5 @@ +This BMP085 sensor library has been deprecated in favor of a new version that supports both the Raspberry Pi and Beaglebone Black. + +You can find the new library with installation instructions at this github repository: https://github.com/adafruit/Adafruit_Python_BMP + +You can also find a tutorial on using this library at: https://learn.adafruit.com/using-the-bmp085-with-raspberry-pi/using-the-adafruit-bmp-python-library From b6bd43dfbe0830dbb2884c92f6921469d3271593 Mon Sep 17 00:00:00 2001 From: Tony DiCola Date: Thu, 19 Jun 2014 12:23:08 -0700 Subject: [PATCH 55/79] Fix getPiRevision to check for revision value 0002 or 0003 as rev 1 boards. --- Adafruit_I2C/Adafruit_I2C.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Adafruit_I2C/Adafruit_I2C.py b/Adafruit_I2C/Adafruit_I2C.py index 0c4a7d98..7140efba 100755 --- a/Adafruit_I2C/Adafruit_I2C.py +++ b/Adafruit_I2C/Adafruit_I2C.py @@ -13,11 +13,12 @@ def getPiRevision(): "Gets the version number of the Raspberry Pi board" # Courtesy quick2wire-python-api # https://github.com/quick2wire/quick2wire-python-api + # Updated revision info from: http://elinux.org/RPi_HardwareHistory#Board_Revision_History try: with open('/proc/cpuinfo','r') as f: for line in f: if line.startswith('Revision'): - return 1 if line.rstrip()[-1] in ['1','2'] else 2 + return 1 if line.rstrip()[-1] in ['2','3'] else 2 except: return 0 From d9c0bbb9e582df2d313a1b1538c8b5d41f7cc37a Mon Sep 17 00:00:00 2001 From: Tony DiCola Date: Thu, 19 Jun 2014 12:27:48 -0700 Subject: [PATCH 56/79] Fix bug with readS16 not returning signed results, and add optional explicit endian parameter to 16 bit reads. --- Adafruit_I2C/Adafruit_I2C.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/Adafruit_I2C/Adafruit_I2C.py b/Adafruit_I2C/Adafruit_I2C.py index 7140efba..0e718baa 100755 --- a/Adafruit_I2C/Adafruit_I2C.py +++ b/Adafruit_I2C/Adafruit_I2C.py @@ -115,20 +115,25 @@ def readS8(self, reg): except IOError, err: return self.errMsg() - def readU16(self, reg): + def readU16(self, reg, little_endian=True): "Reads an unsigned 16-bit value from the I2C device" try: result = self.bus.read_word_data(self.address,reg) + # Swap bytes if using big endian because read_word_data assumes little + # endian on ARM (little endian) systems. + if not little_endian: + result = ((result << 8) & 0xFF00) + (result >> 8) if (self.debug): print "I2C: Device 0x%02X returned 0x%04X from reg 0x%02X" % (self.address, result & 0xFFFF, reg) return result except IOError, err: return self.errMsg() - def readS16(self, reg): + def readS16(self, reg, little_endian=True): "Reads a signed 16-bit value from the I2C device" try: - result = self.bus.read_word_data(self.address,reg) + result = self.readU16(self.address,reg,little_endian) + if result > 32767: result -= 65536 if (self.debug): print "I2C: Device 0x%02X returned 0x%04X from reg 0x%02X" % (self.address, result & 0xFFFF, reg) return result From cfd736dd325f05492b1d54564a9ccdd71b82272a Mon Sep 17 00:00:00 2001 From: Tony DiCola Date: Thu, 19 Jun 2014 12:30:51 -0700 Subject: [PATCH 57/79] Remove debug log from readS16 to prevent double logging. --- Adafruit_I2C/Adafruit_I2C.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/Adafruit_I2C/Adafruit_I2C.py b/Adafruit_I2C/Adafruit_I2C.py index 0e718baa..9dd75c82 100755 --- a/Adafruit_I2C/Adafruit_I2C.py +++ b/Adafruit_I2C/Adafruit_I2C.py @@ -134,8 +134,6 @@ def readS16(self, reg, little_endian=True): try: result = self.readU16(self.address,reg,little_endian) if result > 32767: result -= 65536 - if (self.debug): - print "I2C: Device 0x%02X returned 0x%04X from reg 0x%02X" % (self.address, result & 0xFFFF, reg) return result except IOError, err: return self.errMsg() From 0924803b4005f39bcec8ec98818a6b92e0b0ccf0 Mon Sep 17 00:00:00 2001 From: Tony DiCola Date: Thu, 19 Jun 2014 12:47:38 -0700 Subject: [PATCH 58/79] Fix bug in calling readU16 from readS16. --- Adafruit_I2C/Adafruit_I2C.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Adafruit_I2C/Adafruit_I2C.py b/Adafruit_I2C/Adafruit_I2C.py index 9dd75c82..b1c88a59 100755 --- a/Adafruit_I2C/Adafruit_I2C.py +++ b/Adafruit_I2C/Adafruit_I2C.py @@ -132,7 +132,7 @@ def readU16(self, reg, little_endian=True): def readS16(self, reg, little_endian=True): "Reads a signed 16-bit value from the I2C device" try: - result = self.readU16(self.address,reg,little_endian) + result = self.readU16(reg,little_endian) if result > 32767: result -= 65536 return result except IOError, err: From 4d92bf17cfc620a492801fa41bb712addcc599d2 Mon Sep 17 00:00:00 2001 From: Sebastian Ludwig Date: Thu, 19 Jun 2014 23:23:13 +0200 Subject: [PATCH 59/79] Fixed: PWM servo driver did not reset properly during initialization. --- Adafruit_PWM_Servo_Driver/Adafruit_PWM_Servo_Driver.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Adafruit_PWM_Servo_Driver/Adafruit_PWM_Servo_Driver.py b/Adafruit_PWM_Servo_Driver/Adafruit_PWM_Servo_Driver.py index 76ab5137..686059fd 100644 --- a/Adafruit_PWM_Servo_Driver/Adafruit_PWM_Servo_Driver.py +++ b/Adafruit_PWM_Servo_Driver/Adafruit_PWM_Servo_Driver.py @@ -32,7 +32,7 @@ def __init__(self, address=0x40, debug=False): self.debug = debug if (self.debug): print "Reseting PCA9685" - self.i2c.write8(self.__MODE1, 0x00) + self.i2c.bus.write_byte(0x00, 0x06) def setPWMFreq(self, freq): "Sets the PWM frequency" From 47a75a2fa69301a269beb80fc5a563b1a2db9876 Mon Sep 17 00:00:00 2001 From: Sebastian Ludwig Date: Thu, 19 Jun 2014 23:27:39 +0200 Subject: [PATCH 60/79] Passing debug flag from PWM to Adafruit_I2C. --- Adafruit_PWM_Servo_Driver/Adafruit_PWM_Servo_Driver.py | 1 + 1 file changed, 1 insertion(+) diff --git a/Adafruit_PWM_Servo_Driver/Adafruit_PWM_Servo_Driver.py b/Adafruit_PWM_Servo_Driver/Adafruit_PWM_Servo_Driver.py index 686059fd..bfe9b64a 100644 --- a/Adafruit_PWM_Servo_Driver/Adafruit_PWM_Servo_Driver.py +++ b/Adafruit_PWM_Servo_Driver/Adafruit_PWM_Servo_Driver.py @@ -28,6 +28,7 @@ class PWM : def __init__(self, address=0x40, debug=False): self.i2c = Adafruit_I2C(address) + self.i2c.debug = debug self.address = address self.debug = debug if (self.debug): From 0780adbd87a165905572630b0730f357dec15bee Mon Sep 17 00:00:00 2001 From: Sebastian Ludwig Date: Fri, 20 Jun 2014 00:34:08 +0200 Subject: [PATCH 61/79] Addition to fix in 4d92bf1: ending sleep of PCA9685 in PWM servo driver initialization. --- Adafruit_PWM_Servo_Driver/Adafruit_PWM_Servo_Driver.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Adafruit_PWM_Servo_Driver/Adafruit_PWM_Servo_Driver.py b/Adafruit_PWM_Servo_Driver/Adafruit_PWM_Servo_Driver.py index bfe9b64a..73427baa 100644 --- a/Adafruit_PWM_Servo_Driver/Adafruit_PWM_Servo_Driver.py +++ b/Adafruit_PWM_Servo_Driver/Adafruit_PWM_Servo_Driver.py @@ -25,6 +25,7 @@ class PWM : __ALLLED_ON_H = 0xFB __ALLLED_OFF_L = 0xFC __ALLLED_OFF_H = 0xFD + __SLEEP = 0x10 def __init__(self, address=0x40, debug=False): self.i2c = Adafruit_I2C(address) @@ -34,6 +35,10 @@ def __init__(self, address=0x40, debug=False): if (self.debug): print "Reseting PCA9685" self.i2c.bus.write_byte(0x00, 0x06) + mode1 = self.i2c.readU8(self.__MODE1) + mode1 = mode1 & ~self.__SLEEP # wake up (reset sleep) + self.i2c.write8(self.__MODE1, mode1) + time.sleep(0.005) # wait for oscillator def setPWMFreq(self, freq): "Sets the PWM frequency" From e7ce458ad930dad07e69336210b5188c8b0c7cd4 Mon Sep 17 00:00:00 2001 From: Sebastian Ludwig Date: Sat, 21 Jun 2014 11:20:59 +0200 Subject: [PATCH 62/79] Extended fix in 4d92bf1 to work if more than one PCA9685 is connected. In the old version any subsequent board initialization reset all previously initialized boards. --- Adafruit_I2C/Adafruit_I2C.py | 14 ++++-- .../Adafruit_PWM_Servo_Driver.py | 43 +++++++++++++------ 2 files changed, 42 insertions(+), 15 deletions(-) diff --git a/Adafruit_I2C/Adafruit_I2C.py b/Adafruit_I2C/Adafruit_I2C.py index 0c4a7d98..6c826166 100755 --- a/Adafruit_I2C/Adafruit_I2C.py +++ b/Adafruit_I2C/Adafruit_I2C.py @@ -25,15 +25,14 @@ def getPiRevision(): def getPiI2CBusNumber(): # Gets the I2C bus number /dev/i2c# return 1 if Adafruit_I2C.getPiRevision() > 1 else 0 - + def __init__(self, address, busnum=-1, debug=False): self.address = address # By default, the correct I2C bus is auto-detected using /proc/cpuinfo # Alternatively, you can hard-code the bus version below: # self.bus = smbus.SMBus(0); # Force I2C0 (early 256MB Pi's) # self.bus = smbus.SMBus(1); # Force I2C1 (512MB Pi's) - self.bus = smbus.SMBus( - busnum if busnum >= 0 else Adafruit_I2C.getPiI2CBusNumber()) + self.bus = smbus.SMBus(busnum if busnum >= 0 else Adafruit_I2C.getPiI2CBusNumber()) self.debug = debug def reverseByteOrder(self, data): @@ -69,6 +68,15 @@ def write16(self, reg, value): except IOError, err: return self.errMsg() + def writeRaw8(self, value): + "Writes an 8-bit value on the bus" + try: + self.bus.write_byte(self.address, value) + if self.debug: + print "I2C: Wrote 0x%02X" % value + except IOError, err: + return self.errMsg() + def writeList(self, reg, list): "Writes an array of bytes using I2C format" try: diff --git a/Adafruit_PWM_Servo_Driver/Adafruit_PWM_Servo_Driver.py b/Adafruit_PWM_Servo_Driver/Adafruit_PWM_Servo_Driver.py index 73427baa..35c993ca 100644 --- a/Adafruit_PWM_Servo_Driver/Adafruit_PWM_Servo_Driver.py +++ b/Adafruit_PWM_Servo_Driver/Adafruit_PWM_Servo_Driver.py @@ -9,23 +9,35 @@ # ============================================================================ class PWM : - i2c = None - # Registers/etc. + __MODE1 = 0x00 + __MODE2 = 0x01 __SUBADR1 = 0x02 __SUBADR2 = 0x03 __SUBADR3 = 0x04 - __MODE1 = 0x00 __PRESCALE = 0xFE __LED0_ON_L = 0x06 __LED0_ON_H = 0x07 __LED0_OFF_L = 0x08 __LED0_OFF_H = 0x09 - __ALLLED_ON_L = 0xFA - __ALLLED_ON_H = 0xFB - __ALLLED_OFF_L = 0xFC - __ALLLED_OFF_H = 0xFD + __ALL_LED_ON_L = 0xFA + __ALL_LED_ON_H = 0xFB + __ALL_LED_OFF_L = 0xFC + __ALL_LED_OFF_H = 0xFD + + # Bits + __RESTART = 0x80 __SLEEP = 0x10 + __ALLCALL = 0x01 + __INVRT = 0x10 + __OUTDRV = 0x04 + + general_call_i2c = Adafruit_I2C(0x00) + + @classmethod + def softwareReset(cls): + "Sends a software reset (SWRST) command to all the servo drivers on the bus" + cls.general_call_i2c.writeRaw8(0x06) # SWRST def __init__(self, address=0x40, debug=False): self.i2c = Adafruit_I2C(address) @@ -33,8 +45,12 @@ def __init__(self, address=0x40, debug=False): self.address = address self.debug = debug if (self.debug): - print "Reseting PCA9685" - self.i2c.bus.write_byte(0x00, 0x06) + print "Reseting PCA9685 MODE1 (without SLEEP) and MODE2" + self.setAllPWM(0, 0) + self.i2c.write8(self.__MODE2, self.__OUTDRV) + self.i2c.write8(self.__MODE1, self.__ALLCALL) + time.sleep(0.005) # wait for oscillator + mode1 = self.i2c.readU8(self.__MODE1) mode1 = mode1 & ~self.__SLEEP # wake up (reset sleep) self.i2c.write8(self.__MODE1, mode1) @@ -68,6 +84,9 @@ def setPWM(self, channel, on, off): self.i2c.write8(self.__LED0_OFF_L+4*channel, off & 0xFF) self.i2c.write8(self.__LED0_OFF_H+4*channel, off >> 8) - - - + def setAllPWM(self, on, off): + "Sets a all PWM channels" + self.i2c.write8(self.__ALL_LED_ON_L, on & 0xFF) + self.i2c.write8(self.__ALL_LED_ON_H, on >> 8) + self.i2c.write8(self.__ALL_LED_OFF_L, off & 0xFF) + self.i2c.write8(self.__ALL_LED_OFF_H, off >> 8) From 79ae33a1023a041e35d924b9fdbcf548e5af4880 Mon Sep 17 00:00:00 2001 From: Asheesh Date: Mon, 14 Jul 2014 17:40:00 +0530 Subject: [PATCH 63/79] The gain value was missing the last two digits. Similar to other settings, the gain is 4 digits long. --- Adafruit_ADS1x15/ads1x15_ex_singleended.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Adafruit_ADS1x15/ads1x15_ex_singleended.py b/Adafruit_ADS1x15/ads1x15_ex_singleended.py index 383927fa..2c4dee43 100644 --- a/Adafruit_ADS1x15/ads1x15_ex_singleended.py +++ b/Adafruit_ADS1x15/ads1x15_ex_singleended.py @@ -13,7 +13,7 @@ def signal_handler(signal, frame): ADS1115 = 0x01 # 16-bit ADC # Select the gain -# gain = 61 # +/- 6.144V +# gain = 6144 # +/- 6.144V gain = 4096 # +/- 4.096V # gain = 2048 # +/- 2.048V # gain = 1024 # +/- 1.024V From 349fbb27f7fa8bb2f816b0733e3b40b8a9eb8365 Mon Sep 17 00:00:00 2001 From: Tony DiCola Date: Mon, 14 Jul 2014 21:23:18 +0000 Subject: [PATCH 64/79] Resolve #65 by adding optional backlight parameter which defaults on to init function. --- Adafruit_CharLCDPlate/Adafruit_CharLCDPlate.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/Adafruit_CharLCDPlate/Adafruit_CharLCDPlate.py b/Adafruit_CharLCDPlate/Adafruit_CharLCDPlate.py index 06b9300c..1e85c94b 100644 --- a/Adafruit_CharLCDPlate/Adafruit_CharLCDPlate.py +++ b/Adafruit_CharLCDPlate/Adafruit_CharLCDPlate.py @@ -76,7 +76,7 @@ class Adafruit_CharLCDPlate(Adafruit_I2C): # ---------------------------------------------------------------------- # Constructor - def __init__(self, busnum=-1, addr=0x20, debug=False): + def __init__(self, busnum=-1, addr=0x20, debug=False, backlight=ON): self.i2c = Adafruit_I2C(addr, busnum, debug) @@ -84,6 +84,11 @@ def __init__(self, busnum=-1, addr=0x20, debug=False): # so we don't need to constantly poll-and-change bit states. self.porta, self.portb, self.ddrb = 0, 0, 0b00010000 + # Set initial backlight color. + c = ~backlight + self.porta = (self.porta & 0b00111111) | ((c & 0b011) << 6) + self.portb = (self.portb & 0b11111110) | ((c & 0b100) >> 2) + # Set MCP23017 IOCON register to Bank 0 with sequential operation. # If chip is already set for Bank 0, this will just write to OLATB, # which won't seriously bother anything on the plate right now @@ -116,8 +121,8 @@ def __init__(self, busnum=-1, addr=0x20, debug=False): 0b00000000, # INTCAPB self.porta, # GPIOA self.portb, # GPIOB - self.porta, # OLATA 0 on all outputs; side effect of - self.portb ]) # OLATB turning on R+G+B backlight LEDs. + self.porta, # OLATA + self.portb ]) # OLATB # Switch to Bank 1 and disable sequential operation. # From this point forward, the register addresses do NOT match From 24fd2f449ab13e3fe0130fc3b206d73a9c108dee Mon Sep 17 00:00:00 2001 From: Tony DiCola Date: Mon, 14 Jul 2014 22:39:29 +0000 Subject: [PATCH 65/79] Resolve #43 and resolve #44 by adding 20x4 LCD support and 20x4 example. --- .../Adafruit_CharLCDPlate.py | 28 +++- Adafruit_CharLCDPlate/LCDtest_20x4.py | 156 ++++++++++++++++++ 2 files changed, 180 insertions(+), 4 deletions(-) create mode 100644 Adafruit_CharLCDPlate/LCDtest_20x4.py diff --git a/Adafruit_CharLCDPlate/Adafruit_CharLCDPlate.py b/Adafruit_CharLCDPlate/Adafruit_CharLCDPlate.py index 1e85c94b..f3913155 100644 --- a/Adafruit_CharLCDPlate/Adafruit_CharLCDPlate.py +++ b/Adafruit_CharLCDPlate/Adafruit_CharLCDPlate.py @@ -11,6 +11,7 @@ from Adafruit_I2C import Adafruit_I2C from time import sleep + class Adafruit_CharLCDPlate(Adafruit_I2C): # ---------------------------------------------------------------------- @@ -72,6 +73,13 @@ class Adafruit_CharLCDPlate(Adafruit_I2C): LCD_MOVERIGHT = 0x04 LCD_MOVELEFT = 0x00 + # Line addresses for up to 4 line displays. Maps line number to DDRAM address for line. + LINE_ADDRESSES = { 1: 0xC0, 2: 0x94, 3: 0xD4 } + + # Truncation constants for message function truncate parameter. + NO_TRUNCATE = 0 + TRUNCATE = 1 + TRUNCATE_ELLIPSIS = 2 # ---------------------------------------------------------------------- # Constructor @@ -265,6 +273,7 @@ def write(self, value, char_mode=False): def begin(self, cols, lines): self.currline = 0 self.numlines = lines + self.numcols = cols self.clear() @@ -409,13 +418,24 @@ def createChar(self, location, bitmap): self.write(self.LCD_SETDDRAMADDR) - def message(self, text): + def message(self, text, truncate=NO_TRUNCATE): """ Send string to LCD. Newline wraps to second line""" lines = str(text).split('\n') # Split at newline(s) for i, line in enumerate(lines): # For each substring... - if i > 0: # If newline(s), - self.write(0xC0) # set DDRAM address to 2nd line - self.write(line, True) # Issue substring + address = self.LINE_ADDRESSES.get(i, None) + if address is not None: # If newline(s), + self.write(address) # set DDRAM address to line + # Handle appropriate truncation if requested. + linelen = len(line) + if truncate == self.TRUNCATE and linelen > self.numcols: + # Hard truncation of line. + self.write(line[0:self.numcols], True) + elif truncate == self.TRUNCATE_ELLIPSIS and linelen > self.numcols: + # Nicer truncation with ellipses. + self.write(line[0:self.numcols-3] + '...', True) + else: + self.write(line, True) + def backlight(self, color): diff --git a/Adafruit_CharLCDPlate/LCDtest_20x4.py b/Adafruit_CharLCDPlate/LCDtest_20x4.py new file mode 100644 index 00000000..01fc8fe8 --- /dev/null +++ b/Adafruit_CharLCDPlate/LCDtest_20x4.py @@ -0,0 +1,156 @@ +#!/usr/bin/python + +#---------------------------------------------------------------- +# Author: Chris Crumpacker +# Date: May 2013 +# +# A demo of some of the built in helper functions of +# the Adafruit_CharLCDPlate.py This is 20x4 display specific. +# +# Using Adafruit_CharLCD code with the I2C and MCP230xx code aswell +#---------------------------------------------------------------- + +numcolumns = 20 +numrows = 4 + +from time import sleep +from Adafruit_CharLCDPlate import Adafruit_CharLCDPlate + +lcd = Adafruit_CharLCDPlate() + +lcd.begin(numcolumns, numrows) + +lcd.backlight(lcd.ON) +lcd.message("LCD 20x4\nDemonstration") +sleep(2) + +while True: + #Text on each line alone. + lcd.clear() + lcd.setCursor(0,0) + lcd.message("Line 1") + sleep(1) + + lcd.clear() + lcd.setCursor(0,1) + lcd.message("Line 2") + sleep(1) + + lcd.clear() + lcd.setCursor(0,2) + lcd.message("Line 3") + sleep(1) + + lcd.clear() + lcd.setCursor(0,3) + lcd.message("Line 4") + sleep(1) + + # Using the "\n" new line marker + lcd.clear() + lcd.setCursor(0,0) + lcd.message("Line 1") + sleep(1) + + lcd.clear() + lcd.setCursor(0,0) + lcd.message("Line 1\nLine 2") + sleep(1) + + lcd.clear() + lcd.setCursor(0,0) + lcd.message("Line 1\nLine 2\nLine 3") + sleep(1) + + lcd.clear() + lcd.setCursor(0,0) + lcd.message("Line 1\nLine 2\nLine 3\nLine 4") + sleep(1) + + # Auto line limiting by length as to not overflow the display + # This is line by line and does not to any caraige returns + lcd.clear() + lcd.setCursor(0,0) + lcd.message("This String is 33 Characters long", lcd.TRUNCATE) + sleep(2) + + lcd.clear() + lcd.setCursor(0,0) + lcd.message("This String has ellipsis", lcd.TRUNCATE_ELLIPSIS) + sleep(2) + + #Scroll text to the right + messageToPrint = "Scrolling Right" + i=0 + while i<20: + lcd.clear() + lcd.setCursor(0,0) + suffix = " " * i + lcd.message(suffix + messageToPrint, lcd.TRUNCATE) + sleep(.25) + i += 1 + + # Scroll test in from the Left + messageToPrint = "Scrolling Left" + i=20 + while i>=0: + lcd.clear() + lcd.setCursor(0,0) + suffix = " " * i + lcd.message(suffix + messageToPrint, lcd.TRUNCATE) + sleep(.25) + i -= 1 + sleep(2) + + # Printing text backwards, NOT right justified + lcd.clear() + lcd.setCursor(0,0) + lcd.message("Right to left:") + lcd.setCursor(10,1) + lcd.rightToLeft() + lcd.message("Testing") + sleep(2) + + # Printing normally from the middle of the line + lcd.clear() + lcd.setCursor(0,0) + lcd.message("Left to Right:") + lcd.setCursor(10,1) + lcd.message("Testing") + sleep(2) + + # Enabling the cursor and having it blink + lcd.clear() + lcd.setCursor(0,0) + lcd.cursor() + lcd.blink() + lcd.message("Cursor is blinking") + lcd.setCursor(0,1) + sleep(3) + lcd.noCursor() + lcd.noBlink() + + # Turning the backlight off and showing a simple count down + lcd.clear() + lcd.setCursor(0,0) + lcd.message("Backlight off in") + lcd.setCursor(0,3) + lcd.message("Back on in 3sec") + lcd.setCursor(17,0) #Reseting the cursor here keeps us from having to clear the screen, this over writes the previous character + lcd.message("3") + sleep(1) + + lcd.setCursor(17,0) + lcd.message("2") + sleep(1) + + lcd.setCursor(17,0) + lcd.message("1") + sleep(1) + + lcd.backlight(lcd.OFF) + lcd.clear() + lcd.setCursor(0,0) + sleep(3) + lcd.backlight(lcd.ON) + lcd.message("Backlight on") From f8085fe38f9043f8c51717fb6d4dcbd8661c7872 Mon Sep 17 00:00:00 2001 From: Tony DiCola Date: Tue, 15 Jul 2014 00:05:55 +0000 Subject: [PATCH 66/79] Make char LCD spaces/tabs consistent and clean up to be close to pep8 compliance. --- Adafruit_CharLCD/Adafruit_CharLCD.py | 276 +++++++----------- .../Adafruit_CharLCD_IPclock_example.py | 21 +- 2 files changed, 124 insertions(+), 173 deletions(-) diff --git a/Adafruit_CharLCD/Adafruit_CharLCD.py b/Adafruit_CharLCD/Adafruit_CharLCD.py index af6749ea..a4bb9a93 100755 --- a/Adafruit_CharLCD/Adafruit_CharLCD.py +++ b/Adafruit_CharLCD/Adafruit_CharLCD.py @@ -8,58 +8,58 @@ from time import sleep -class Adafruit_CharLCD: + +class Adafruit_CharLCD(object): # commands - LCD_CLEARDISPLAY = 0x01 - LCD_RETURNHOME = 0x02 - LCD_ENTRYMODESET = 0x04 - LCD_DISPLAYCONTROL = 0x08 - LCD_CURSORSHIFT = 0x10 - LCD_FUNCTIONSET = 0x20 - LCD_SETCGRAMADDR = 0x40 - LCD_SETDDRAMADDR = 0x80 + LCD_CLEARDISPLAY = 0x01 + LCD_RETURNHOME = 0x02 + LCD_ENTRYMODESET = 0x04 + LCD_DISPLAYCONTROL = 0x08 + LCD_CURSORSHIFT = 0x10 + LCD_FUNCTIONSET = 0x20 + LCD_SETCGRAMADDR = 0x40 + LCD_SETDDRAMADDR = 0x80 # flags for display entry mode - LCD_ENTRYRIGHT = 0x00 - LCD_ENTRYLEFT = 0x02 - LCD_ENTRYSHIFTINCREMENT = 0x01 - LCD_ENTRYSHIFTDECREMENT = 0x00 + LCD_ENTRYRIGHT = 0x00 + LCD_ENTRYLEFT = 0x02 + LCD_ENTRYSHIFTINCREMENT = 0x01 + LCD_ENTRYSHIFTDECREMENT = 0x00 # flags for display on/off control - LCD_DISPLAYON = 0x04 - LCD_DISPLAYOFF = 0x00 - LCD_CURSORON = 0x02 - LCD_CURSOROFF = 0x00 - LCD_BLINKON = 0x01 - LCD_BLINKOFF = 0x00 + LCD_DISPLAYON = 0x04 + LCD_DISPLAYOFF = 0x00 + LCD_CURSORON = 0x02 + LCD_CURSOROFF = 0x00 + LCD_BLINKON = 0x01 + LCD_BLINKOFF = 0x00 # flags for display/cursor shift - LCD_DISPLAYMOVE = 0x08 - LCD_CURSORMOVE = 0x00 + LCD_DISPLAYMOVE = 0x08 + LCD_CURSORMOVE = 0x00 # flags for display/cursor shift - LCD_DISPLAYMOVE = 0x08 - LCD_CURSORMOVE = 0x00 - LCD_MOVERIGHT = 0x04 - LCD_MOVELEFT = 0x00 + LCD_DISPLAYMOVE = 0x08 + LCD_CURSORMOVE = 0x00 + LCD_MOVERIGHT = 0x04 + LCD_MOVELEFT = 0x00 # flags for function set - LCD_8BITMODE = 0x10 - LCD_4BITMODE = 0x00 - LCD_2LINE = 0x08 - LCD_1LINE = 0x00 - LCD_5x10DOTS = 0x04 - LCD_5x8DOTS = 0x00 - - - - def __init__(self, pin_rs=25, pin_e=24, pins_db=[23, 17, 21, 22], GPIO = None): - # Emulate the old behavior of using RPi.GPIO if we haven't been given - # an explicit GPIO interface to use - if not GPIO: - import RPi.GPIO as GPIO - self.GPIO = GPIO + LCD_8BITMODE = 0x10 + LCD_4BITMODE = 0x00 + LCD_2LINE = 0x08 + LCD_1LINE = 0x00 + LCD_5x10DOTS = 0x04 + LCD_5x8DOTS = 0x00 + + def __init__(self, pin_rs=25, pin_e=24, pins_db=[23, 17, 21, 22], GPIO=None): + # Emulate the old behavior of using RPi.GPIO if we haven't been given + # an explicit GPIO interface to use + if not GPIO: + import RPi.GPIO as GPIO + GPIO.setwarnings(False) + self.GPIO = GPIO self.pin_rs = pin_rs self.pin_e = pin_e self.pins_db = pins_db @@ -71,190 +71,140 @@ def __init__(self, pin_rs=25, pin_e=24, pins_db=[23, 17, 21, 22], GPIO = None): for pin in self.pins_db: self.GPIO.setup(pin, GPIO.OUT) - self.write4bits(0x33) # initialization - self.write4bits(0x32) # initialization - self.write4bits(0x28) # 2 line 5x7 matrix - self.write4bits(0x0C) # turn cursor off 0x0E to enable cursor - self.write4bits(0x06) # shift cursor right + self.write4bits(0x33) # initialization + self.write4bits(0x32) # initialization + self.write4bits(0x28) # 2 line 5x7 matrix + self.write4bits(0x0C) # turn cursor off 0x0E to enable cursor + self.write4bits(0x06) # shift cursor right - self.displaycontrol = self.LCD_DISPLAYON | self.LCD_CURSOROFF | self.LCD_BLINKOFF + self.displaycontrol = self.LCD_DISPLAYON | self.LCD_CURSOROFF | self.LCD_BLINKOFF - self.displayfunction = self.LCD_4BITMODE | self.LCD_1LINE | self.LCD_5x8DOTS - self.displayfunction |= self.LCD_2LINE + self.displayfunction = self.LCD_4BITMODE | self.LCD_1LINE | self.LCD_5x8DOTS + self.displayfunction |= self.LCD_2LINE - """ Initialize to default text direction (for romance languages) """ - self.displaymode = self.LCD_ENTRYLEFT | self.LCD_ENTRYSHIFTDECREMENT - self.write4bits(self.LCD_ENTRYMODESET | self.displaymode) # set the entry mode + # Initialize to default text direction (for romance languages) + self.displaymode = self.LCD_ENTRYLEFT | self.LCD_ENTRYSHIFTDECREMENT + self.write4bits(self.LCD_ENTRYMODESET | self.displaymode) # set the entry mode self.clear() - def begin(self, cols, lines): - - if (lines > 1): - self.numlines = lines - self.displayfunction |= self.LCD_2LINE - + if (lines > 1): + self.numlines = lines + self.displayfunction |= self.LCD_2LINE def home(self): - - self.write4bits(self.LCD_RETURNHOME) # set cursor position to zero - self.delayMicroseconds(3000) # this command takes a long time! - + self.write4bits(self.LCD_RETURNHOME) # set cursor position to zero + self.delayMicroseconds(3000) # this command takes a long time! def clear(self): - - self.write4bits(self.LCD_CLEARDISPLAY) # command to clear display - self.delayMicroseconds(3000) # 3000 microsecond sleep, clearing the display takes a long time - + self.write4bits(self.LCD_CLEARDISPLAY) # command to clear display + self.delayMicroseconds(3000) # 3000 microsecond sleep, clearing the display takes a long time def setCursor(self, col, row): + self.row_offsets = [0x00, 0x40, 0x14, 0x54] + if row > self.numlines: + row = self.numlines - 1 # we count rows starting w/0 + self.write4bits(self.LCD_SETDDRAMADDR | (col + self.row_offsets[row])) - self.row_offsets = [ 0x00, 0x40, 0x14, 0x54 ] - - if ( row > self.numlines ): - row = self.numlines - 1 # we count rows starting w/0 - - self.write4bits(self.LCD_SETDDRAMADDR | (col + self.row_offsets[row])) - - - def noDisplay(self): - """ Turn the display off (quickly) """ - - self.displaycontrol &= ~self.LCD_DISPLAYON - self.write4bits(self.LCD_DISPLAYCONTROL | self.displaycontrol) - + def noDisplay(self): + """ Turn the display off (quickly) """ + self.displaycontrol &= ~self.LCD_DISPLAYON + self.write4bits(self.LCD_DISPLAYCONTROL | self.displaycontrol) def display(self): - """ Turn the display on (quickly) """ - - self.displaycontrol |= self.LCD_DISPLAYON - self.write4bits(self.LCD_DISPLAYCONTROL | self.displaycontrol) - + """ Turn the display on (quickly) """ + self.displaycontrol |= self.LCD_DISPLAYON + self.write4bits(self.LCD_DISPLAYCONTROL | self.displaycontrol) def noCursor(self): - """ Turns the underline cursor off """ - - self.displaycontrol &= ~self.LCD_CURSORON - self.write4bits(self.LCD_DISPLAYCONTROL | self.displaycontrol) - + """ Turns the underline cursor off """ + self.displaycontrol &= ~self.LCD_CURSORON + self.write4bits(self.LCD_DISPLAYCONTROL | self.displaycontrol) def cursor(self): - """ Turns the underline cursor on """ - - self.displaycontrol |= self.LCD_CURSORON - self.write4bits(self.LCD_DISPLAYCONTROL | self.displaycontrol) - + """ Turns the underline cursor on """ + self.displaycontrol |= self.LCD_CURSORON + self.write4bits(self.LCD_DISPLAYCONTROL | self.displaycontrol) def noBlink(self): - """ Turn the blinking cursor off """ - - self.displaycontrol &= ~self.LCD_BLINKON - self.write4bits(self.LCD_DISPLAYCONTROL | self.displaycontrol) - + """ Turn the blinking cursor off """ + self.displaycontrol &= ~self.LCD_BLINKON + self.write4bits(self.LCD_DISPLAYCONTROL | self.displaycontrol) def blink(self): - """ Turn the blinking cursor on """ - - self.displaycontrol |= self.LCD_BLINKON - self.write4bits(self.LCD_DISPLAYCONTROL | self.displaycontrol) - + """ Turn the blinking cursor on """ + self.displaycontrol |= self.LCD_BLINKON + self.write4bits(self.LCD_DISPLAYCONTROL | self.displaycontrol) def DisplayLeft(self): - """ These commands scroll the display without changing the RAM """ - - self.write4bits(self.LCD_CURSORSHIFT | self.LCD_DISPLAYMOVE | self.LCD_MOVELEFT) - + """ These commands scroll the display without changing the RAM """ + self.write4bits(self.LCD_CURSORSHIFT | self.LCD_DISPLAYMOVE | self.LCD_MOVELEFT) def scrollDisplayRight(self): - """ These commands scroll the display without changing the RAM """ - - self.write4bits(self.LCD_CURSORSHIFT | self.LCD_DISPLAYMOVE | self.LCD_MOVERIGHT); - + """ These commands scroll the display without changing the RAM """ + self.write4bits(self.LCD_CURSORSHIFT | self.LCD_DISPLAYMOVE | self.LCD_MOVERIGHT) def leftToRight(self): - """ This is for text that flows Left to Right """ - - self.displaymode |= self.LCD_ENTRYLEFT - self.write4bits(self.LCD_ENTRYMODESET | self.displaymode); - + """ This is for text that flows Left to Right """ + self.displaymode |= self.LCD_ENTRYLEFT + self.write4bits(self.LCD_ENTRYMODESET | self.displaymode) def rightToLeft(self): - """ This is for text that flows Right to Left """ - self.displaymode &= ~self.LCD_ENTRYLEFT - self.write4bits(self.LCD_ENTRYMODESET | self.displaymode) - + """ This is for text that flows Right to Left """ + self.displaymode &= ~self.LCD_ENTRYLEFT + self.write4bits(self.LCD_ENTRYMODESET | self.displaymode) def autoscroll(self): - """ This will 'right justify' text from the cursor """ - - self.displaymode |= self.LCD_ENTRYSHIFTINCREMENT - self.write4bits(self.LCD_ENTRYMODESET | self.displaymode) - - - def noAutoscroll(self): - """ This will 'left justify' text from the cursor """ - - self.displaymode &= ~self.LCD_ENTRYSHIFTINCREMENT - self.write4bits(self.LCD_ENTRYMODESET | self.displaymode) + """ This will 'right justify' text from the cursor """ + self.displaymode |= self.LCD_ENTRYSHIFTINCREMENT + self.write4bits(self.LCD_ENTRYMODESET | self.displaymode) + def noAutoscroll(self): + """ This will 'left justify' text from the cursor """ + self.displaymode &= ~self.LCD_ENTRYSHIFTINCREMENT + self.write4bits(self.LCD_ENTRYMODESET | self.displaymode) def write4bits(self, bits, char_mode=False): """ Send command to LCD """ - - self.delayMicroseconds(1000) # 1000 microsecond sleep - - bits=bin(bits)[2:].zfill(8) - + self.delayMicroseconds(1000) # 1000 microsecond sleep + bits = bin(bits)[2:].zfill(8) self.GPIO.output(self.pin_rs, char_mode) - for pin in self.pins_db: self.GPIO.output(pin, False) - for i in range(4): if bits[i] == "1": self.GPIO.output(self.pins_db[::-1][i], True) - - self.pulseEnable() - + self.pulseEnable() for pin in self.pins_db: self.GPIO.output(pin, False) - - for i in range(4,8): + for i in range(4, 8): if bits[i] == "1": self.GPIO.output(self.pins_db[::-1][i-4], True) - - self.pulseEnable() - + self.pulseEnable() def delayMicroseconds(self, microseconds): - seconds = microseconds / float(1000000) # divide microseconds by 1 million for seconds - sleep(seconds) - + seconds = microseconds / float(1000000) # divide microseconds by 1 million for seconds + sleep(seconds) def pulseEnable(self): - self.GPIO.output(self.pin_e, False) - self.delayMicroseconds(1) # 1 microsecond pause - enable pulse must be > 450ns - self.GPIO.output(self.pin_e, True) - self.delayMicroseconds(1) # 1 microsecond pause - enable pulse must be > 450ns - self.GPIO.output(self.pin_e, False) - self.delayMicroseconds(1) # commands need > 37us to settle - + self.GPIO.output(self.pin_e, False) + self.delayMicroseconds(1) # 1 microsecond pause - enable pulse must be > 450ns + self.GPIO.output(self.pin_e, True) + self.delayMicroseconds(1) # 1 microsecond pause - enable pulse must be > 450ns + self.GPIO.output(self.pin_e, False) + self.delayMicroseconds(1) # commands need > 37us to settle def message(self, text): """ Send string to LCD. Newline wraps to second line""" - for char in text: if char == '\n': - self.write4bits(0xC0) # next line + self.write4bits(0xC0) # next line else: - self.write4bits(ord(char),True) + self.write4bits(ord(char), True) if __name__ == '__main__': - lcd = Adafruit_CharLCD() - lcd.clear() lcd.message(" Adafruit 16x2\n Standard LCD") - diff --git a/Adafruit_CharLCD/Adafruit_CharLCD_IPclock_example.py b/Adafruit_CharLCD/Adafruit_CharLCD_IPclock_example.py index d3f6958f..f1be14cd 100755 --- a/Adafruit_CharLCD/Adafruit_CharLCD_IPclock_example.py +++ b/Adafruit_CharLCD/Adafruit_CharLCD_IPclock_example.py @@ -1,7 +1,7 @@ #!/usr/bin/python from Adafruit_CharLCD import Adafruit_CharLCD -from subprocess import * +from subprocess import * from time import sleep, strftime from datetime import datetime @@ -9,16 +9,17 @@ cmd = "ip addr show eth0 | grep inet | awk '{print $2}' | cut -d/ -f1" -lcd.begin(16,1) +lcd.begin(16, 1) + def run_cmd(cmd): - p = Popen(cmd, shell=True, stdout=PIPE) - output = p.communicate()[0] - return output + p = Popen(cmd, shell=True, stdout=PIPE) + output = p.communicate()[0] + return output while 1: - lcd.clear() - ipaddr = run_cmd(cmd) - lcd.message(datetime.now().strftime('%b %d %H:%M:%S\n')) - lcd.message('IP %s' % ( ipaddr ) ) - sleep(2) + lcd.clear() + ipaddr = run_cmd(cmd) + lcd.message(datetime.now().strftime('%b %d %H:%M:%S\n')) + lcd.message('IP %s' % (ipaddr)) + sleep(2) From b11eda5e7253e55c36b8e264b61f666f81816d98 Mon Sep 17 00:00:00 2001 From: Tony DiCola Date: Tue, 15 Jul 2014 01:21:36 +0000 Subject: [PATCH 67/79] Resolve #30 #31 #32 by fixing MCP230xx_GPIO class parameter order and adding CharLCD with MCP230xx example. --- Adafruit_CharLCD/Adafruit_MCP230xx.py | 1 + Adafruit_CharLCD/LCD_MCP230XX_test.py | 18 ++++++++++++++++++ Adafruit_MCP230xx/Adafruit_MCP230xx.py | 6 +++--- 3 files changed, 22 insertions(+), 3 deletions(-) create mode 120000 Adafruit_CharLCD/Adafruit_MCP230xx.py create mode 100644 Adafruit_CharLCD/LCD_MCP230XX_test.py diff --git a/Adafruit_CharLCD/Adafruit_MCP230xx.py b/Adafruit_CharLCD/Adafruit_MCP230xx.py new file mode 120000 index 00000000..3df8faef --- /dev/null +++ b/Adafruit_CharLCD/Adafruit_MCP230xx.py @@ -0,0 +1 @@ +../Adafruit_MCP230xx/Adafruit_MCP230xx.py \ No newline at end of file diff --git a/Adafruit_CharLCD/LCD_MCP230XX_test.py b/Adafruit_CharLCD/LCD_MCP230XX_test.py new file mode 100644 index 00000000..cc1e7bcd --- /dev/null +++ b/Adafruit_CharLCD/LCD_MCP230XX_test.py @@ -0,0 +1,18 @@ +#!/usr/bin/python +# Example script to show usage of MCP230xx GPIO extender to drive character LCD. + +from Adafruit_CharLCD import Adafruit_CharLCD +from Adafruit_MCP230xx import MCP230XX_GPIO + +bus = 1 # Note you need to change the bus number to 0 if running on a revision 1 Raspberry Pi. +address = 0x20 # I2C address of the MCP230xx chip. +gpio_count = 8 # Number of GPIOs exposed by the MCP230xx chip, should be 8 or 16 depending on chip. + +# Create MCP230xx GPIO adapter. +mcp = MCP230XX_GPIO(bus, address, gpio_count) + +# Create LCD, passing in MCP GPIO adapter. +lcd = Adafruit_CharLCD(pin_rs=1, pin_e=2, pins_db=[3,4,5,6], GPIO=mcp) + +lcd.clear() +lcd.message(" Adafruit 16x2\n Standard LCD") diff --git a/Adafruit_MCP230xx/Adafruit_MCP230xx.py b/Adafruit_MCP230xx/Adafruit_MCP230xx.py index b7ad9877..dc1b9c27 100755 --- a/Adafruit_MCP230xx/Adafruit_MCP230xx.py +++ b/Adafruit_MCP230xx/Adafruit_MCP230xx.py @@ -40,9 +40,9 @@ class Adafruit_MCP230XX(object): OUTPUT = 0 INPUT = 1 - def __init__(self, address, num_gpios): + def __init__(self, address, num_gpios, busnum=-1): assert num_gpios >= 0 and num_gpios <= 16, "Number of GPIOs must be between 0 and 16" - self.i2c = Adafruit_I2C(address=address) + self.i2c = Adafruit_I2C(address=address, busnum=busnum) self.address = address self.num_gpios = num_gpios @@ -162,7 +162,7 @@ class MCP230XX_GPIO(object): BCM = 0 BOARD = 0 def __init__(self, busnum, address, num_gpios): - self.chip = Adafruit_MCP230XX(busnum, address, num_gpios) + self.chip = Adafruit_MCP230XX(address, num_gpios, busnum) def setmode(self, mode): # do nothing pass From 1df4e74c30e967f029e698d868c124f98afcb8fb Mon Sep 17 00:00:00 2001 From: Wasif Malik Date: Sat, 2 Aug 2014 23:58:31 +0200 Subject: [PATCH 68/79] fix spelling mistake in ex_7segment_clock.py --- Adafruit_LEDBackpack/ex_7segment_clock.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Adafruit_LEDBackpack/ex_7segment_clock.py b/Adafruit_LEDBackpack/ex_7segment_clock.py index 634b6178..99f00ab1 100644 --- a/Adafruit_LEDBackpack/ex_7segment_clock.py +++ b/Adafruit_LEDBackpack/ex_7segment_clock.py @@ -23,7 +23,7 @@ # Set minutes segment.writeDigit(3, int(minute / 10)) # Tens segment.writeDigit(4, minute % 10) # Ones - # Toggle color + # Toggle colon segment.setColon(second % 2) # Toggle colon at 1Hz # Wait one second time.sleep(1) From 400ca3ecfb5123ed022b8ed2a3e7ca68b6f3f12f Mon Sep 17 00:00:00 2001 From: Joel Kuntz Date: Fri, 12 Sep 2014 07:54:20 -0300 Subject: [PATCH 69/79] Improved git clone link in README.md --- README.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index aba2ae53..8f342a3a 100644 --- a/README.md +++ b/README.md @@ -13,8 +13,11 @@ Adafruit's Raspberry-Pi Python Code Library BSD license, all text above and below must be included in any redistribution To download, we suggest logging into your Pi with Internet accessibility and typing: - git clone https://github.com/adafruit/Adafruit-Raspberry-Pi-Python-Code.git +```bash +git clone https://github.com/adafruit/Adafruit-Raspberry-Pi-Python-Code.git +``` + ============ Copyright (c) 2012-2013 Limor Fried, Kevin Townsend and Mikey Sklar for Adafruit Industries. All rights reserved. From ab9b67bba25a9a3bcb64a9c1e88aeac9fe66bccc Mon Sep 17 00:00:00 2001 From: Tony DiCola Date: Wed, 10 Dec 2014 20:22:40 +0000 Subject: [PATCH 70/79] Disable debug output in example by default. --- Adafruit_PWM_Servo_Driver/Servo_Example.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Adafruit_PWM_Servo_Driver/Servo_Example.py b/Adafruit_PWM_Servo_Driver/Servo_Example.py index 47527429..66a0d7fa 100644 --- a/Adafruit_PWM_Servo_Driver/Servo_Example.py +++ b/Adafruit_PWM_Servo_Driver/Servo_Example.py @@ -8,8 +8,9 @@ # =========================================================================== # Initialise the PWM device using the default address -# bmp = PWM(0x40, debug=True) -pwm = PWM(0x40, debug=True) +pwm = PWM(0x40) +# Note if you'd like more debug output you can instead run: +#pwm = PWM(0x40, debug=True) servoMin = 150 # Min pulse length out of 4096 servoMax = 600 # Max pulse length out of 4096 From a8ea1ebfef05da95c208a12bce6940f45fd0e09b Mon Sep 17 00:00:00 2001 From: Tony DiCola Date: Wed, 21 Jan 2015 21:04:10 +0000 Subject: [PATCH 71/79] Update I2C revision detection to use logic from newer GPIO library. Fixes bug with A+ misidentification. --- Adafruit_I2C/Adafruit_I2C.py | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/Adafruit_I2C/Adafruit_I2C.py b/Adafruit_I2C/Adafruit_I2C.py index ba81def3..2b24b67f 100755 --- a/Adafruit_I2C/Adafruit_I2C.py +++ b/Adafruit_I2C/Adafruit_I2C.py @@ -1,5 +1,5 @@ #!/usr/bin/python - +import re import smbus # =========================================================================== @@ -11,14 +11,21 @@ class Adafruit_I2C(object): @staticmethod def getPiRevision(): "Gets the version number of the Raspberry Pi board" - # Courtesy quick2wire-python-api - # https://github.com/quick2wire/quick2wire-python-api - # Updated revision info from: http://elinux.org/RPi_HardwareHistory#Board_Revision_History + # Revision list available at: http://elinux.org/RPi_HardwareHistory#Board_Revision_History try: - with open('/proc/cpuinfo','r') as f: - for line in f: - if line.startswith('Revision'): - return 1 if line.rstrip()[-1] in ['2','3'] else 2 + with open('/proc/cpuinfo', 'r') as infile: + for line in infile: + # Match a line of the form "Revision : 0002" while ignoring extra + # info in front of the revsion (like 1000 when the Pi was over-volted). + match = re.match('Revision\s+:\s+.*(\w{4})$', line) + if match and match.group(1) in ['0000', '0002', '0003']: + # Return revision 1 if revision ends with 0000, 0002 or 0003. + return 1 + elif match: + # Assume revision 2 if revision ends with any other 4 chars. + return 2 + # Couldn't find the revision, assume revision 0 like older code for compatibility. + return 0 except: return 0 From 42cf3c92eb3141fcfbf3be1884a7cc967b3f8b92 Mon Sep 17 00:00:00 2001 From: Tony DiCola Date: Mon, 16 Mar 2015 11:15:41 -0700 Subject: [PATCH 72/79] Update TC34725 color temp calculcation to catch divide by zero and return no value. --- Adafruit_TCS34725/Adafruit_TCS34725.py | 8 ++++++++ Adafruit_TCS34725/Adafruit_TCS34725_Example.py | 5 ++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/Adafruit_TCS34725/Adafruit_TCS34725.py b/Adafruit_TCS34725/Adafruit_TCS34725.py index 04cc9356..1764c172 100644 --- a/Adafruit_TCS34725/Adafruit_TCS34725.py +++ b/Adafruit_TCS34725/Adafruit_TCS34725.py @@ -196,10 +196,18 @@ def calculateColorTemperature(rgb): Y = (-0.32466 * rgb['r']) + (1.57837 * rgb['g']) + (-0.73191 * rgb['b']) Z = (-0.68202 * rgb['r']) + (0.77073 * rgb['g']) + ( 0.56332 * rgb['b']) + # Check for divide by 0 (total darkness) and return None. + if (x + y + z) == 0: + return None + # 2. Calculate the chromaticity co-ordinates xc = (X) / (X + Y + Z) yc = (Y) / (X + Y + Z) + # Check for divide by 0 again and return None. + if (0.1858 - yc) == 0: + return None + # 3. Use McCamy's formula to determine the CCT n = (xc - 0.3320) / (0.1858 - yc) diff --git a/Adafruit_TCS34725/Adafruit_TCS34725_Example.py b/Adafruit_TCS34725/Adafruit_TCS34725_Example.py index d76ba40a..c55ccb21 100644 --- a/Adafruit_TCS34725/Adafruit_TCS34725_Example.py +++ b/Adafruit_TCS34725/Adafruit_TCS34725_Example.py @@ -16,7 +16,10 @@ colorTemp = tcs.calculateColorTemperature(rgb) lux = tcs.calculateLux(rgb) print rgb -print "Color Temperature: %d K" % colorTemp +if colorTemp is None: + print 'Too dark to determine color temperature!' +else: + print "Color Temperature: %d K" % colorTemp print "Luminosity: %d lux" % lux tcs.setInterrupt(True) sleep(1) From 0c1bb483bc929567817a72af481dc168b454fb1a Mon Sep 17 00:00:00 2001 From: Tony DiCola Date: Sun, 22 Mar 2015 19:57:00 -0700 Subject: [PATCH 73/79] Fix casing with divide by 0 check. --- Adafruit_TCS34725/Adafruit_TCS34725.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Adafruit_TCS34725/Adafruit_TCS34725.py b/Adafruit_TCS34725/Adafruit_TCS34725.py index 1764c172..08a50f78 100644 --- a/Adafruit_TCS34725/Adafruit_TCS34725.py +++ b/Adafruit_TCS34725/Adafruit_TCS34725.py @@ -197,7 +197,7 @@ def calculateColorTemperature(rgb): Z = (-0.68202 * rgb['r']) + (0.77073 * rgb['g']) + ( 0.56332 * rgb['b']) # Check for divide by 0 (total darkness) and return None. - if (x + y + z) == 0: + if (X + Y + Z) == 0: return None # 2. Calculate the chromaticity co-ordinates From ac011c4a43d82f15f08256769f042126120895c2 Mon Sep 17 00:00:00 2001 From: Omry Nachman Date: Wed, 1 Apr 2015 12:53:25 +0300 Subject: [PATCH 74/79] Bug fix: signed differential sample values are ignored in ADS1015 (12 bit) --- Adafruit_ADS1x15/Adafruit_ADS1x15.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Adafruit_ADS1x15/Adafruit_ADS1x15.py b/Adafruit_ADS1x15/Adafruit_ADS1x15.py index 32141f4b..eb58087d 100644 --- a/Adafruit_ADS1x15/Adafruit_ADS1x15.py +++ b/Adafruit_ADS1x15/Adafruit_ADS1x15.py @@ -289,7 +289,11 @@ def readADCDifferential(self, chP=0, chN=1, pga=6144, sps=250): result = self.i2c.readList(self.__ADS1015_REG_POINTER_CONVERT, 2) if (self.ic == self.__IC_ADS1015): # Shift right 4 bits for the 12-bit ADS1015 and convert to mV - return ( ((result[0] << 8) | (result[1] & 0xFF)) >> 4 )*pga/2048.0 + val = ((result[0] << 8) | (result[1] & 0xFF)) >> 4 + # (Take signed values into account as well) + if val >> 11: + val = val - 0xfff + return val*pga/2048.0 else: # Return a mV value for the ADS1115 # (Take signed values into account as well) From c6bbb569d49e35bb3af0f001607f40622296a673 Mon Sep 17 00:00:00 2001 From: gooligumelec Date: Sat, 20 Jun 2015 22:22:51 +1000 Subject: [PATCH 75/79] Added getKeys() method to read key presses recorded by HT16K33 keyscan --- Adafruit_LEDBackpack/Adafruit_LEDBackpack.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/Adafruit_LEDBackpack/Adafruit_LEDBackpack.py b/Adafruit_LEDBackpack/Adafruit_LEDBackpack.py index b2a20065..00d7ba6c 100644 --- a/Adafruit_LEDBackpack/Adafruit_LEDBackpack.py +++ b/Adafruit_LEDBackpack/Adafruit_LEDBackpack.py @@ -16,6 +16,9 @@ class LEDBackpack: __HT16K33_REGISTER_SYSTEM_SETUP = 0x20 __HT16K33_REGISTER_DIMMING = 0xE0 + # Data base addresses + __HT16K33_ADDRESS_KEY_DATA = 0x40 + # Blink rate __HT16K33_BLINKRATE_OFF = 0x00 __HT16K33_BLINKRATE_2HZ = 0x01 @@ -83,6 +86,12 @@ def writeDisplay(self): bytes.append((item >> 8) & 0xFF) self.i2c.writeList(0x00, bytes) + def getKeys(self, row): + "Returns a row of scanned key press values as a single 13-bit value (K13:K1)" + if (row > 2): + return + return self.i2c.readU16(self.__HT16K33_ADDRESS_KEY_DATA + row*2) + def clear(self, update=True): "Clears the display memory" self.__buffer = [ 0, 0, 0, 0, 0, 0, 0, 0 ] @@ -90,4 +99,3 @@ def clear(self, update=True): self.writeDisplay() led = LEDBackpack(0x70) - From 9ff733d59242a02f7ccd0222001ce80f6090a978 Mon Sep 17 00:00:00 2001 From: Tony DiCola Date: Wed, 28 Oct 2015 22:58:49 -0700 Subject: [PATCH 76/79] Update ex_7segment_clock.py --- Adafruit_LEDBackpack/ex_7segment_clock.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Adafruit_LEDBackpack/ex_7segment_clock.py b/Adafruit_LEDBackpack/ex_7segment_clock.py index 99f00ab1..51aee185 100644 --- a/Adafruit_LEDBackpack/ex_7segment_clock.py +++ b/Adafruit_LEDBackpack/ex_7segment_clock.py @@ -25,5 +25,5 @@ segment.writeDigit(4, minute % 10) # Ones # Toggle colon segment.setColon(second % 2) # Toggle colon at 1Hz - # Wait one second - time.sleep(1) + # Wait a quarter second (less than 1 second to prevent colon blinking getting in phase with odd/even seconds). + time.sleep(0.25) From 8bff693be3e95cd0a9be217f12b78ee30cf1d8c6 Mon Sep 17 00:00:00 2001 From: Tony DiCola Date: Wed, 20 Apr 2016 22:42:08 +0000 Subject: [PATCH 77/79] Major update! See README.md for new location of updated Raspberry Pi Python code. Legacy code moved to legacy branch. --- Adafruit_ADS1x15/Adafruit_ADS1x15.py | 726 ------------------ Adafruit_ADS1x15/Adafruit_I2C.py | 1 - Adafruit_ADS1x15/ads1x15_ex_comparator.py | 30 - Adafruit_ADS1x15/ads1x15_ex_differential.py | 27 - Adafruit_ADS1x15/ads1x15_ex_singleended.py | 43 -- Adafruit_ADXL345/Adafruit_ADXL345.py | 114 --- Adafruit_ADXL345/Adafruit_I2C.py | 1 - Adafruit_BMP085/Adafruit_BMP085.py | 259 ------- Adafruit_BMP085/Adafruit_BMP085_example.py | 35 - .../Adafruit_BMP085_googledocs_ex.py | 69 -- Adafruit_BMP085/Adafruit_I2C.py | 1 - Adafruit_BMP085/DEPRECATED.txt | 5 - Adafruit_CharLCD/Adafruit_CharLCD.py | 210 ----- .../Adafruit_CharLCD_IPclock_example.py | 25 - Adafruit_CharLCD/Adafruit_I2C.py | 1 - Adafruit_CharLCD/Adafruit_MCP230xx.py | 1 - Adafruit_CharLCD/LCD_MCP230XX_test.py | 18 - .../Adafruit_CharLCDPlate.py | 504 ------------ Adafruit_CharLCDPlate/Adafruit_I2C.py | 1 - Adafruit_CharLCDPlate/Adafruit_MCP230xx.py | 1 - Adafruit_CharLCDPlate/LCDtest.py | 37 - Adafruit_CharLCDPlate/LCDtest_20x4.py | 156 ---- Adafruit_DHT_Driver/Adafruit_DHT | Bin 30400 -> 0 bytes Adafruit_DHT_Driver/Adafruit_DHT.c | 150 ---- .../Adafruit_DHT_googledocs.ex.py | 72 -- Adafruit_DHT_Driver/DEPRECATED.txt | 5 - Adafruit_DHT_Driver/Makefile | 10 - Adafruit_DHT_Driver_Python/Adafruit_DHT.py | 40 - Adafruit_DHT_Driver_Python/DEPRECATED.txt | 5 - Adafruit_DHT_Driver_Python/README.md | 25 - Adafruit_DHT_Driver_Python/dhtreader.c | 179 ----- Adafruit_DHT_Driver_Python/setup.py | 14 - Adafruit_I2C/Adafruit_I2C.py | 161 ---- Adafruit_LEDBackpack/Adafruit_7Segment.py | 52 -- Adafruit_LEDBackpack/Adafruit_8x8.py | 75 -- Adafruit_LEDBackpack/Adafruit_Bargraph.py | 55 -- Adafruit_LEDBackpack/Adafruit_I2C.py | 1 - Adafruit_LEDBackpack/Adafruit_LEDBackpack.py | 101 --- Adafruit_LEDBackpack/ex_7segment_clock.py | 29 - Adafruit_LEDBackpack/ex_8x8_color_pixels.py | 23 - Adafruit_LEDBackpack/ex_8x8_pixels.py | 22 - Adafruit_LEDBackpack/ex_bargraph.py | 19 - Adafruit_LEDpixels/Adafruit_LEDpixels.py | 81 -- Adafruit_LSM303/Adafruit_I2C.py | 1 - Adafruit_LSM303/Adafruit_LSM303.py | 122 --- Adafruit_MCP230xx/Adafruit_I2C.py | 1 - Adafruit_MCP230xx/Adafruit_MCP230xx.py | 204 ----- Adafruit_MCP3002/MCP3002.py | 94 --- Adafruit_MCP3008/mcp3008.py | 102 --- Adafruit_MCP4725/Adafruit_I2C.py | 1 - Adafruit_MCP4725/Adafruit_MCP4725.py | 35 - Adafruit_MCP4725/sinewave.py | 172 ----- Adafruit_PWM_Servo_Driver/Adafruit_I2C.py | 1 - .../Adafruit_PWM_Servo_Driver.py | 92 --- Adafruit_PWM_Servo_Driver/Servo_Example.py | 37 - Adafruit_TCS34725/Adafruit_I2C.py | 170 ---- Adafruit_TCS34725/Adafruit_TCS34725.py | 228 ------ .../Adafruit_TCS34725_Example.py | 26 - Adafruit_VCNL4000/Adafruit_I2C.py | 1 - Adafruit_VCNL4000/Adafruit_VCNL4000.py | 61 -- .../Adafruit_VCNL4000_example.py | 17 - README.md | 108 +-- 62 files changed, 63 insertions(+), 4794 deletions(-) delete mode 100644 Adafruit_ADS1x15/Adafruit_ADS1x15.py delete mode 120000 Adafruit_ADS1x15/Adafruit_I2C.py delete mode 100644 Adafruit_ADS1x15/ads1x15_ex_comparator.py delete mode 100644 Adafruit_ADS1x15/ads1x15_ex_differential.py delete mode 100644 Adafruit_ADS1x15/ads1x15_ex_singleended.py delete mode 100755 Adafruit_ADXL345/Adafruit_ADXL345.py delete mode 120000 Adafruit_ADXL345/Adafruit_I2C.py delete mode 100755 Adafruit_BMP085/Adafruit_BMP085.py delete mode 100755 Adafruit_BMP085/Adafruit_BMP085_example.py delete mode 100755 Adafruit_BMP085/Adafruit_BMP085_googledocs_ex.py delete mode 120000 Adafruit_BMP085/Adafruit_I2C.py delete mode 100644 Adafruit_BMP085/DEPRECATED.txt delete mode 100755 Adafruit_CharLCD/Adafruit_CharLCD.py delete mode 100755 Adafruit_CharLCD/Adafruit_CharLCD_IPclock_example.py delete mode 120000 Adafruit_CharLCD/Adafruit_I2C.py delete mode 120000 Adafruit_CharLCD/Adafruit_MCP230xx.py delete mode 100644 Adafruit_CharLCD/LCD_MCP230XX_test.py delete mode 100644 Adafruit_CharLCDPlate/Adafruit_CharLCDPlate.py delete mode 120000 Adafruit_CharLCDPlate/Adafruit_I2C.py delete mode 120000 Adafruit_CharLCDPlate/Adafruit_MCP230xx.py delete mode 100644 Adafruit_CharLCDPlate/LCDtest.py delete mode 100644 Adafruit_CharLCDPlate/LCDtest_20x4.py delete mode 100755 Adafruit_DHT_Driver/Adafruit_DHT delete mode 100644 Adafruit_DHT_Driver/Adafruit_DHT.c delete mode 100755 Adafruit_DHT_Driver/Adafruit_DHT_googledocs.ex.py delete mode 100644 Adafruit_DHT_Driver/DEPRECATED.txt delete mode 100644 Adafruit_DHT_Driver/Makefile delete mode 100644 Adafruit_DHT_Driver_Python/Adafruit_DHT.py delete mode 100644 Adafruit_DHT_Driver_Python/DEPRECATED.txt delete mode 100644 Adafruit_DHT_Driver_Python/README.md delete mode 100644 Adafruit_DHT_Driver_Python/dhtreader.c delete mode 100644 Adafruit_DHT_Driver_Python/setup.py delete mode 100755 Adafruit_I2C/Adafruit_I2C.py delete mode 100644 Adafruit_LEDBackpack/Adafruit_7Segment.py delete mode 100644 Adafruit_LEDBackpack/Adafruit_8x8.py delete mode 100644 Adafruit_LEDBackpack/Adafruit_Bargraph.py delete mode 120000 Adafruit_LEDBackpack/Adafruit_I2C.py delete mode 100644 Adafruit_LEDBackpack/Adafruit_LEDBackpack.py delete mode 100644 Adafruit_LEDBackpack/ex_7segment_clock.py delete mode 100644 Adafruit_LEDBackpack/ex_8x8_color_pixels.py delete mode 100644 Adafruit_LEDBackpack/ex_8x8_pixels.py delete mode 100644 Adafruit_LEDBackpack/ex_bargraph.py delete mode 100644 Adafruit_LEDpixels/Adafruit_LEDpixels.py delete mode 120000 Adafruit_LSM303/Adafruit_I2C.py delete mode 100755 Adafruit_LSM303/Adafruit_LSM303.py delete mode 120000 Adafruit_MCP230xx/Adafruit_I2C.py delete mode 100755 Adafruit_MCP230xx/Adafruit_MCP230xx.py delete mode 100644 Adafruit_MCP3002/MCP3002.py delete mode 100644 Adafruit_MCP3008/mcp3008.py delete mode 120000 Adafruit_MCP4725/Adafruit_I2C.py delete mode 100755 Adafruit_MCP4725/Adafruit_MCP4725.py delete mode 100755 Adafruit_MCP4725/sinewave.py delete mode 120000 Adafruit_PWM_Servo_Driver/Adafruit_I2C.py delete mode 100644 Adafruit_PWM_Servo_Driver/Adafruit_PWM_Servo_Driver.py delete mode 100644 Adafruit_PWM_Servo_Driver/Servo_Example.py delete mode 100644 Adafruit_TCS34725/Adafruit_I2C.py delete mode 100644 Adafruit_TCS34725/Adafruit_TCS34725.py delete mode 100644 Adafruit_TCS34725/Adafruit_TCS34725_Example.py delete mode 120000 Adafruit_VCNL4000/Adafruit_I2C.py delete mode 100755 Adafruit_VCNL4000/Adafruit_VCNL4000.py delete mode 100755 Adafruit_VCNL4000/Adafruit_VCNL4000_example.py diff --git a/Adafruit_ADS1x15/Adafruit_ADS1x15.py b/Adafruit_ADS1x15/Adafruit_ADS1x15.py deleted file mode 100644 index eb58087d..00000000 --- a/Adafruit_ADS1x15/Adafruit_ADS1x15.py +++ /dev/null @@ -1,726 +0,0 @@ -#!/usr/bin/python - -import time -import smbus -from Adafruit_I2C import Adafruit_I2C - -# =========================================================================== -# ADS1x15 Class -# -# Originally written by K. Townsend, Adafruit (https://github.com/adafruit/Adafruit-Raspberry-Pi-Python-Code/tree/master/Adafruit_ADS1x15) -# Updates and new functions implementation by Pedro Villanueva, 03/2013. -# The only error in the original code was in line 57: -# __ADS1015_REG_CONFIG_DR_920SPS = 0x0050 -# should be -# __ADS1015_REG_CONFIG_DR_920SPS = 0x0060 -# -# NOT IMPLEMENTED: Conversion ready pin, page 15 datasheet. -# =========================================================================== - -class ADS1x15: - i2c = None - - # IC Identifiers - __IC_ADS1015 = 0x00 - __IC_ADS1115 = 0x01 - - # Pointer Register - __ADS1015_REG_POINTER_MASK = 0x03 - __ADS1015_REG_POINTER_CONVERT = 0x00 - __ADS1015_REG_POINTER_CONFIG = 0x01 - __ADS1015_REG_POINTER_LOWTHRESH = 0x02 - __ADS1015_REG_POINTER_HITHRESH = 0x03 - - # Config Register - __ADS1015_REG_CONFIG_OS_MASK = 0x8000 - __ADS1015_REG_CONFIG_OS_SINGLE = 0x8000 # Write: Set to start a single-conversion - __ADS1015_REG_CONFIG_OS_BUSY = 0x0000 # Read: Bit = 0 when conversion is in progress - __ADS1015_REG_CONFIG_OS_NOTBUSY = 0x8000 # Read: Bit = 1 when device is not performing a conversion - - __ADS1015_REG_CONFIG_MUX_MASK = 0x7000 - __ADS1015_REG_CONFIG_MUX_DIFF_0_1 = 0x0000 # Differential P = AIN0, N = AIN1 (default) - __ADS1015_REG_CONFIG_MUX_DIFF_0_3 = 0x1000 # Differential P = AIN0, N = AIN3 - __ADS1015_REG_CONFIG_MUX_DIFF_1_3 = 0x2000 # Differential P = AIN1, N = AIN3 - __ADS1015_REG_CONFIG_MUX_DIFF_2_3 = 0x3000 # Differential P = AIN2, N = AIN3 - __ADS1015_REG_CONFIG_MUX_SINGLE_0 = 0x4000 # Single-ended AIN0 - __ADS1015_REG_CONFIG_MUX_SINGLE_1 = 0x5000 # Single-ended AIN1 - __ADS1015_REG_CONFIG_MUX_SINGLE_2 = 0x6000 # Single-ended AIN2 - __ADS1015_REG_CONFIG_MUX_SINGLE_3 = 0x7000 # Single-ended AIN3 - - __ADS1015_REG_CONFIG_PGA_MASK = 0x0E00 - __ADS1015_REG_CONFIG_PGA_6_144V = 0x0000 # +/-6.144V range - __ADS1015_REG_CONFIG_PGA_4_096V = 0x0200 # +/-4.096V range - __ADS1015_REG_CONFIG_PGA_2_048V = 0x0400 # +/-2.048V range (default) - __ADS1015_REG_CONFIG_PGA_1_024V = 0x0600 # +/-1.024V range - __ADS1015_REG_CONFIG_PGA_0_512V = 0x0800 # +/-0.512V range - __ADS1015_REG_CONFIG_PGA_0_256V = 0x0A00 # +/-0.256V range - - __ADS1015_REG_CONFIG_MODE_MASK = 0x0100 - __ADS1015_REG_CONFIG_MODE_CONTIN = 0x0000 # Continuous conversion mode - __ADS1015_REG_CONFIG_MODE_SINGLE = 0x0100 # Power-down single-shot mode (default) - - __ADS1015_REG_CONFIG_DR_MASK = 0x00E0 - __ADS1015_REG_CONFIG_DR_128SPS = 0x0000 # 128 samples per second - __ADS1015_REG_CONFIG_DR_250SPS = 0x0020 # 250 samples per second - __ADS1015_REG_CONFIG_DR_490SPS = 0x0040 # 490 samples per second - __ADS1015_REG_CONFIG_DR_920SPS = 0x0060 # 920 samples per second - __ADS1015_REG_CONFIG_DR_1600SPS = 0x0080 # 1600 samples per second (default) - __ADS1015_REG_CONFIG_DR_2400SPS = 0x00A0 # 2400 samples per second - __ADS1015_REG_CONFIG_DR_3300SPS = 0x00C0 # 3300 samples per second (also 0x00E0) - - __ADS1115_REG_CONFIG_DR_8SPS = 0x0000 # 8 samples per second - __ADS1115_REG_CONFIG_DR_16SPS = 0x0020 # 16 samples per second - __ADS1115_REG_CONFIG_DR_32SPS = 0x0040 # 32 samples per second - __ADS1115_REG_CONFIG_DR_64SPS = 0x0060 # 64 samples per second - __ADS1115_REG_CONFIG_DR_128SPS = 0x0080 # 128 samples per second - __ADS1115_REG_CONFIG_DR_250SPS = 0x00A0 # 250 samples per second (default) - __ADS1115_REG_CONFIG_DR_475SPS = 0x00C0 # 475 samples per second - __ADS1115_REG_CONFIG_DR_860SPS = 0x00E0 # 860 samples per second - - __ADS1015_REG_CONFIG_CMODE_MASK = 0x0010 - __ADS1015_REG_CONFIG_CMODE_TRAD = 0x0000 # Traditional comparator with hysteresis (default) - __ADS1015_REG_CONFIG_CMODE_WINDOW = 0x0010 # Window comparator - - __ADS1015_REG_CONFIG_CPOL_MASK = 0x0008 - __ADS1015_REG_CONFIG_CPOL_ACTVLOW = 0x0000 # ALERT/RDY pin is low when active (default) - __ADS1015_REG_CONFIG_CPOL_ACTVHI = 0x0008 # ALERT/RDY pin is high when active - - __ADS1015_REG_CONFIG_CLAT_MASK = 0x0004 # Determines if ALERT/RDY pin latches once asserted - __ADS1015_REG_CONFIG_CLAT_NONLAT = 0x0000 # Non-latching comparator (default) - __ADS1015_REG_CONFIG_CLAT_LATCH = 0x0004 # Latching comparator - - __ADS1015_REG_CONFIG_CQUE_MASK = 0x0003 - __ADS1015_REG_CONFIG_CQUE_1CONV = 0x0000 # Assert ALERT/RDY after one conversions - __ADS1015_REG_CONFIG_CQUE_2CONV = 0x0001 # Assert ALERT/RDY after two conversions - __ADS1015_REG_CONFIG_CQUE_4CONV = 0x0002 # Assert ALERT/RDY after four conversions - __ADS1015_REG_CONFIG_CQUE_NONE = 0x0003 # Disable the comparator and put ALERT/RDY in high state (default) - - - # Dictionaries with the sampling speed values - # These simplify and clean the code (avoid the abuse of if/elif/else clauses) - spsADS1115 = { - 8:__ADS1115_REG_CONFIG_DR_8SPS, - 16:__ADS1115_REG_CONFIG_DR_16SPS, - 32:__ADS1115_REG_CONFIG_DR_32SPS, - 64:__ADS1115_REG_CONFIG_DR_64SPS, - 128:__ADS1115_REG_CONFIG_DR_128SPS, - 250:__ADS1115_REG_CONFIG_DR_250SPS, - 475:__ADS1115_REG_CONFIG_DR_475SPS, - 860:__ADS1115_REG_CONFIG_DR_860SPS - } - spsADS1015 = { - 128:__ADS1015_REG_CONFIG_DR_128SPS, - 250:__ADS1015_REG_CONFIG_DR_250SPS, - 490:__ADS1015_REG_CONFIG_DR_490SPS, - 920:__ADS1015_REG_CONFIG_DR_920SPS, - 1600:__ADS1015_REG_CONFIG_DR_1600SPS, - 2400:__ADS1015_REG_CONFIG_DR_2400SPS, - 3300:__ADS1015_REG_CONFIG_DR_3300SPS - } - # Dictionariy with the programable gains - pgaADS1x15 = { - 6144:__ADS1015_REG_CONFIG_PGA_6_144V, - 4096:__ADS1015_REG_CONFIG_PGA_4_096V, - 2048:__ADS1015_REG_CONFIG_PGA_2_048V, - 1024:__ADS1015_REG_CONFIG_PGA_1_024V, - 512:__ADS1015_REG_CONFIG_PGA_0_512V, - 256:__ADS1015_REG_CONFIG_PGA_0_256V - } - - - # Constructor - def __init__(self, address=0x48, ic=__IC_ADS1015, debug=False): - # Depending on if you have an old or a new Raspberry Pi, you - # may need to change the I2C bus. Older Pis use SMBus 0, - # whereas new Pis use SMBus 1. If you see an error like: - # 'Error accessing 0x48: Check your I2C address ' - # change the SMBus number in the initializer below! - self.i2c = Adafruit_I2C(address) - self.address = address - self.debug = debug - - # Make sure the IC specified is valid - if ((ic < self.__IC_ADS1015) | (ic > self.__IC_ADS1115)): - if (self.debug): - print "ADS1x15: Invalid IC specfied: %h" % ic - return -1 - else: - self.ic = ic - - # Set pga value, so that getLastConversionResult() can use it, - # any function that accepts a pga value must update this. - self.pga = 6144 - - - def readADCSingleEnded(self, channel=0, pga=6144, sps=250): - "Gets a single-ended ADC reading from the specified channel in mV. \ - The sample rate for this mode (single-shot) can be used to lower the noise \ - (low sps) or to lower the power consumption (high sps) by duty cycling, \ - see datasheet page 14 for more info. \ - The pga must be given in mV, see page 13 for the supported values." - - # With invalid channel return -1 - if (channel > 3): - if (self.debug): - print "ADS1x15: Invalid channel specified: %d" % channel - return -1 - - # Disable comparator, Non-latching, Alert/Rdy active low - # traditional comparator, single-shot mode - config = self.__ADS1015_REG_CONFIG_CQUE_NONE | \ - self.__ADS1015_REG_CONFIG_CLAT_NONLAT | \ - self.__ADS1015_REG_CONFIG_CPOL_ACTVLOW | \ - self.__ADS1015_REG_CONFIG_CMODE_TRAD | \ - self.__ADS1015_REG_CONFIG_MODE_SINGLE - - # Set sample per seconds, defaults to 250sps - # If sps is in the dictionary (defined in init) it returns the value of the constant - # othewise it returns the value for 250sps. This saves a lot of if/elif/else code! - if (self.ic == self.__IC_ADS1015): - config |= self.spsADS1015.setdefault(sps, self.__ADS1015_REG_CONFIG_DR_1600SPS) - else: - if ( (sps not in self.spsADS1115) & self.debug): - print "ADS1x15: Invalid pga specified: %d, using 6144mV" % sps - config |= self.spsADS1115.setdefault(sps, self.__ADS1115_REG_CONFIG_DR_250SPS) - - # Set PGA/voltage range, defaults to +-6.144V - if ( (pga not in self.pgaADS1x15) & self.debug): - print "ADS1x15: Invalid pga specified: %d, using 6144mV" % sps - config |= self.pgaADS1x15.setdefault(pga, self.__ADS1015_REG_CONFIG_PGA_6_144V) - self.pga = pga - - # Set the channel to be converted - if channel == 3: - config |= self.__ADS1015_REG_CONFIG_MUX_SINGLE_3 - elif channel == 2: - config |= self.__ADS1015_REG_CONFIG_MUX_SINGLE_2 - elif channel == 1: - config |= self.__ADS1015_REG_CONFIG_MUX_SINGLE_1 - else: - config |= self.__ADS1015_REG_CONFIG_MUX_SINGLE_0 - - # Set 'start single-conversion' bit - config |= self.__ADS1015_REG_CONFIG_OS_SINGLE - - # Write config register to the ADC - bytes = [(config >> 8) & 0xFF, config & 0xFF] - self.i2c.writeList(self.__ADS1015_REG_POINTER_CONFIG, bytes) - - # Wait for the ADC conversion to complete - # The minimum delay depends on the sps: delay >= 1/sps - # We add 0.1ms to be sure - delay = 1.0/sps+0.0001 - time.sleep(delay) - - # Read the conversion results - result = self.i2c.readList(self.__ADS1015_REG_POINTER_CONVERT, 2) - if (self.ic == self.__IC_ADS1015): - # Shift right 4 bits for the 12-bit ADS1015 and convert to mV - return ( ((result[0] << 8) | (result[1] & 0xFF)) >> 4 )*pga/2048.0 - else: - # Return a mV value for the ADS1115 - # (Take signed values into account as well) - val = (result[0] << 8) | (result[1]) - if val > 0x7FFF: - return (val - 0xFFFF)*pga/32768.0 - else: - return ( (result[0] << 8) | (result[1]) )*pga/32768.0 - - - def readADCDifferential(self, chP=0, chN=1, pga=6144, sps=250): - "Gets a differential ADC reading from channels chP and chN in mV. \ - The sample rate for this mode (single-shot) can be used to lower the noise \ - (low sps) or to lower the power consumption (high sps) by duty cycling, \ - see data sheet page 14 for more info. \ - The pga must be given in mV, see page 13 for the supported values." - - # Disable comparator, Non-latching, Alert/Rdy active low - # traditional comparator, single-shot mode - config = self.__ADS1015_REG_CONFIG_CQUE_NONE | \ - self.__ADS1015_REG_CONFIG_CLAT_NONLAT | \ - self.__ADS1015_REG_CONFIG_CPOL_ACTVLOW | \ - self.__ADS1015_REG_CONFIG_CMODE_TRAD | \ - self.__ADS1015_REG_CONFIG_MODE_SINGLE - - # Set channels - if ( (chP == 0) & (chN == 1) ): - config |= self.__ADS1015_REG_CONFIG_MUX_DIFF_0_1 - elif ( (chP == 0) & (chN == 3) ): - config |= self.__ADS1015_REG_CONFIG_MUX_DIFF_0_3 - elif ( (chP == 2) & (chN == 3) ): - config |= self.__ADS1015_REG_CONFIG_MUX_DIFF_2_3 - elif ( (chP == 1) & (chN == 3) ): - config |= self.__ADS1015_REG_CONFIG_MUX_DIFF_1_3 - else: - if (self.debug): - print "ADS1x15: Invalid channels specified: %d, %d" % (chP, chN) - return -1 - - # Set sample per seconds, defaults to 250sps - # If sps is in the dictionary (defined in init()) it returns the value of the constant - # othewise it returns the value for 250sps. This saves a lot of if/elif/else code! - if (self.ic == self.__IC_ADS1015): - config |= self.spsADS1015.setdefault(sps, self.__ADS1015_REG_CONFIG_DR_1600SPS) - else: - if ( (sps not in self.spsADS1115) & self.debug): - print "ADS1x15: Invalid pga specified: %d, using 6144mV" % sps - config |= self.spsADS1115.setdefault(sps, self.__ADS1115_REG_CONFIG_DR_250SPS) - - # Set PGA/voltage range, defaults to +-6.144V - if ( (pga not in self.pgaADS1x15) & self.debug): - print "ADS1x15: Invalid pga specified: %d, using 6144mV" % sps - config |= self.pgaADS1x15.setdefault(pga, self.__ADS1015_REG_CONFIG_PGA_6_144V) - self.pga = pga - - # Set 'start single-conversion' bit - config |= self.__ADS1015_REG_CONFIG_OS_SINGLE - - # Write config register to the ADC - bytes = [(config >> 8) & 0xFF, config & 0xFF] - self.i2c.writeList(self.__ADS1015_REG_POINTER_CONFIG, bytes) - - # Wait for the ADC conversion to complete - # The minimum delay depends on the sps: delay >= 1/sps - # We add 0.1ms to be sure - delay = 1.0/sps+0.0001 - time.sleep(delay) - - # Read the conversion results - result = self.i2c.readList(self.__ADS1015_REG_POINTER_CONVERT, 2) - if (self.ic == self.__IC_ADS1015): - # Shift right 4 bits for the 12-bit ADS1015 and convert to mV - val = ((result[0] << 8) | (result[1] & 0xFF)) >> 4 - # (Take signed values into account as well) - if val >> 11: - val = val - 0xfff - return val*pga/2048.0 - else: - # Return a mV value for the ADS1115 - # (Take signed values into account as well) - val = (result[0] << 8) | (result[1]) - if val > 0x7FFF: - return (val - 0xFFFF)*pga/32768.0 - else: - return ( (result[0] << 8) | (result[1]) )*pga/32768.0 - - - def readADCDifferential01(self, pga=6144, sps=250): - "Gets a differential ADC reading from channels 0 and 1 in mV\ - The sample rate for this mode (single-shot) can be used to lower the noise \ - (low sps) or to lower the power consumption (high sps) by duty cycling, \ - see data sheet page 14 for more info. \ - The pga must be given in mV, see page 13 for the supported values." - return self.readADCDifferential(0, 1, pga, sps) - - - def readADCDifferential03(self, pga=6144, sps=250): - "Gets a differential ADC reading from channels 0 and 3 in mV \ - The sample rate for this mode (single-shot) can be used to lower the noise \ - (low sps) or to lower the power consumption (high sps) by duty cycling, \ - see data sheet page 14 for more info. \ - The pga must be given in mV, see page 13 for the supported values." - return self.readADCDifferential(0, 3, pga, sps) - - - def readADCDifferential13(self, pga=6144, sps=250): - "Gets a differential ADC reading from channels 1 and 3 in mV \ - The sample rate for this mode (single-shot) can be used to lower the noise \ - (low sps) or to lower the power consumption (high sps) by duty cycling, \ - see data sheet page 14 for more info. \ - The pga must be given in mV, see page 13 for the supported values." - return self.__readADCDifferential(1, 3, pga, sps) - - - def readADCDifferential23(self, pga=6144, sps=250): - "Gets a differential ADC reading from channels 2 and 3 in mV \ - The sample rate for this mode (single-shot) can be used to lower the noise \ - (low sps) or to lower the power consumption (high sps) by duty cycling, \ - see data sheet page 14 for more info. \ - The pga must be given in mV, see page 13 for the supported values." - return self.readADCDifferential(2, 3, pga, sps) - - - def startContinuousConversion(self, channel=0, pga=6144, sps=250): - "Starts the continuous conversion mode and returns the first ADC reading \ - in mV from the specified channel. \ - The sps controls the sample rate. \ - The pga must be given in mV, see datasheet page 13 for the supported values. \ - Use getLastConversionResults() to read the next values and \ - stopContinuousConversion() to stop converting." - - # Default to channel 0 with invalid channel, or return -1? - if (channel > 3): - if (self.debug): - print "ADS1x15: Invalid channel specified: %d" % channel - return -1 - - # Disable comparator, Non-latching, Alert/Rdy active low - # traditional comparator, continuous mode - # The last flag is the only change we need, page 11 datasheet - config = self.__ADS1015_REG_CONFIG_CQUE_NONE | \ - self.__ADS1015_REG_CONFIG_CLAT_NONLAT | \ - self.__ADS1015_REG_CONFIG_CPOL_ACTVLOW | \ - self.__ADS1015_REG_CONFIG_CMODE_TRAD | \ - self.__ADS1015_REG_CONFIG_MODE_CONTIN - - # Set sample per seconds, defaults to 250sps - # If sps is in the dictionary (defined in init()) it returns the value of the constant - # othewise it returns the value for 250sps. This saves a lot of if/elif/else code! - if (self.ic == self.__IC_ADS1015): - config |= self.spsADS1015.setdefault(sps, self.__ADS1015_REG_CONFIG_DR_1600SPS) - else: - if ( (sps not in self.spsADS1115) & self.debug): - print "ADS1x15: Invalid pga specified: %d, using 6144mV" % sps - config |= self.spsADS1115.setdefault(sps, self.__ADS1115_REG_CONFIG_DR_250SPS) - - # Set PGA/voltage range, defaults to +-6.144V - if ( (pga not in self.pgaADS1x15) & self.debug): - print "ADS1x15: Invalid pga specified: %d, using 6144mV" % sps - config |= self.pgaADS1x15.setdefault(pga, self.__ADS1015_REG_CONFIG_PGA_6_144V) - self.pga = pga - - # Set the channel to be converted - if channel == 3: - config |= self.__ADS1015_REG_CONFIG_MUX_SINGLE_3 - elif channel == 2: - config |= self.__ADS1015_REG_CONFIG_MUX_SINGLE_2 - elif channel == 1: - config |= self.__ADS1015_REG_CONFIG_MUX_SINGLE_1 - else: - config |= self.__ADS1015_REG_CONFIG_MUX_SINGLE_0 - - # Set 'start single-conversion' bit to begin conversions - # No need to change this for continuous mode! - config |= self.__ADS1015_REG_CONFIG_OS_SINGLE - - # Write config register to the ADC - # Once we write the ADC will convert continously - # we can read the next values using getLastConversionResult - bytes = [(config >> 8) & 0xFF, config & 0xFF] - self.i2c.writeList(self.__ADS1015_REG_POINTER_CONFIG, bytes) - - # Wait for the ADC conversion to complete - # The minimum delay depends on the sps: delay >= 1/sps - # We add 0.5ms to be sure - delay = 1.0/sps+0.0005 - time.sleep(delay) - - # Read the conversion results - result = self.i2c.readList(self.__ADS1015_REG_POINTER_CONVERT, 2) - if (self.ic == self.__IC_ADS1015): - # Shift right 4 bits for the 12-bit ADS1015 and convert to mV - return ( ((result[0] << 8) | (result[1] & 0xFF)) >> 4 )*pga/2048.0 - else: - # Return a mV value for the ADS1115 - # (Take signed values into account as well) - val = (result[0] << 8) | (result[1]) - if val > 0x7FFF: - return (val - 0xFFFF)*pga/32768.0 - else: - return ( (result[0] << 8) | (result[1]) )*pga/32768.0 - - def startContinuousDifferentialConversion(self, chP=0, chN=1, pga=6144, sps=250): - "Starts the continuous differential conversion mode and returns the first ADC reading \ - in mV as the difference from the specified channels. \ - The sps controls the sample rate. \ - The pga must be given in mV, see datasheet page 13 for the supported values. \ - Use getLastConversionResults() to read the next values and \ - stopContinuousConversion() to stop converting." - - # Disable comparator, Non-latching, Alert/Rdy active low - # traditional comparator, continuous mode - # The last flag is the only change we need, page 11 datasheet - config = self.__ADS1015_REG_CONFIG_CQUE_NONE | \ - self.__ADS1015_REG_CONFIG_CLAT_NONLAT | \ - self.__ADS1015_REG_CONFIG_CPOL_ACTVLOW | \ - self.__ADS1015_REG_CONFIG_CMODE_TRAD | \ - self.__ADS1015_REG_CONFIG_MODE_CONTIN - - # Set sample per seconds, defaults to 250sps - # If sps is in the dictionary (defined in init()) it returns the value of the constant - # othewise it returns the value for 250sps. This saves a lot of if/elif/else code! - if (self.ic == self.__IC_ADS1015): - config |= self.spsADS1015.setdefault(sps, self.__ADS1015_REG_CONFIG_DR_1600SPS) - else: - if ( (sps not in self.spsADS1115) & self.debug): - print "ADS1x15: Invalid pga specified: %d, using 6144mV" % sps - config |= self.spsADS1115.setdefault(sps, self.__ADS1115_REG_CONFIG_DR_250SPS) - - # Set PGA/voltage range, defaults to +-6.144V - if ( (pga not in self.pgaADS1x15) & self.debug): - print "ADS1x15: Invalid pga specified: %d, using 6144mV" % sps - config |= self.pgaADS1x15.setdefault(pga, self.__ADS1015_REG_CONFIG_PGA_6_144V) - self.pga = pga - - # Set channels - if ( (chP == 0) & (chN == 1) ): - config |= self.__ADS1015_REG_CONFIG_MUX_DIFF_0_1 - elif ( (chP == 0) & (chN == 3) ): - config |= self.__ADS1015_REG_CONFIG_MUX_DIFF_0_3 - elif ( (chP == 2) & (chN == 3) ): - config |= self.__ADS1015_REG_CONFIG_MUX_DIFF_2_3 - elif ( (chP == 1) & (chN == 3) ): - config |= self.__ADS1015_REG_CONFIG_MUX_DIFF_1_3 - else: - if (self.debug): - print "ADS1x15: Invalid channels specified: %d, %d" % (chP, chN) - return -1 - - # Set 'start single-conversion' bit to begin conversions - # No need to change this for continuous mode! - config |= self.__ADS1015_REG_CONFIG_OS_SINGLE - - # Write config register to the ADC - # Once we write the ADC will convert continously - # we can read the next values using getLastConversionResult - bytes = [(config >> 8) & 0xFF, config & 0xFF] - self.i2c.writeList(self.__ADS1015_REG_POINTER_CONFIG, bytes) - - # Wait for the ADC conversion to complete - # The minimum delay depends on the sps: delay >= 1/sps - # We add 0.5ms to be sure - delay = 1.0/sps+0.0005 - time.sleep(delay) - - # Read the conversion results - result = self.i2c.readList(self.__ADS1015_REG_POINTER_CONVERT, 2) - if (self.ic == self.__IC_ADS1015): - # Shift right 4 bits for the 12-bit ADS1015 and convert to mV - return ( ((result[0] << 8) | (result[1] & 0xFF)) >> 4 )*pga/2048.0 - else: - # Return a mV value for the ADS1115 - # (Take signed values into account as well) - val = (result[0] << 8) | (result[1]) - if val > 0x7FFF: - return (val - 0xFFFF)*pga/32768.0 - else: - return ( (result[0] << 8) | (result[1]) )*pga/32768.0 - - - def stopContinuousConversion(self): - "Stops the ADC's conversions when in continuous mode \ - and resets the configuration to its default value." - # Write the default config register to the ADC - # Once we write, the ADC will do a single conversion and - # enter power-off mode. - config = 0x8583 # Page 18 datasheet. - bytes = [(config >> 8) & 0xFF, config & 0xFF] - self.i2c.writeList(self.__ADS1015_REG_POINTER_CONFIG, bytes) - return True - - def getLastConversionResults(self): - "Returns the last ADC conversion result in mV" - # Read the conversion results - result = self.i2c.readList(self.__ADS1015_REG_POINTER_CONVERT, 2) - if (self.ic == self.__IC_ADS1015): - # Shift right 4 bits for the 12-bit ADS1015 and convert to mV - return ( ((result[0] << 8) | (result[1] & 0xFF)) >> 4 )*self.pga/2048.0 - else: - # Return a mV value for the ADS1115 - # (Take signed values into account as well) - val = (result[0] << 8) | (result[1]) - if val > 0x7FFF: - return (val - 0xFFFF)*self.pga/32768.0 - else: - return ( (result[0] << 8) | (result[1]) )*self.pga/32768.0 - - - def startSingleEndedComparator(self, channel, thresholdHigh, thresholdLow, \ - pga=6144, sps=250, \ - activeLow=True, traditionalMode=True, latching=False, \ - numReadings=1): - "Starts the comparator mode on the specified channel, see datasheet pg. 15. \ - In traditional mode it alerts (ALERT pin will go low) when voltage exceeds \ - thresholdHigh until it falls below thresholdLow (both given in mV). \ - In window mode (traditionalMode=False) it alerts when voltage doesn't lie\ - between both thresholds.\ - In latching mode the alert will continue until the conversion value is read. \ - numReadings controls how many readings are necessary to trigger an alert: 1, 2 or 4.\ - Use getLastConversionResults() to read the current value (which may differ \ - from the one that triggered the alert) and clear the alert pin in latching mode. \ - This function starts the continuous conversion mode. The sps controls \ - the sample rate and the pga the gain, see datasheet page 13. " - - # With invalid channel return -1 - if (channel > 3): - if (self.debug): - print "ADS1x15: Invalid channel specified: %d" % channel - return -1 - - # Continuous mode - config = self.__ADS1015_REG_CONFIG_MODE_CONTIN - - if (activeLow==False): - config |= self.__ADS1015_REG_CONFIG_CPOL_ACTVHI - else: - config |= self.__ADS1015_REG_CONFIG_CPOL_ACTVLOW - - if (traditionalMode==False): - config |= self.__ADS1015_REG_CONFIG_CMODE_WINDOW - else: - config |= self.__ADS1015_REG_CONFIG_CMODE_TRAD - - if (latching==True): - config |= self.__ADS1015_REG_CONFIG_CLAT_LATCH - else: - config |= self.__ADS1015_REG_CONFIG_CLAT_NONLAT - - if (numReadings==4): - config |= self.__ADS1015_REG_CONFIG_CQUE_4CONV - elif (numReadings==2): - config |= self.__ADS1015_REG_CONFIG_CQUE_2CONV - else: - config |= self.__ADS1015_REG_CONFIG_CQUE_1CONV - - # Set sample per seconds, defaults to 250sps - # If sps is in the dictionary (defined in init()) it returns the value of the constant - # othewise it returns the value for 250sps. This saves a lot of if/elif/else code! - if (self.ic == self.__IC_ADS1015): - if ( (sps not in self.spsADS1015) & self.debug): - print "ADS1x15: Invalid sps specified: %d, using 1600sps" % sps - config |= self.spsADS1015.setdefault(sps, self.__ADS1015_REG_CONFIG_DR_1600SPS) - else: - if ( (sps not in self.spsADS1115) & self.debug): - print "ADS1x15: Invalid sps specified: %d, using 250sps" % sps - config |= self.spsADS1115.setdefault(sps, self.__ADS1115_REG_CONFIG_DR_250SPS) - - # Set PGA/voltage range, defaults to +-6.144V - if ( (pga not in self.pgaADS1x15) & self.debug): - print "ADS1x15: Invalid pga specified: %d, using 6144mV" % pga - config |= self.pgaADS1x15.setdefault(pga, self.__ADS1015_REG_CONFIG_PGA_6_144V) - self.pga = pga - - # Set the channel to be converted - if channel == 3: - config |= self.__ADS1015_REG_CONFIG_MUX_SINGLE_3 - elif channel == 2: - config |= self.__ADS1015_REG_CONFIG_MUX_SINGLE_2 - elif channel == 1: - config |= self.__ADS1015_REG_CONFIG_MUX_SINGLE_1 - else: - config |= self.__ADS1015_REG_CONFIG_MUX_SINGLE_0 - - # Set 'start single-conversion' bit to begin conversions - config |= self.__ADS1015_REG_CONFIG_OS_SINGLE - - # Write threshold high and low registers to the ADC - # V_digital = (2^(n-1)-1)/pga*V_analog - if (self.ic == self.__IC_ADS1015): - thresholdHighWORD = int(thresholdHigh*(2048.0/pga)) - else: - thresholdHighWORD = int(thresholdHigh*(32767.0/pga)) - bytes = [(thresholdHighWORD >> 8) & 0xFF, thresholdHighWORD & 0xFF] - self.i2c.writeList(self.__ADS1015_REG_POINTER_HITHRESH, bytes) - - if (self.ic == self.__IC_ADS1015): - thresholdLowWORD = int(thresholdLow*(2048.0/pga)) - else: - thresholdLowWORD = int(thresholdLow*(32767.0/pga)) - bytes = [(thresholdLowWORD >> 8) & 0xFF, thresholdLowWORD & 0xFF] - self.i2c.writeList(self.__ADS1015_REG_POINTER_LOWTHRESH, bytes) - - # Write config register to the ADC - # Once we write the ADC will convert continously and alert when things happen, - # we can read the converted values using getLastConversionResult - bytes = [(config >> 8) & 0xFF, config & 0xFF] - self.i2c.writeList(self.__ADS1015_REG_POINTER_CONFIG, bytes) - - - def startDifferentialComparator(self, chP, chN, thresholdHigh, thresholdLow, \ - pga=6144, sps=250, \ - activeLow=True, traditionalMode=True, latching=False, \ - numReadings=1): - "Starts the comparator mode on the specified channel, see datasheet pg. 15. \ - In traditional mode it alerts (ALERT pin will go low) when voltage exceeds \ - thresholdHigh until it falls below thresholdLow (both given in mV). \ - In window mode (traditionalMode=False) it alerts when voltage doesn't lie\ - between both thresholds.\ - In latching mode the alert will continue until the conversion value is read. \ - numReadings controls how many readings are necessary to trigger an alert: 1, 2 or 4.\ - Use getLastConversionResults() to read the current value (which may differ \ - from the one that triggered the alert) and clear the alert pin in latching mode. \ - This function starts the continuous conversion mode. The sps controls \ - the sample rate and the pga the gain, see datasheet page 13. " - - # Continuous mode - config = self.__ADS1015_REG_CONFIG_MODE_CONTIN - - if (activeLow==False): - config |= self.__ADS1015_REG_CONFIG_CPOL_ACTVHI - else: - config |= self.__ADS1015_REG_CONFIG_CPOL_ACTVLOW - - if (traditionalMode==False): - config |= self.__ADS1015_REG_CONFIG_CMODE_WINDOW - else: - config |= self.__ADS1015_REG_CONFIG_CMODE_TRAD - - if (latching==True): - config |= self.__ADS1015_REG_CONFIG_CLAT_LATCH - else: - config |= self.__ADS1015_REG_CONFIG_CLAT_NONLAT - - if (numReadings==4): - config |= self.__ADS1015_REG_CONFIG_CQUE_4CONV - elif (numReadings==2): - config |= self.__ADS1015_REG_CONFIG_CQUE_2CONV - else: - config |= self.__ADS1015_REG_CONFIG_CQUE_1CONV - - # Set sample per seconds, defaults to 250sps - # If sps is in the dictionary (defined in init()) it returns the value of the constant - # othewise it returns the value for 250sps. This saves a lot of if/elif/else code! - if (self.ic == self.__IC_ADS1015): - if ( (sps not in self.spsADS1015) & self.debug): - print "ADS1x15: Invalid sps specified: %d, using 1600sps" % sps - config |= self.spsADS1015.setdefault(sps, self.__ADS1015_REG_CONFIG_DR_1600SPS) - else: - if ( (sps not in self.spsADS1115) & self.debug): - print "ADS1x15: Invalid sps specified: %d, using 250sps" % sps - config |= self.spsADS1115.setdefault(sps, self.__ADS1115_REG_CONFIG_DR_250SPS) - - # Set PGA/voltage range, defaults to +-6.144V - if ( (pga not in self.pgaADS1x15) & self.debug): - print "ADS1x15: Invalid pga specified: %d, using 6144mV" % pga - config |= self.pgaADS1x15.setdefault(pga, self.__ADS1015_REG_CONFIG_PGA_6_144V) - self.pga = pga - - # Set channels - if ( (chP == 0) & (chN == 1) ): - config |= self.__ADS1015_REG_CONFIG_MUX_DIFF_0_1 - elif ( (chP == 0) & (chN == 3) ): - config |= self.__ADS1015_REG_CONFIG_MUX_DIFF_0_3 - elif ( (chP == 2) & (chN == 3) ): - config |= self.__ADS1015_REG_CONFIG_MUX_DIFF_2_3 - elif ( (chP == 1) & (chN == 3) ): - config |= self.__ADS1015_REG_CONFIG_MUX_DIFF_1_3 - else: - if (self.debug): - print "ADS1x15: Invalid channels specified: %d, %d" % (chP, chN) - return -1 - - # Set 'start single-conversion' bit to begin conversions - config |= self.__ADS1015_REG_CONFIG_OS_SINGLE - - # Write threshold high and low registers to the ADC - # V_digital = (2^(n-1)-1)/pga*V_analog - if (self.ic == self.__IC_ADS1015): - thresholdHighWORD = int(thresholdHigh*(2048.0/pga)) - else: - thresholdHighWORD = int(thresholdHigh*(32767.0/pga)) - bytes = [(thresholdHighWORD >> 8) & 0xFF, thresholdHighWORD & 0xFF] - self.i2c.writeList(self.__ADS1015_REG_POINTER_HITHRESH, bytes) - - if (self.ic == self.__IC_ADS1015): - thresholdLowWORD = int(thresholdLow*(2048.0/pga)) - else: - thresholdLowWORD = int(thresholdLow*(32767.0/pga)) - bytes = [(thresholdLowWORD >> 8) & 0xFF, thresholdLowWORD & 0xFF] - self.i2c.writeList(self.__ADS1015_REG_POINTER_LOWTHRESH, bytes) - - # Write config register to the ADC - # Once we write the ADC will convert continously and alert when things happen, - # we can read the converted values using getLastConversionResult - bytes = [(config >> 8) & 0xFF, config & 0xFF] - self.i2c.writeList(self.__ADS1015_REG_POINTER_CONFIG, bytes) - diff --git a/Adafruit_ADS1x15/Adafruit_I2C.py b/Adafruit_ADS1x15/Adafruit_I2C.py deleted file mode 120000 index 77f06164..00000000 --- a/Adafruit_ADS1x15/Adafruit_I2C.py +++ /dev/null @@ -1 +0,0 @@ -../Adafruit_I2C/Adafruit_I2C.py \ No newline at end of file diff --git a/Adafruit_ADS1x15/ads1x15_ex_comparator.py b/Adafruit_ADS1x15/ads1x15_ex_comparator.py deleted file mode 100644 index e10eb6cb..00000000 --- a/Adafruit_ADS1x15/ads1x15_ex_comparator.py +++ /dev/null @@ -1,30 +0,0 @@ -#!/usr/bin/python - -import time, signal, sys -from Adafruit_ADS1x15 import ADS1x15 - -def signal_handler(signal, frame): - print 'You pressed Ctrl+C!' - print adc.getLastConversionResults()/1000.0 - adc.stopContinuousConversion() - sys.exit(0) - -signal.signal(signal.SIGINT, signal_handler) -# Print 'Press Ctrl+C to exit' - -ADS1015 = 0x00 # 12-bit ADC -ADS1115 = 0x01 # 16-bit ADC - -# Initialise the ADC using the default mode (use default I2C address) -# Set this to ADS1015 or ADS1115 depending on the ADC you are using! -adc = ADS1x15(ic=ADS1115) - -# start comparator on channel 2 with a thresholdHigh=200mV and low=100mV -# in traditional mode, non-latching, +/-1.024V and 250sps -adc.startSingleEndedComparator(2, 200, 100, pga=1024, sps=250, activeLow=True, traditionalMode=True, latching=False, numReadings=1) - -while True: - print adc.getLastConversionResults()/1000.0 - time.sleep(0.25) - -#time.sleep(0.1) diff --git a/Adafruit_ADS1x15/ads1x15_ex_differential.py b/Adafruit_ADS1x15/ads1x15_ex_differential.py deleted file mode 100644 index 01614fdd..00000000 --- a/Adafruit_ADS1x15/ads1x15_ex_differential.py +++ /dev/null @@ -1,27 +0,0 @@ -#!/usr/bin/python - -import time, signal, sys -from Adafruit_ADS1x15 import ADS1x15 - -def signal_handler(signal, frame): - #print 'You pressed Ctrl+C!' - sys.exit(0) -signal.signal(signal.SIGINT, signal_handler) -#print 'Press Ctrl+C to exit' - -ADS1015 = 0x00 # 12-bit ADC -ADS1115 = 0x01 # 16-bit ADC - -# Initialise the ADC using the default mode (use default I2C address) -# Set this to ADS1015 or ADS1115 depending on the ADC you are using! -adc = ADS1x15(ic=ADS1115) - -# Read channels 2 and 3 in single-ended mode, at +/-4.096V and 250sps -volts2 = adc.readADCSingleEnded(2, 4096, 250)/1000.0 -volts3 = adc.readADCSingleEnded(3, 4096, 250)/1000.0 - -# Now do a differential reading of channels 2 and 3 -voltsdiff = adc.readADCDifferential23(4096, 250)/1000.0 - -# Display the two different reading for comparison purposes -print "%.8f %.8f %.8f %.8f" % (volts2, volts3, volts3-volts2, -voltsdiff) diff --git a/Adafruit_ADS1x15/ads1x15_ex_singleended.py b/Adafruit_ADS1x15/ads1x15_ex_singleended.py deleted file mode 100644 index 2c4dee43..00000000 --- a/Adafruit_ADS1x15/ads1x15_ex_singleended.py +++ /dev/null @@ -1,43 +0,0 @@ -#!/usr/bin/python - -import time, signal, sys -from Adafruit_ADS1x15 import ADS1x15 - -def signal_handler(signal, frame): - print 'You pressed Ctrl+C!' - sys.exit(0) -signal.signal(signal.SIGINT, signal_handler) -#print 'Press Ctrl+C to exit' - -ADS1015 = 0x00 # 12-bit ADC -ADS1115 = 0x01 # 16-bit ADC - -# Select the gain -# gain = 6144 # +/- 6.144V -gain = 4096 # +/- 4.096V -# gain = 2048 # +/- 2.048V -# gain = 1024 # +/- 1.024V -# gain = 512 # +/- 0.512V -# gain = 256 # +/- 0.256V - -# Select the sample rate -# sps = 8 # 8 samples per second -# sps = 16 # 16 samples per second -# sps = 32 # 32 samples per second -# sps = 64 # 64 samples per second -# sps = 128 # 128 samples per second -sps = 250 # 250 samples per second -# sps = 475 # 475 samples per second -# sps = 860 # 860 samples per second - -# Initialise the ADC using the default mode (use default I2C address) -# Set this to ADS1015 or ADS1115 depending on the ADC you are using! -adc = ADS1x15(ic=ADS1115) - -# Read channel 0 in single-ended mode using the settings above -volts = adc.readADCSingleEnded(0, gain, sps) / 1000 - -# To read channel 3 in single-ended mode, +/- 1.024V, 860 sps use: -# volts = adc.readADCSingleEnded(3, 1024, 860) - -print "%.6f" % (volts) diff --git a/Adafruit_ADXL345/Adafruit_ADXL345.py b/Adafruit_ADXL345/Adafruit_ADXL345.py deleted file mode 100755 index 50b00abe..00000000 --- a/Adafruit_ADXL345/Adafruit_ADXL345.py +++ /dev/null @@ -1,114 +0,0 @@ -#!/usr/bin/python - -# Python library for ADXL345 accelerometer. - -# Copyright 2013 Adafruit Industries - -# Permission is hereby granted, free of charge, to any person obtaining a -# copy of this software and associated documentation files (the "Software"), -# to deal in the Software without restriction, including without limitation -# the rights to use, copy, modify, merge, publish, distribute, sublicense, -# and/or sell copies of the Software, and to permit persons to whom the -# Software is furnished to do so, subject to the following conditions: - -# The above copyright notice and this permission notice shall be included -# in all copies or substantial portions of the Software. - -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION 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 Adafruit_I2C import Adafruit_I2C - - -class Adafruit_ADXL345(Adafruit_I2C): - - # Minimal constants carried over from Arduino library - - ADXL345_ADDRESS = 0x53 - - ADXL345_REG_DEVID = 0x00 # Device ID - ADXL345_REG_DATAX0 = 0x32 # X-axis data 0 (6 bytes for X/Y/Z) - ADXL345_REG_POWER_CTL = 0x2D # Power-saving features control - - ADXL345_DATARATE_0_10_HZ = 0x00 - ADXL345_DATARATE_0_20_HZ = 0x01 - ADXL345_DATARATE_0_39_HZ = 0x02 - ADXL345_DATARATE_0_78_HZ = 0x03 - ADXL345_DATARATE_1_56_HZ = 0x04 - ADXL345_DATARATE_3_13_HZ = 0x05 - ADXL345_DATARATE_6_25HZ = 0x06 - ADXL345_DATARATE_12_5_HZ = 0x07 - ADXL345_DATARATE_25_HZ = 0x08 - ADXL345_DATARATE_50_HZ = 0x09 - ADXL345_DATARATE_100_HZ = 0x0A # (default) - ADXL345_DATARATE_200_HZ = 0x0B - ADXL345_DATARATE_400_HZ = 0x0C - ADXL345_DATARATE_800_HZ = 0x0D - ADXL345_DATARATE_1600_HZ = 0x0E - ADXL345_DATARATE_3200_HZ = 0x0F - - ADXL345_RANGE_2_G = 0x00 # +/- 2g (default) - ADXL345_RANGE_4_G = 0x01 # +/- 4g - ADXL345_RANGE_8_G = 0x02 # +/- 8g - ADXL345_RANGE_16_G = 0x03 # +/- 16g - - - def __init__(self, busnum=-1, debug=False): - - self.accel = Adafruit_I2C(self.ADXL345_ADDRESS, busnum, debug) - - if self.accel.readU8(self.ADXL345_REG_DEVID) == 0xE5: - # Enable the accelerometer - self.accel.write8(self.ADXL345_REG_POWER_CTL, 0x08) - - - def setRange(self, range): - # Read the data format register to preserve bits. Update the data - # rate, make sure that the FULL-RES bit is enabled for range scaling - format = ((self.accel.readU8(self.ADXL345_REG_DATA_FORMAT) & ~0x0F) | - range | 0x08) - # Write the register back to the IC - seld.accel.write8(self.ADXL345_REG_DATA_FORMAT, format) - - - def getRange(self): - return self.accel.readU8(self.ADXL345_REG_DATA_FORMAT) & 0x03 - - - def setDataRate(self, dataRate): - # Note: The LOW_POWER bits are currently ignored, - # we always keep the device in 'normal' mode - self.accel.write8(self.ADXL345_REG_BW_RATE, dataRate & 0x0F) - - - def getDataRate(self): - return self.accel.readU8(self.ADXL345_REG_BW_RATE) & 0x0F - - - # Read the accelerometer - def read(self): - raw = self.accel.readList(self.ADXL345_REG_DATAX0, 6) - res = [] - for i in range(0, 6, 2): - g = raw[i] | (raw[i+1] << 8) - if g > 32767: g -= 65536 - res.append(g) - return res - - -# Simple example prints accelerometer data once per second: -if __name__ == '__main__': - - from time import sleep - - accel = Adafruit_ADXL345() - - print '[Accelerometer X, Y, Z]' - while True: - print accel.read() - sleep(1) # Output is fun to watch if this is commented out diff --git a/Adafruit_ADXL345/Adafruit_I2C.py b/Adafruit_ADXL345/Adafruit_I2C.py deleted file mode 120000 index 77f06164..00000000 --- a/Adafruit_ADXL345/Adafruit_I2C.py +++ /dev/null @@ -1 +0,0 @@ -../Adafruit_I2C/Adafruit_I2C.py \ No newline at end of file diff --git a/Adafruit_BMP085/Adafruit_BMP085.py b/Adafruit_BMP085/Adafruit_BMP085.py deleted file mode 100755 index e8d0e314..00000000 --- a/Adafruit_BMP085/Adafruit_BMP085.py +++ /dev/null @@ -1,259 +0,0 @@ -#!/usr/bin/python - -import time -from Adafruit_I2C import Adafruit_I2C - -# =========================================================================== -# BMP085 Class -# =========================================================================== - -class BMP085 : - i2c = None - - # Operating Modes - __BMP085_ULTRALOWPOWER = 0 - __BMP085_STANDARD = 1 - __BMP085_HIGHRES = 2 - __BMP085_ULTRAHIGHRES = 3 - - # BMP085 Registers - __BMP085_CAL_AC1 = 0xAA # R Calibration data (16 bits) - __BMP085_CAL_AC2 = 0xAC # R Calibration data (16 bits) - __BMP085_CAL_AC3 = 0xAE # R Calibration data (16 bits) - __BMP085_CAL_AC4 = 0xB0 # R Calibration data (16 bits) - __BMP085_CAL_AC5 = 0xB2 # R Calibration data (16 bits) - __BMP085_CAL_AC6 = 0xB4 # R Calibration data (16 bits) - __BMP085_CAL_B1 = 0xB6 # R Calibration data (16 bits) - __BMP085_CAL_B2 = 0xB8 # R Calibration data (16 bits) - __BMP085_CAL_MB = 0xBA # R Calibration data (16 bits) - __BMP085_CAL_MC = 0xBC # R Calibration data (16 bits) - __BMP085_CAL_MD = 0xBE # R Calibration data (16 bits) - __BMP085_CONTROL = 0xF4 - __BMP085_TEMPDATA = 0xF6 - __BMP085_PRESSUREDATA = 0xF6 - __BMP085_READTEMPCMD = 0x2E - __BMP085_READPRESSURECMD = 0x34 - - # Private Fields - _cal_AC1 = 0 - _cal_AC2 = 0 - _cal_AC3 = 0 - _cal_AC4 = 0 - _cal_AC5 = 0 - _cal_AC6 = 0 - _cal_B1 = 0 - _cal_B2 = 0 - _cal_MB = 0 - _cal_MC = 0 - _cal_MD = 0 - - # Constructor - def __init__(self, address=0x77, mode=1, debug=False): - self.i2c = Adafruit_I2C(address) - - self.address = address - self.debug = debug - # Make sure the specified mode is in the appropriate range - if ((mode < 0) | (mode > 3)): - if (self.debug): - print "Invalid Mode: Using STANDARD by default" - self.mode = self.__BMP085_STANDARD - else: - self.mode = mode - # Read the calibration data - self.readCalibrationData() - - def readS16(self, register): - "Reads a signed 16-bit value" - hi = self.i2c.readS8(register) - lo = self.i2c.readU8(register+1) - return (hi << 8) + lo - - def readU16(self, register): - "Reads an unsigned 16-bit value" - hi = self.i2c.readU8(register) - lo = self.i2c.readU8(register+1) - return (hi << 8) + lo - - def readCalibrationData(self): - "Reads the calibration data from the IC" - self._cal_AC1 = self.readS16(self.__BMP085_CAL_AC1) # INT16 - self._cal_AC2 = self.readS16(self.__BMP085_CAL_AC2) # INT16 - self._cal_AC3 = self.readS16(self.__BMP085_CAL_AC3) # INT16 - self._cal_AC4 = self.readU16(self.__BMP085_CAL_AC4) # UINT16 - self._cal_AC5 = self.readU16(self.__BMP085_CAL_AC5) # UINT16 - self._cal_AC6 = self.readU16(self.__BMP085_CAL_AC6) # UINT16 - self._cal_B1 = self.readS16(self.__BMP085_CAL_B1) # INT16 - self._cal_B2 = self.readS16(self.__BMP085_CAL_B2) # INT16 - self._cal_MB = self.readS16(self.__BMP085_CAL_MB) # INT16 - self._cal_MC = self.readS16(self.__BMP085_CAL_MC) # INT16 - self._cal_MD = self.readS16(self.__BMP085_CAL_MD) # INT16 - if (self.debug): - self.showCalibrationData() - - def showCalibrationData(self): - "Displays the calibration values for debugging purposes" - print "DBG: AC1 = %6d" % (self._cal_AC1) - print "DBG: AC2 = %6d" % (self._cal_AC2) - print "DBG: AC3 = %6d" % (self._cal_AC3) - print "DBG: AC4 = %6d" % (self._cal_AC4) - print "DBG: AC5 = %6d" % (self._cal_AC5) - print "DBG: AC6 = %6d" % (self._cal_AC6) - print "DBG: B1 = %6d" % (self._cal_B1) - print "DBG: B2 = %6d" % (self._cal_B2) - print "DBG: MB = %6d" % (self._cal_MB) - print "DBG: MC = %6d" % (self._cal_MC) - print "DBG: MD = %6d" % (self._cal_MD) - - def readRawTemp(self): - "Reads the raw (uncompensated) temperature from the sensor" - self.i2c.write8(self.__BMP085_CONTROL, self.__BMP085_READTEMPCMD) - time.sleep(0.005) # Wait 5ms - raw = self.readU16(self.__BMP085_TEMPDATA) - if (self.debug): - print "DBG: Raw Temp: 0x%04X (%d)" % (raw & 0xFFFF, raw) - return raw - - def readRawPressure(self): - "Reads the raw (uncompensated) pressure level from the sensor" - self.i2c.write8(self.__BMP085_CONTROL, self.__BMP085_READPRESSURECMD + (self.mode << 6)) - if (self.mode == self.__BMP085_ULTRALOWPOWER): - time.sleep(0.005) - elif (self.mode == self.__BMP085_HIGHRES): - time.sleep(0.014) - elif (self.mode == self.__BMP085_ULTRAHIGHRES): - time.sleep(0.026) - else: - time.sleep(0.008) - msb = self.i2c.readU8(self.__BMP085_PRESSUREDATA) - lsb = self.i2c.readU8(self.__BMP085_PRESSUREDATA+1) - xlsb = self.i2c.readU8(self.__BMP085_PRESSUREDATA+2) - raw = ((msb << 16) + (lsb << 8) + xlsb) >> (8 - self.mode) - if (self.debug): - print "DBG: Raw Pressure: 0x%04X (%d)" % (raw & 0xFFFF, raw) - return raw - - def readTemperature(self): - "Gets the compensated temperature in degrees celcius" - UT = 0 - X1 = 0 - X2 = 0 - B5 = 0 - temp = 0.0 - - # Read raw temp before aligning it with the calibration values - UT = self.readRawTemp() - X1 = ((UT - self._cal_AC6) * self._cal_AC5) >> 15 - X2 = (self._cal_MC << 11) / (X1 + self._cal_MD) - B5 = X1 + X2 - temp = ((B5 + 8) >> 4) / 10.0 - if (self.debug): - print "DBG: Calibrated temperature = %f C" % temp - return temp - - def readPressure(self): - "Gets the compensated pressure in pascal" - UT = 0 - UP = 0 - B3 = 0 - B5 = 0 - B6 = 0 - X1 = 0 - X2 = 0 - X3 = 0 - p = 0 - B4 = 0 - B7 = 0 - - UT = self.readRawTemp() - UP = self.readRawPressure() - - # You can use the datasheet values to test the conversion results - # dsValues = True - dsValues = False - - if (dsValues): - UT = 27898 - UP = 23843 - self._cal_AC6 = 23153 - self._cal_AC5 = 32757 - self._cal_MB = -32768; - self._cal_MC = -8711 - self._cal_MD = 2868 - self._cal_B1 = 6190 - self._cal_B2 = 4 - self._cal_AC3 = -14383 - self._cal_AC2 = -72 - self._cal_AC1 = 408 - self._cal_AC4 = 32741 - self.mode = self.__BMP085_ULTRALOWPOWER - if (self.debug): - self.showCalibrationData() - - # True Temperature Calculations - X1 = ((UT - self._cal_AC6) * self._cal_AC5) >> 15 - X2 = (self._cal_MC << 11) / (X1 + self._cal_MD) - B5 = X1 + X2 - if (self.debug): - print "DBG: X1 = %d" % (X1) - print "DBG: X2 = %d" % (X2) - print "DBG: B5 = %d" % (B5) - print "DBG: True Temperature = %.2f C" % (((B5 + 8) >> 4) / 10.0) - - # Pressure Calculations - B6 = B5 - 4000 - X1 = (self._cal_B2 * (B6 * B6) >> 12) >> 11 - X2 = (self._cal_AC2 * B6) >> 11 - X3 = X1 + X2 - B3 = (((self._cal_AC1 * 4 + X3) << self.mode) + 2) / 4 - if (self.debug): - print "DBG: B6 = %d" % (B6) - print "DBG: X1 = %d" % (X1) - print "DBG: X2 = %d" % (X2) - print "DBG: X3 = %d" % (X3) - print "DBG: B3 = %d" % (B3) - - X1 = (self._cal_AC3 * B6) >> 13 - X2 = (self._cal_B1 * ((B6 * B6) >> 12)) >> 16 - X3 = ((X1 + X2) + 2) >> 2 - B4 = (self._cal_AC4 * (X3 + 32768)) >> 15 - B7 = (UP - B3) * (50000 >> self.mode) - if (self.debug): - print "DBG: X1 = %d" % (X1) - print "DBG: X2 = %d" % (X2) - print "DBG: X3 = %d" % (X3) - print "DBG: B4 = %d" % (B4) - print "DBG: B7 = %d" % (B7) - - if (B7 < 0x80000000): - p = (B7 * 2) / B4 - else: - p = (B7 / B4) * 2 - - if (self.debug): - print "DBG: X1 = %d" % (X1) - - X1 = (p >> 8) * (p >> 8) - X1 = (X1 * 3038) >> 16 - X2 = (-7357 * p) >> 16 - if (self.debug): - print "DBG: p = %d" % (p) - print "DBG: X1 = %d" % (X1) - print "DBG: X2 = %d" % (X2) - - p = p + ((X1 + X2 + 3791) >> 4) - if (self.debug): - print "DBG: Pressure = %d Pa" % (p) - - return p - - def readAltitude(self, seaLevelPressure=101325): - "Calculates the altitude in meters" - altitude = 0.0 - pressure = float(self.readPressure()) - altitude = 44330.0 * (1.0 - pow(pressure / seaLevelPressure, 0.1903)) - if (self.debug): - print "DBG: Altitude = %d" % (altitude) - return altitude - - return 0 diff --git a/Adafruit_BMP085/Adafruit_BMP085_example.py b/Adafruit_BMP085/Adafruit_BMP085_example.py deleted file mode 100755 index e7143c8a..00000000 --- a/Adafruit_BMP085/Adafruit_BMP085_example.py +++ /dev/null @@ -1,35 +0,0 @@ -#!/usr/bin/python - -from Adafruit_BMP085 import BMP085 - -# =========================================================================== -# Example Code -# =========================================================================== - -# Initialise the BMP085 and use STANDARD mode (default value) -# bmp = BMP085(0x77, debug=True) -bmp = BMP085(0x77) - -# To specify a different operating mode, uncomment one of the following: -# bmp = BMP085(0x77, 0) # ULTRALOWPOWER Mode -# bmp = BMP085(0x77, 1) # STANDARD Mode -# bmp = BMP085(0x77, 2) # HIRES Mode -# bmp = BMP085(0x77, 3) # ULTRAHIRES Mode - -temp = bmp.readTemperature() - -# Read the current barometric pressure level -pressure = bmp.readPressure() - -# To calculate altitude based on an estimated mean sea level pressure -# (1013.25 hPa) call the function as follows, but this won't be very accurate -altitude = bmp.readAltitude() - -# To specify a more accurate altitude, enter the correct mean sea level -# pressure level. For example, if the current pressure level is 1023.50 hPa -# enter 102350 since we include two decimal places in the integer value -# altitude = bmp.readAltitude(102350) - -print "Temperature: %.2f C" % temp -print "Pressure: %.2f hPa" % (pressure / 100.0) -print "Altitude: %.2f" % altitude diff --git a/Adafruit_BMP085/Adafruit_BMP085_googledocs_ex.py b/Adafruit_BMP085/Adafruit_BMP085_googledocs_ex.py deleted file mode 100755 index 4d62cd0b..00000000 --- a/Adafruit_BMP085/Adafruit_BMP085_googledocs_ex.py +++ /dev/null @@ -1,69 +0,0 @@ -#!/usr/bin/python - -import sys -import time -import datetime -import gspread -from Adafruit_BMP085 import BMP085 - -# =========================================================================== -# Google Account Details -# =========================================================================== - -# Account details for google docs -email = 'you@somewhere.com' -password = '$hhh!' -spreadsheet = 'SpreadsheetName' - -# =========================================================================== -# Example Code -# =========================================================================== - -# Initialise the BMP085 and use STANDARD mode (default value) -# bmp = BMP085(0x77, debug=True) -bmp = BMP085(0x77) - -# To specify a different operating mode, uncomment one of the following: -# bmp = BMP085(0x77, 0) # ULTRALOWPOWER Mode -# bmp = BMP085(0x77, 1) # STANDARD Mode -# bmp = BMP085(0x77, 2) # HIRES Mode -# bmp = BMP085(0x77, 3) # ULTRAHIRES Mode - -# Login with your Google account -try: - gc = gspread.login(email, password) -except: - print "Unable to log in. Check your email address/password" - sys.exit() - -# Open a worksheet from your spreadsheet using the filename -try: - worksheet = gc.open(spreadsheet).sheet1 - # Alternatively, open a spreadsheet using the spreadsheet's key - # worksheet = gc.open_by_key('0BmgG6nO_6dprdS1MN3d3MkdPa142WFRrdnRRUWl1UFE') -except: - print "Unable to open the spreadsheet. Check your filename: %s" % spreadsheet - sys.exit() - -# Continuously append data -while(True): - temp = bmp.readTemperature() - pressure = bmp.readPressure() - altitude = bmp.readAltitude() - - print "Temperature: %.2f C" % temp - print "Pressure: %.2f hPa" % (pressure / 100.0) - print "Altitude: %.2f" % altitude - - # Append the data in the spreadsheet, including a timestamp - try: - values = [datetime.datetime.now(), temp, pressure, altitude] - worksheet.append_row(values) - except: - print "Unable to append data. Check your connection?" - sys.exit() - - # Wait 5 seconds before continuing - print "Wrote a row to %s" % spreadsheet - time.sleep(5) - diff --git a/Adafruit_BMP085/Adafruit_I2C.py b/Adafruit_BMP085/Adafruit_I2C.py deleted file mode 120000 index 77f06164..00000000 --- a/Adafruit_BMP085/Adafruit_I2C.py +++ /dev/null @@ -1 +0,0 @@ -../Adafruit_I2C/Adafruit_I2C.py \ No newline at end of file diff --git a/Adafruit_BMP085/DEPRECATED.txt b/Adafruit_BMP085/DEPRECATED.txt deleted file mode 100644 index 4e7dadf4..00000000 --- a/Adafruit_BMP085/DEPRECATED.txt +++ /dev/null @@ -1,5 +0,0 @@ -This BMP085 sensor library has been deprecated in favor of a new version that supports both the Raspberry Pi and Beaglebone Black. - -You can find the new library with installation instructions at this github repository: https://github.com/adafruit/Adafruit_Python_BMP - -You can also find a tutorial on using this library at: https://learn.adafruit.com/using-the-bmp085-with-raspberry-pi/using-the-adafruit-bmp-python-library diff --git a/Adafruit_CharLCD/Adafruit_CharLCD.py b/Adafruit_CharLCD/Adafruit_CharLCD.py deleted file mode 100755 index a4bb9a93..00000000 --- a/Adafruit_CharLCD/Adafruit_CharLCD.py +++ /dev/null @@ -1,210 +0,0 @@ -#!/usr/bin/python - -# -# based on code from lrvick and LiquidCrystal -# lrvic - https://github.com/lrvick/raspi-hd44780/blob/master/hd44780.py -# LiquidCrystal - https://github.com/arduino/Arduino/blob/master/libraries/LiquidCrystal/LiquidCrystal.cpp -# - -from time import sleep - - -class Adafruit_CharLCD(object): - - # commands - LCD_CLEARDISPLAY = 0x01 - LCD_RETURNHOME = 0x02 - LCD_ENTRYMODESET = 0x04 - LCD_DISPLAYCONTROL = 0x08 - LCD_CURSORSHIFT = 0x10 - LCD_FUNCTIONSET = 0x20 - LCD_SETCGRAMADDR = 0x40 - LCD_SETDDRAMADDR = 0x80 - - # flags for display entry mode - LCD_ENTRYRIGHT = 0x00 - LCD_ENTRYLEFT = 0x02 - LCD_ENTRYSHIFTINCREMENT = 0x01 - LCD_ENTRYSHIFTDECREMENT = 0x00 - - # flags for display on/off control - LCD_DISPLAYON = 0x04 - LCD_DISPLAYOFF = 0x00 - LCD_CURSORON = 0x02 - LCD_CURSOROFF = 0x00 - LCD_BLINKON = 0x01 - LCD_BLINKOFF = 0x00 - - # flags for display/cursor shift - LCD_DISPLAYMOVE = 0x08 - LCD_CURSORMOVE = 0x00 - - # flags for display/cursor shift - LCD_DISPLAYMOVE = 0x08 - LCD_CURSORMOVE = 0x00 - LCD_MOVERIGHT = 0x04 - LCD_MOVELEFT = 0x00 - - # flags for function set - LCD_8BITMODE = 0x10 - LCD_4BITMODE = 0x00 - LCD_2LINE = 0x08 - LCD_1LINE = 0x00 - LCD_5x10DOTS = 0x04 - LCD_5x8DOTS = 0x00 - - def __init__(self, pin_rs=25, pin_e=24, pins_db=[23, 17, 21, 22], GPIO=None): - # Emulate the old behavior of using RPi.GPIO if we haven't been given - # an explicit GPIO interface to use - if not GPIO: - import RPi.GPIO as GPIO - GPIO.setwarnings(False) - self.GPIO = GPIO - self.pin_rs = pin_rs - self.pin_e = pin_e - self.pins_db = pins_db - - self.GPIO.setmode(GPIO.BCM) - self.GPIO.setup(self.pin_e, GPIO.OUT) - self.GPIO.setup(self.pin_rs, GPIO.OUT) - - for pin in self.pins_db: - self.GPIO.setup(pin, GPIO.OUT) - - self.write4bits(0x33) # initialization - self.write4bits(0x32) # initialization - self.write4bits(0x28) # 2 line 5x7 matrix - self.write4bits(0x0C) # turn cursor off 0x0E to enable cursor - self.write4bits(0x06) # shift cursor right - - self.displaycontrol = self.LCD_DISPLAYON | self.LCD_CURSOROFF | self.LCD_BLINKOFF - - self.displayfunction = self.LCD_4BITMODE | self.LCD_1LINE | self.LCD_5x8DOTS - self.displayfunction |= self.LCD_2LINE - - # Initialize to default text direction (for romance languages) - self.displaymode = self.LCD_ENTRYLEFT | self.LCD_ENTRYSHIFTDECREMENT - self.write4bits(self.LCD_ENTRYMODESET | self.displaymode) # set the entry mode - - self.clear() - - def begin(self, cols, lines): - if (lines > 1): - self.numlines = lines - self.displayfunction |= self.LCD_2LINE - - def home(self): - self.write4bits(self.LCD_RETURNHOME) # set cursor position to zero - self.delayMicroseconds(3000) # this command takes a long time! - - def clear(self): - self.write4bits(self.LCD_CLEARDISPLAY) # command to clear display - self.delayMicroseconds(3000) # 3000 microsecond sleep, clearing the display takes a long time - - def setCursor(self, col, row): - self.row_offsets = [0x00, 0x40, 0x14, 0x54] - if row > self.numlines: - row = self.numlines - 1 # we count rows starting w/0 - self.write4bits(self.LCD_SETDDRAMADDR | (col + self.row_offsets[row])) - - def noDisplay(self): - """ Turn the display off (quickly) """ - self.displaycontrol &= ~self.LCD_DISPLAYON - self.write4bits(self.LCD_DISPLAYCONTROL | self.displaycontrol) - - def display(self): - """ Turn the display on (quickly) """ - self.displaycontrol |= self.LCD_DISPLAYON - self.write4bits(self.LCD_DISPLAYCONTROL | self.displaycontrol) - - def noCursor(self): - """ Turns the underline cursor off """ - self.displaycontrol &= ~self.LCD_CURSORON - self.write4bits(self.LCD_DISPLAYCONTROL | self.displaycontrol) - - def cursor(self): - """ Turns the underline cursor on """ - self.displaycontrol |= self.LCD_CURSORON - self.write4bits(self.LCD_DISPLAYCONTROL | self.displaycontrol) - - def noBlink(self): - """ Turn the blinking cursor off """ - self.displaycontrol &= ~self.LCD_BLINKON - self.write4bits(self.LCD_DISPLAYCONTROL | self.displaycontrol) - - def blink(self): - """ Turn the blinking cursor on """ - self.displaycontrol |= self.LCD_BLINKON - self.write4bits(self.LCD_DISPLAYCONTROL | self.displaycontrol) - - def DisplayLeft(self): - """ These commands scroll the display without changing the RAM """ - self.write4bits(self.LCD_CURSORSHIFT | self.LCD_DISPLAYMOVE | self.LCD_MOVELEFT) - - def scrollDisplayRight(self): - """ These commands scroll the display without changing the RAM """ - self.write4bits(self.LCD_CURSORSHIFT | self.LCD_DISPLAYMOVE | self.LCD_MOVERIGHT) - - def leftToRight(self): - """ This is for text that flows Left to Right """ - self.displaymode |= self.LCD_ENTRYLEFT - self.write4bits(self.LCD_ENTRYMODESET | self.displaymode) - - def rightToLeft(self): - """ This is for text that flows Right to Left """ - self.displaymode &= ~self.LCD_ENTRYLEFT - self.write4bits(self.LCD_ENTRYMODESET | self.displaymode) - - def autoscroll(self): - """ This will 'right justify' text from the cursor """ - self.displaymode |= self.LCD_ENTRYSHIFTINCREMENT - self.write4bits(self.LCD_ENTRYMODESET | self.displaymode) - - def noAutoscroll(self): - """ This will 'left justify' text from the cursor """ - self.displaymode &= ~self.LCD_ENTRYSHIFTINCREMENT - self.write4bits(self.LCD_ENTRYMODESET | self.displaymode) - - def write4bits(self, bits, char_mode=False): - """ Send command to LCD """ - self.delayMicroseconds(1000) # 1000 microsecond sleep - bits = bin(bits)[2:].zfill(8) - self.GPIO.output(self.pin_rs, char_mode) - for pin in self.pins_db: - self.GPIO.output(pin, False) - for i in range(4): - if bits[i] == "1": - self.GPIO.output(self.pins_db[::-1][i], True) - self.pulseEnable() - for pin in self.pins_db: - self.GPIO.output(pin, False) - for i in range(4, 8): - if bits[i] == "1": - self.GPIO.output(self.pins_db[::-1][i-4], True) - self.pulseEnable() - - def delayMicroseconds(self, microseconds): - seconds = microseconds / float(1000000) # divide microseconds by 1 million for seconds - sleep(seconds) - - def pulseEnable(self): - self.GPIO.output(self.pin_e, False) - self.delayMicroseconds(1) # 1 microsecond pause - enable pulse must be > 450ns - self.GPIO.output(self.pin_e, True) - self.delayMicroseconds(1) # 1 microsecond pause - enable pulse must be > 450ns - self.GPIO.output(self.pin_e, False) - self.delayMicroseconds(1) # commands need > 37us to settle - - def message(self, text): - """ Send string to LCD. Newline wraps to second line""" - for char in text: - if char == '\n': - self.write4bits(0xC0) # next line - else: - self.write4bits(ord(char), True) - - -if __name__ == '__main__': - lcd = Adafruit_CharLCD() - lcd.clear() - lcd.message(" Adafruit 16x2\n Standard LCD") diff --git a/Adafruit_CharLCD/Adafruit_CharLCD_IPclock_example.py b/Adafruit_CharLCD/Adafruit_CharLCD_IPclock_example.py deleted file mode 100755 index f1be14cd..00000000 --- a/Adafruit_CharLCD/Adafruit_CharLCD_IPclock_example.py +++ /dev/null @@ -1,25 +0,0 @@ -#!/usr/bin/python - -from Adafruit_CharLCD import Adafruit_CharLCD -from subprocess import * -from time import sleep, strftime -from datetime import datetime - -lcd = Adafruit_CharLCD() - -cmd = "ip addr show eth0 | grep inet | awk '{print $2}' | cut -d/ -f1" - -lcd.begin(16, 1) - - -def run_cmd(cmd): - p = Popen(cmd, shell=True, stdout=PIPE) - output = p.communicate()[0] - return output - -while 1: - lcd.clear() - ipaddr = run_cmd(cmd) - lcd.message(datetime.now().strftime('%b %d %H:%M:%S\n')) - lcd.message('IP %s' % (ipaddr)) - sleep(2) diff --git a/Adafruit_CharLCD/Adafruit_I2C.py b/Adafruit_CharLCD/Adafruit_I2C.py deleted file mode 120000 index 77f06164..00000000 --- a/Adafruit_CharLCD/Adafruit_I2C.py +++ /dev/null @@ -1 +0,0 @@ -../Adafruit_I2C/Adafruit_I2C.py \ No newline at end of file diff --git a/Adafruit_CharLCD/Adafruit_MCP230xx.py b/Adafruit_CharLCD/Adafruit_MCP230xx.py deleted file mode 120000 index 3df8faef..00000000 --- a/Adafruit_CharLCD/Adafruit_MCP230xx.py +++ /dev/null @@ -1 +0,0 @@ -../Adafruit_MCP230xx/Adafruit_MCP230xx.py \ No newline at end of file diff --git a/Adafruit_CharLCD/LCD_MCP230XX_test.py b/Adafruit_CharLCD/LCD_MCP230XX_test.py deleted file mode 100644 index cc1e7bcd..00000000 --- a/Adafruit_CharLCD/LCD_MCP230XX_test.py +++ /dev/null @@ -1,18 +0,0 @@ -#!/usr/bin/python -# Example script to show usage of MCP230xx GPIO extender to drive character LCD. - -from Adafruit_CharLCD import Adafruit_CharLCD -from Adafruit_MCP230xx import MCP230XX_GPIO - -bus = 1 # Note you need to change the bus number to 0 if running on a revision 1 Raspberry Pi. -address = 0x20 # I2C address of the MCP230xx chip. -gpio_count = 8 # Number of GPIOs exposed by the MCP230xx chip, should be 8 or 16 depending on chip. - -# Create MCP230xx GPIO adapter. -mcp = MCP230XX_GPIO(bus, address, gpio_count) - -# Create LCD, passing in MCP GPIO adapter. -lcd = Adafruit_CharLCD(pin_rs=1, pin_e=2, pins_db=[3,4,5,6], GPIO=mcp) - -lcd.clear() -lcd.message(" Adafruit 16x2\n Standard LCD") diff --git a/Adafruit_CharLCDPlate/Adafruit_CharLCDPlate.py b/Adafruit_CharLCDPlate/Adafruit_CharLCDPlate.py deleted file mode 100644 index 8542e66b..00000000 --- a/Adafruit_CharLCDPlate/Adafruit_CharLCDPlate.py +++ /dev/null @@ -1,504 +0,0 @@ -#!/usr/bin/python - -# Python library for Adafruit RGB-backlit LCD plate for Raspberry Pi. -# Written by Adafruit Industries. MIT license. - -# This is essentially a complete rewrite, but the calling syntax -# and constants are based on code from lrvick and LiquidCrystal. -# lrvic - https://github.com/lrvick/raspi-hd44780/blob/master/hd44780.py -# LiquidCrystal - https://github.com/arduino/Arduino/blob/master/libraries/LiquidCrystal/LiquidCrystal.cpp - -from Adafruit_I2C import Adafruit_I2C -from time import sleep - - -class Adafruit_CharLCDPlate(Adafruit_I2C): - - # ---------------------------------------------------------------------- - # Constants - - # Port expander registers - MCP23017_IOCON_BANK0 = 0x0A # IOCON when Bank 0 active - MCP23017_IOCON_BANK1 = 0x15 # IOCON when Bank 1 active - # These are register addresses when in Bank 1 only: - MCP23017_GPIOA = 0x09 - MCP23017_IODIRB = 0x10 - MCP23017_GPIOB = 0x19 - - # Port expander input pin definitions - SELECT = 0 - RIGHT = 1 - DOWN = 2 - UP = 3 - LEFT = 4 - - # LED colors - OFF = 0x00 - RED = 0x01 - GREEN = 0x02 - BLUE = 0x04 - YELLOW = RED + GREEN - TEAL = GREEN + BLUE - VIOLET = RED + BLUE - WHITE = RED + GREEN + BLUE - ON = RED + GREEN + BLUE - - # LCD Commands - LCD_CLEARDISPLAY = 0x01 - LCD_RETURNHOME = 0x02 - LCD_ENTRYMODESET = 0x04 - LCD_DISPLAYCONTROL = 0x08 - LCD_CURSORSHIFT = 0x10 - LCD_FUNCTIONSET = 0x20 - LCD_SETCGRAMADDR = 0x40 - LCD_SETDDRAMADDR = 0x80 - - # Flags for display on/off control - LCD_DISPLAYON = 0x04 - LCD_DISPLAYOFF = 0x00 - LCD_CURSORON = 0x02 - LCD_CURSOROFF = 0x00 - LCD_BLINKON = 0x01 - LCD_BLINKOFF = 0x00 - - # Flags for display entry mode - LCD_ENTRYRIGHT = 0x00 - LCD_ENTRYLEFT = 0x02 - LCD_ENTRYSHIFTINCREMENT = 0x01 - LCD_ENTRYSHIFTDECREMENT = 0x00 - - # Flags for display/cursor shift - LCD_DISPLAYMOVE = 0x08 - LCD_CURSORMOVE = 0x00 - LCD_MOVERIGHT = 0x04 - LCD_MOVELEFT = 0x00 - - # Line addresses for up to 4 line displays. Maps line number to DDRAM address for line. - LINE_ADDRESSES = { 1: 0xC0, 2: 0x94, 3: 0xD4 } - - # Truncation constants for message function truncate parameter. - NO_TRUNCATE = 0 - TRUNCATE = 1 - TRUNCATE_ELLIPSIS = 2 - - # ---------------------------------------------------------------------- - # Constructor - - def __init__(self, busnum=-1, addr=0x20, debug=False, backlight=ON): - - self.i2c = Adafruit_I2C(addr, busnum, debug) - - # I2C is relatively slow. MCP output port states are cached - # so we don't need to constantly poll-and-change bit states. - self.porta, self.portb, self.ddrb = 0, 0, 0b00000010 - - # Set initial backlight color. - c = ~backlight - self.porta = (self.porta & 0b00111111) | ((c & 0b011) << 6) - self.portb = (self.portb & 0b11111110) | ((c & 0b100) >> 2) - - # Set MCP23017 IOCON register to Bank 0 with sequential operation. - # If chip is already set for Bank 0, this will just write to OLATB, - # which won't seriously bother anything on the plate right now - # (blue backlight LED will come on, but that's done in the next - # step anyway). - self.i2c.bus.write_byte_data( - self.i2c.address, self.MCP23017_IOCON_BANK1, 0) - - # Brute force reload ALL registers to known state. This also - # sets up all the input pins, pull-ups, etc. for the Pi Plate. - self.i2c.bus.write_i2c_block_data( - self.i2c.address, 0, - [ 0b00111111, # IODIRA R+G LEDs=outputs, buttons=inputs - self.ddrb , # IODIRB LCD D7=input, Blue LED=output - 0b00111111, # IPOLA Invert polarity on button inputs - 0b00000000, # IPOLB - 0b00000000, # GPINTENA Disable interrupt-on-change - 0b00000000, # GPINTENB - 0b00000000, # DEFVALA - 0b00000000, # DEFVALB - 0b00000000, # INTCONA - 0b00000000, # INTCONB - 0b00000000, # IOCON - 0b00000000, # IOCON - 0b00111111, # GPPUA Enable pull-ups on buttons - 0b00000000, # GPPUB - 0b00000000, # INTFA - 0b00000000, # INTFB - 0b00000000, # INTCAPA - 0b00000000, # INTCAPB - self.porta, # GPIOA - self.portb, # GPIOB - self.porta, # OLATA - self.portb ]) # OLATB - - # Switch to Bank 1 and disable sequential operation. - # From this point forward, the register addresses do NOT match - # the list immediately above. Instead, use the constants defined - # at the start of the class. Also, the address register will no - # longer increment automatically after this -- multi-byte - # operations must be broken down into single-byte calls. - self.i2c.bus.write_byte_data( - self.i2c.address, self.MCP23017_IOCON_BANK0, 0b10100000) - - self.displayshift = (self.LCD_CURSORMOVE | - self.LCD_MOVERIGHT) - self.displaymode = (self.LCD_ENTRYLEFT | - self.LCD_ENTRYSHIFTDECREMENT) - self.displaycontrol = (self.LCD_DISPLAYON | - self.LCD_CURSOROFF | - self.LCD_BLINKOFF) - - self.write(0x33) # Init - self.write(0x32) # Init - self.write(0x28) # 2 line 5x8 matrix - self.write(self.LCD_CLEARDISPLAY) - self.write(self.LCD_CURSORSHIFT | self.displayshift) - self.write(self.LCD_ENTRYMODESET | self.displaymode) - self.write(self.LCD_DISPLAYCONTROL | self.displaycontrol) - self.write(self.LCD_RETURNHOME) - - - # ---------------------------------------------------------------------- - # Write operations - - # The LCD data pins (D4-D7) connect to MCP pins 12-9 (PORTB4-1), in - # that order. Because this sequence is 'reversed,' a direct shift - # won't work. This table remaps 4-bit data values to MCP PORTB - # outputs, incorporating both the reverse and shift. - flip = ( 0b00000000, 0b00010000, 0b00001000, 0b00011000, - 0b00000100, 0b00010100, 0b00001100, 0b00011100, - 0b00000010, 0b00010010, 0b00001010, 0b00011010, - 0b00000110, 0b00010110, 0b00001110, 0b00011110 ) - - # Low-level 4-bit interface for LCD output. This doesn't actually - # write data, just returns a byte array of the PORTB state over time. - # Can concatenate the output of multiple calls (up to 8) for more - # efficient batch write. - def out4(self, bitmask, value): - hi = bitmask | self.flip[value >> 4] - lo = bitmask | self.flip[value & 0x0F] - return [hi | 0b00100000, hi, lo | 0b00100000, lo] - - - # The speed of LCD accesses is inherently limited by I2C through the - # port expander. A 'well behaved program' is expected to poll the - # LCD to know that a prior instruction completed. But the timing of - # most instructions is a known uniform 37 mS. The enable strobe - # can't even be twiddled that fast through I2C, so it's a safe bet - # with these instructions to not waste time polling (which requires - # several I2C transfers for reconfiguring the port direction). - # The D7 pin is set as input when a potentially time-consuming - # instruction has been issued (e.g. screen clear), as well as on - # startup, and polling will then occur before more commands or data - # are issued. - - pollables = ( LCD_CLEARDISPLAY, LCD_RETURNHOME ) - - # Write byte, list or string value to LCD - def write(self, value, char_mode=False): - """ Send command/data to LCD """ - - # If pin D7 is in input state, poll LCD busy flag until clear. - if self.ddrb & 0b00000010: - lo = (self.portb & 0b00000001) | 0b01000000 - hi = lo | 0b00100000 # E=1 (strobe) - self.i2c.bus.write_byte_data( - self.i2c.address, self.MCP23017_GPIOB, lo) - while True: - # Strobe high (enable) - self.i2c.bus.write_byte(self.i2c.address, hi) - # First nybble contains busy state - bits = self.i2c.bus.read_byte(self.i2c.address) - # Strobe low, high, low. Second nybble (A3) is ignored. - self.i2c.bus.write_i2c_block_data( - self.i2c.address, self.MCP23017_GPIOB, [lo, hi, lo]) - if (bits & 0b00000010) == 0: break # D7=0, not busy - self.portb = lo - - # Polling complete, change D7 pin to output - self.ddrb &= 0b11111101 - self.i2c.bus.write_byte_data(self.i2c.address, - self.MCP23017_IODIRB, self.ddrb) - - bitmask = self.portb & 0b00000001 # Mask out PORTB LCD control bits - if char_mode: bitmask |= 0b10000000 # Set data bit if not a command - - # If string or list, iterate through multiple write ops - if isinstance(value, str): - last = len(value) - 1 # Last character in string - data = [] # Start with blank list - for i, v in enumerate(value): # For each character... - # Append 4 bytes to list representing PORTB over time. - # First the high 4 data bits with strobe (enable) set - # and unset, then same with low 4 data bits (strobe 1/0). - data.extend(self.out4(bitmask, ord(v))) - # I2C block data write is limited to 32 bytes max. - # If limit reached, write data so far and clear. - # Also do this on last byte if not otherwise handled. - if (len(data) >= 32) or (i == last): - self.i2c.bus.write_i2c_block_data( - self.i2c.address, self.MCP23017_GPIOB, data) - self.portb = data[-1] # Save state of last byte out - data = [] # Clear list for next iteration - elif isinstance(value, list): - # Same as above, but for list instead of string - last = len(value) - 1 - data = [] - for i, v in enumerate(value): - data.extend(self.out4(bitmask, v)) - if (len(data) >= 32) or (i == last): - self.i2c.bus.write_i2c_block_data( - self.i2c.address, self.MCP23017_GPIOB, data) - self.portb = data[-1] - data = [] - else: - # Single byte - data = self.out4(bitmask, value) - self.i2c.bus.write_i2c_block_data( - self.i2c.address, self.MCP23017_GPIOB, data) - self.portb = data[-1] - - # If a poll-worthy instruction was issued, reconfigure D7 - # pin as input to indicate need for polling on next call. - if (not char_mode) and (value in self.pollables): - self.ddrb |= 0b00000010 - self.i2c.bus.write_byte_data(self.i2c.address, - self.MCP23017_IODIRB, self.ddrb) - - - # ---------------------------------------------------------------------- - # Utility methods - - def begin(self, cols, lines): - self.currline = 0 - self.numlines = lines - self.numcols = cols - self.clear() - - - # Puts the MCP23017 back in Bank 0 + sequential write mode so - # that other code using the 'classic' library can still work. - # Any code using this newer version of the library should - # consider adding an atexit() handler that calls this. - def stop(self): - self.porta = 0b11000000 # Turn off LEDs on the way out - self.portb = 0b00000001 - sleep(0.0015) - self.i2c.bus.write_byte_data( - self.i2c.address, self.MCP23017_IOCON_BANK1, 0) - self.i2c.bus.write_i2c_block_data( - self.i2c.address, 0, - [ 0b00111111, # IODIRA - self.ddrb , # IODIRB - 0b00000000, # IPOLA - 0b00000000, # IPOLB - 0b00000000, # GPINTENA - 0b00000000, # GPINTENB - 0b00000000, # DEFVALA - 0b00000000, # DEFVALB - 0b00000000, # INTCONA - 0b00000000, # INTCONB - 0b00000000, # IOCON - 0b00000000, # IOCON - 0b00111111, # GPPUA - 0b00000000, # GPPUB - 0b00000000, # INTFA - 0b00000000, # INTFB - 0b00000000, # INTCAPA - 0b00000000, # INTCAPB - self.porta, # GPIOA - self.portb, # GPIOB - self.porta, # OLATA - self.portb ]) # OLATB - - - def clear(self): - self.write(self.LCD_CLEARDISPLAY) - - - def home(self): - self.write(self.LCD_RETURNHOME) - - - row_offsets = ( 0x00, 0x40, 0x14, 0x54 ) - def setCursor(self, col, row): - if row > self.numlines: row = self.numlines - 1 - elif row < 0: row = 0 - self.write(self.LCD_SETDDRAMADDR | (col + self.row_offsets[row])) - - - def display(self): - """ Turn the display on (quickly) """ - self.displaycontrol |= self.LCD_DISPLAYON - self.write(self.LCD_DISPLAYCONTROL | self.displaycontrol) - - - def noDisplay(self): - """ Turn the display off (quickly) """ - self.displaycontrol &= ~self.LCD_DISPLAYON - self.write(self.LCD_DISPLAYCONTROL | self.displaycontrol) - - - def cursor(self): - """ Underline cursor on """ - self.displaycontrol |= self.LCD_CURSORON - self.write(self.LCD_DISPLAYCONTROL | self.displaycontrol) - - - def noCursor(self): - """ Underline cursor off """ - self.displaycontrol &= ~self.LCD_CURSORON - self.write(self.LCD_DISPLAYCONTROL | self.displaycontrol) - - - def ToggleCursor(self): - """ Toggles the underline cursor On/Off """ - self.displaycontrol ^= self.LCD_CURSORON - self.write(self.LCD_DISPLAYCONTROL | self.displaycontrol) - - - def blink(self): - """ Turn on the blinking cursor """ - self.displaycontrol |= self.LCD_BLINKON - self.write(self.LCD_DISPLAYCONTROL | self.displaycontrol) - - - def noBlink(self): - """ Turn off the blinking cursor """ - self.displaycontrol &= ~self.LCD_BLINKON - self.write(self.LCD_DISPLAYCONTROL | self.displaycontrol) - - - def ToggleBlink(self): - """ Toggles the blinking cursor """ - self.displaycontrol ^= self.LCD_BLINKON - self.write(self.LCD_DISPLAYCONTROL | self.displaycontrol) - - - def scrollDisplayLeft(self): - """ These commands scroll the display without changing the RAM """ - self.displayshift = self.LCD_DISPLAYMOVE | self.LCD_MOVELEFT - self.write(self.LCD_CURSORSHIFT | self.displayshift) - - - def scrollDisplayRight(self): - """ These commands scroll the display without changing the RAM """ - self.displayshift = self.LCD_DISPLAYMOVE | self.LCD_MOVERIGHT - self.write(self.LCD_CURSORSHIFT | self.displayshift) - - - def leftToRight(self): - """ This is for text that flows left to right """ - self.displaymode |= self.LCD_ENTRYLEFT - self.write(self.LCD_ENTRYMODESET | self.displaymode) - - - def rightToLeft(self): - """ This is for text that flows right to left """ - self.displaymode &= ~self.LCD_ENTRYLEFT - self.write(self.LCD_ENTRYMODESET | self.displaymode) - - - def autoscroll(self): - """ This will 'right justify' text from the cursor """ - self.displaymode |= self.LCD_ENTRYSHIFTINCREMENT - self.write(self.LCD_ENTRYMODESET | self.displaymode) - - - def noAutoscroll(self): - """ This will 'left justify' text from the cursor """ - self.displaymode &= ~self.LCD_ENTRYSHIFTINCREMENT - self.write(self.LCD_ENTRYMODESET | self.displaymode) - - - def createChar(self, location, bitmap): - self.write(self.LCD_SETCGRAMADDR | ((location & 7) << 3)) - self.write(bitmap, True) - self.write(self.LCD_SETDDRAMADDR) - - - def message(self, text, truncate=NO_TRUNCATE): - """ Send string to LCD. Newline wraps to second line""" - lines = str(text).split('\n') # Split at newline(s) - for i, line in enumerate(lines): # For each substring... - address = self.LINE_ADDRESSES.get(i, None) - if address is not None: # If newline(s), - self.write(address) # set DDRAM address to line - # Handle appropriate truncation if requested. - linelen = len(line) - if truncate == self.TRUNCATE and linelen > self.numcols: - # Hard truncation of line. - self.write(line[0:self.numcols], True) - elif truncate == self.TRUNCATE_ELLIPSIS and linelen > self.numcols: - # Nicer truncation with ellipses. - self.write(line[0:self.numcols-3] + '...', True) - else: - self.write(line, True) - - - - def backlight(self, color): - c = ~color - self.porta = (self.porta & 0b00111111) | ((c & 0b011) << 6) - self.portb = (self.portb & 0b11111110) | ((c & 0b100) >> 2) - # Has to be done as two writes because sequential operation is off. - self.i2c.bus.write_byte_data( - self.i2c.address, self.MCP23017_GPIOA, self.porta) - self.i2c.bus.write_byte_data( - self.i2c.address, self.MCP23017_GPIOB, self.portb) - - - # Read state of single button - def buttonPressed(self, b): - return (self.i2c.readU8(self.MCP23017_GPIOA) >> b) & 1 - - - # Read and return bitmask of combined button state - def buttons(self): - return self.i2c.readU8(self.MCP23017_GPIOA) & 0b11111 - - - # ---------------------------------------------------------------------- - # Test code - -if __name__ == '__main__': - - lcd = Adafruit_CharLCDPlate() - lcd.begin(16, 2) - lcd.clear() - lcd.message("Adafruit RGB LCD\nPlate w/Keypad!") - sleep(1) - - col = (('Red' , lcd.RED) , ('Yellow', lcd.YELLOW), ('Green' , lcd.GREEN), - ('Teal', lcd.TEAL), ('Blue' , lcd.BLUE) , ('Violet', lcd.VIOLET), - ('Off' , lcd.OFF) , ('On' , lcd.ON)) - - print "Cycle thru backlight colors" - for c in col: - print c[0] - lcd.clear() - lcd.message(c[0]) - lcd.backlight(c[1]) - sleep(0.5) - - btn = ((lcd.SELECT, 'Select', lcd.ON), - (lcd.LEFT , 'Left' , lcd.RED), - (lcd.UP , 'Up' , lcd.BLUE), - (lcd.DOWN , 'Down' , lcd.GREEN), - (lcd.RIGHT , 'Right' , lcd.VIOLET)) - - print "Try buttons on plate" - lcd.clear() - lcd.message("Try buttons") - prev = -1 - while True: - for b in btn: - if lcd.buttonPressed(b[0]): - if b is not prev: - print b[1] - lcd.clear() - lcd.message(b[1]) - lcd.backlight(b[2]) - prev = b - break diff --git a/Adafruit_CharLCDPlate/Adafruit_I2C.py b/Adafruit_CharLCDPlate/Adafruit_I2C.py deleted file mode 120000 index 77f06164..00000000 --- a/Adafruit_CharLCDPlate/Adafruit_I2C.py +++ /dev/null @@ -1 +0,0 @@ -../Adafruit_I2C/Adafruit_I2C.py \ No newline at end of file diff --git a/Adafruit_CharLCDPlate/Adafruit_MCP230xx.py b/Adafruit_CharLCDPlate/Adafruit_MCP230xx.py deleted file mode 120000 index 3df8faef..00000000 --- a/Adafruit_CharLCDPlate/Adafruit_MCP230xx.py +++ /dev/null @@ -1 +0,0 @@ -../Adafruit_MCP230xx/Adafruit_MCP230xx.py \ No newline at end of file diff --git a/Adafruit_CharLCDPlate/LCDtest.py b/Adafruit_CharLCDPlate/LCDtest.py deleted file mode 100644 index cbda5c2c..00000000 --- a/Adafruit_CharLCDPlate/LCDtest.py +++ /dev/null @@ -1,37 +0,0 @@ -#!/usr/bin/python - -from time import sleep -from Adafruit_CharLCDPlate import Adafruit_CharLCDPlate - -# Initialize the LCD plate. Should auto-detect correct I2C bus. If not, -# pass '0' for early 256 MB Model B boards or '1' for all later versions -lcd = Adafruit_CharLCDPlate() - -# Clear display and show greeting, pause 1 sec -lcd.clear() -lcd.message("Adafruit RGB LCD\nPlate w/Keypad!") -sleep(1) - -# Cycle through backlight colors -col = (lcd.RED , lcd.YELLOW, lcd.GREEN, lcd.TEAL, - lcd.BLUE, lcd.VIOLET, lcd.ON , lcd.OFF) -for c in col: - lcd.backlight(c) - sleep(.5) - -# Poll buttons, display message & set backlight accordingly -btn = ((lcd.LEFT , 'Red Red Wine' , lcd.RED), - (lcd.UP , 'Sita sings\nthe blues' , lcd.BLUE), - (lcd.DOWN , 'I see fields\nof green' , lcd.GREEN), - (lcd.RIGHT , 'Purple mountain\nmajesties', lcd.VIOLET), - (lcd.SELECT, '' , lcd.ON)) -prev = -1 -while True: - for b in btn: - if lcd.buttonPressed(b[0]): - if b is not prev: - lcd.clear() - lcd.message(b[1]) - lcd.backlight(b[2]) - prev = b - break diff --git a/Adafruit_CharLCDPlate/LCDtest_20x4.py b/Adafruit_CharLCDPlate/LCDtest_20x4.py deleted file mode 100644 index 01fc8fe8..00000000 --- a/Adafruit_CharLCDPlate/LCDtest_20x4.py +++ /dev/null @@ -1,156 +0,0 @@ -#!/usr/bin/python - -#---------------------------------------------------------------- -# Author: Chris Crumpacker -# Date: May 2013 -# -# A demo of some of the built in helper functions of -# the Adafruit_CharLCDPlate.py This is 20x4 display specific. -# -# Using Adafruit_CharLCD code with the I2C and MCP230xx code aswell -#---------------------------------------------------------------- - -numcolumns = 20 -numrows = 4 - -from time import sleep -from Adafruit_CharLCDPlate import Adafruit_CharLCDPlate - -lcd = Adafruit_CharLCDPlate() - -lcd.begin(numcolumns, numrows) - -lcd.backlight(lcd.ON) -lcd.message("LCD 20x4\nDemonstration") -sleep(2) - -while True: - #Text on each line alone. - lcd.clear() - lcd.setCursor(0,0) - lcd.message("Line 1") - sleep(1) - - lcd.clear() - lcd.setCursor(0,1) - lcd.message("Line 2") - sleep(1) - - lcd.clear() - lcd.setCursor(0,2) - lcd.message("Line 3") - sleep(1) - - lcd.clear() - lcd.setCursor(0,3) - lcd.message("Line 4") - sleep(1) - - # Using the "\n" new line marker - lcd.clear() - lcd.setCursor(0,0) - lcd.message("Line 1") - sleep(1) - - lcd.clear() - lcd.setCursor(0,0) - lcd.message("Line 1\nLine 2") - sleep(1) - - lcd.clear() - lcd.setCursor(0,0) - lcd.message("Line 1\nLine 2\nLine 3") - sleep(1) - - lcd.clear() - lcd.setCursor(0,0) - lcd.message("Line 1\nLine 2\nLine 3\nLine 4") - sleep(1) - - # Auto line limiting by length as to not overflow the display - # This is line by line and does not to any caraige returns - lcd.clear() - lcd.setCursor(0,0) - lcd.message("This String is 33 Characters long", lcd.TRUNCATE) - sleep(2) - - lcd.clear() - lcd.setCursor(0,0) - lcd.message("This String has ellipsis", lcd.TRUNCATE_ELLIPSIS) - sleep(2) - - #Scroll text to the right - messageToPrint = "Scrolling Right" - i=0 - while i<20: - lcd.clear() - lcd.setCursor(0,0) - suffix = " " * i - lcd.message(suffix + messageToPrint, lcd.TRUNCATE) - sleep(.25) - i += 1 - - # Scroll test in from the Left - messageToPrint = "Scrolling Left" - i=20 - while i>=0: - lcd.clear() - lcd.setCursor(0,0) - suffix = " " * i - lcd.message(suffix + messageToPrint, lcd.TRUNCATE) - sleep(.25) - i -= 1 - sleep(2) - - # Printing text backwards, NOT right justified - lcd.clear() - lcd.setCursor(0,0) - lcd.message("Right to left:") - lcd.setCursor(10,1) - lcd.rightToLeft() - lcd.message("Testing") - sleep(2) - - # Printing normally from the middle of the line - lcd.clear() - lcd.setCursor(0,0) - lcd.message("Left to Right:") - lcd.setCursor(10,1) - lcd.message("Testing") - sleep(2) - - # Enabling the cursor and having it blink - lcd.clear() - lcd.setCursor(0,0) - lcd.cursor() - lcd.blink() - lcd.message("Cursor is blinking") - lcd.setCursor(0,1) - sleep(3) - lcd.noCursor() - lcd.noBlink() - - # Turning the backlight off and showing a simple count down - lcd.clear() - lcd.setCursor(0,0) - lcd.message("Backlight off in") - lcd.setCursor(0,3) - lcd.message("Back on in 3sec") - lcd.setCursor(17,0) #Reseting the cursor here keeps us from having to clear the screen, this over writes the previous character - lcd.message("3") - sleep(1) - - lcd.setCursor(17,0) - lcd.message("2") - sleep(1) - - lcd.setCursor(17,0) - lcd.message("1") - sleep(1) - - lcd.backlight(lcd.OFF) - lcd.clear() - lcd.setCursor(0,0) - sleep(3) - lcd.backlight(lcd.ON) - lcd.message("Backlight on") diff --git a/Adafruit_DHT_Driver/Adafruit_DHT b/Adafruit_DHT_Driver/Adafruit_DHT deleted file mode 100755 index 40f4c4161c1105df67b1ffe81018b6d6be12549b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 30400 zcmeHwdwi7Do%eZWCX<0&n2>;6qC7y5i%Dh@0!E}YKtL`50>qWBZigY6B%_myxhNp5 zT%ytz5CvP>Qb{YewrgAL+LpDpWz|o$t=qEIwbc6ACd4T9R_wa17i!+`_nhZEb7m6Q zci+$c`95&woZs#H`vq|WtL?LeR#wyLF(bVgs4DX^9dn5LS$43TLd7R zDT*j>f9^6No_j#00Q8uAPVytCZN(0iBp{439J!Y=&=osXnh2VS_F&6|Oo$ySorW(a z+LK2eVKbqG)P<}dQwaK{9Px^5o5_;t9B3xW>4T{jHnlrdss_!ZW$OmJ8bA&^w0$TM z-yBLblqBM<-CIhc9WBj`rJZf1b7??~AQIrkwQH`!r;3NRlaMGcKw=wE{`17H*~hjf zzS8&0)o->fdMmbibl{#mM<)w8kI_iP9D|gNl!GMeikt^AdE_Fojo24x4)@4MX{&FoEY>;AFpPtw1QPVw~63{6~3xFXMiQ;%!wiU3_0U9edv0y zPOKXbVl&p;e*5L^cb)tE_D{W)H>Pvpq3xw>KK7UPN58cFn)ipEsQmNi3fJ$QHPxE_ z{;`AKJC^&&&mSxt^~n48gK--8y0oO32& z&>N_4&|5*DGUD3-I&8>`KxZ3tBj_Ur-2wV#!+t5~35J~G^IbzOB9W$+w$?~zSG1!m z5)l~o^&IH)MQgORtuqmewTt%du1*o%+}6=0T3Vv*Fo|_^w6;YOZS~Qvcw4Jzi6&4M zom~wOh?eeFYIQ5)XjfZY)F;|HW1_7+)+!p?JL0WfjZp5WZ)s-+o3;*s(zO#uOEeD6 zj#x}wTeD*El1Oz#J2_kU0jk%^ZWNh`C<~j8rim6SJ5(aKp?ofhw3|0#!1{gk8uS z6TXT$CPy{%42)0am~1u75pzA7=S@?||s*9q#x0{?FC zJ;3-lFn~J{2*VF-ec|0_Xzzvnx!}>kZO}9QW?ew{S?IQ<>5jjEZZC8jE}$D={HPD6 z$fWIPw>b2?z`;51b;cJk;@bgPHrgjUY4eL3*xcyYV0ye>g??dOvV)TcSAri9lLuMG zRAIf~2V>#XsxxBGkIybdpKn6yMLLG`Fw$|PQ%LV3>3#{LUu^g-Lci#?V}E3$4M_)) z7a^w3@Sk2Kz7^~pm}`kQ(s>I#;*A~Nqk|=g%ajS|&x5QPvdc%1VVJy8JD1}PzURUlh1ld+zkVl3h@%lR@i%nV+q%W zlQ>T@p-UR${?Vt(5C?F)Q}26i7v_mz8F=*fEOZe6OC#Bw#$2L}72GxO9Lunw9_!D3 zSAKV&VLP#053GM08hT0B^H|=|!9!(?_u$}OEYBz*^C_ z4{OuD!GPF@KI-ic1}6`G@uQ(P=<@CcGC~x2l=)izAbLw_ZH{h z_$xNNxeBp!j>>*OZq9q0br;!R%@p<;T<>7L-hos+9oJb$aNb2)j^qQr5Kj$qP49tR zuIFf%BJ#sr_c5-}Cb;4QeeWRGbDmR5;1}bYYyMfXNo&7$vXM5F;&;B0gzOa3C@ILf+G3xQPsn9=(^G?~WzTM%f zK998*`R=|AuL@fsi>KG?5}l`%fx=yGhZZSvDG(Vjd% zuq_W>1b1v2?w&Nqq4_P#+II^J-iF9&n}KCibg5ZnhJ`vyNcKlDbyseNYz=Fao0HwUX0j}aeS zqp%JNuf!4fOzILYsa258DeAq8$&~r7&p(Wx_%k(SLwxLgJYWWZdDOuyIC*~x zroeSvVpr1xW|Bd+Q1D0 z_cIs4ZN32Riw=elxT}F%1KcMK+ydZ!`Xac+7r;H~U<81R{(lhP(ZA*6cN@(2pGw(* z!S5h{7uV^+R`c)&lHWV99pmvduJNh+n4|k3^5+cQe+13;zXiIFIJ)0-bPprvcN2}< zEBUj2lHpks&IiPG*; z$WKanpS%wdFl_()!O$DMj;&m$(rj~K+vC`Beakj%2VmRa*isfqvmJtbxnoQ00>kzN z$YwdV1yXjuuFvBiK*sAOVfPJChB-D+iM3O=KhI%YGndyM9bDdfbTFg#p1#q&OtC(m z+dMmZ`@aK>m0vyH|K6QH4&ZynfG>RiD}Ic-Oq>$}HrCCmo-@3kH(J#7{}tyP=$$RR z6ZdzKc;4sr1Ha>0xM$qm8EuL!uxE7IH8u2_TJ)g~eA=@mdID-)u;90|6> z+Yn1Y%PuP`w#&crm{skLjff|8 z37B-5rY=Gav0Fneu@<(Ejy2vI?^~|w>rK=ux*p1P6BG%w& zq~q~1NvcMwzxLZ&R>xZG5uj4_3>^BqI7@tiJSlDcrdyU9@?<;0)WHXE;U9N zx}d3b>1>aO|DP~v=wiP7+Rz0^JB9eKkA~X9yVNt^!XEX^_hryrAHIc@g+%;uNIYc?3D!hwl4r8F&?>gr4{Sr#J9vh@SBO{GdCu`H8qSeh z-@-FVYa#0W*G#3z2V^`vmjB-&^LR3PGtf2HLd7%l;}H0K8F(lwJb{e0J_s(sho|g% zX%ToH7TzZ4d&=YFcrw2LSno0#SKLmHFO#l4fy}>vm*MmN_E~WKm%v2$_v6FzFTpVI z`TriD8U9=F>G$u!XQuxsKE3`Q;M3!O0;riZe|3O{>p2SiJHfR4HxgcC`n+ST4RGN< zA)%kar{#YUpFaN}K6Cwx5b7BJeTY8KUyJfse*~Z7{H^#L@Bb7&FY)ii=LG+k@j2Q* z4d|o%W%!)vufk`Re=R-({!ijFQ+T()t?va@#f&<(i7)d*`1ihqaz^D+1nAug)r@_g zB)16>XY5a~h$l%R<9>1jzEQqj4x$}0$2(*o=OBPG zFLB81oGQefIl&==Iqv~CbD~2Qph+FtI|s50kIl+JO;g*h`A zWU+OdtYB5nGDa1)kiZIFwkOAV(#+921h8jff<7rpU8)Vi;KStahkaiy;_029VY~7V`@_VqLfSX-_YY8AOv92cC2Fp6&N;XI@Yb0O7U1H53QEyq_ zca`dsO7&7{g7pT%w?YYv9VN#SsrbG8qI{w#-L3v5~4j$v#sELAHvB!C_InCRBG*o1`lh43R9`|1T-cPs9y59EJ)2;B+xYLVdPfABG7rHdqA$nc$zNzJi#{q zE?CoL=Oozf|4Q;EB1-ZNkVUr&tCg}*=ru9H`YNofJr?m6VhKl0p8(_xe4hZDJyQt1 z=^tnBNiqa-oOJj(I=uWdz_j*KaWN#9OK1Cte*;Mw%6^g^AmI)l!a8WtRfBTp!78BK z9VE(rno0coiT_oS(#Pj1eMX`DoG4$mh_F|oEO$}9OuhebQNBWycU+VQD7^%=5i_ly zF!Tp4a)|OQQYj=~bDknov%W2niR!xt z5kYd^MgBHzKccOy>UW8phoq2?Q+gdqiTo&$ZwHC?dma$h4=f@UBcZ$2VF^<0_XC>k zr#wMD?= z3bb~VuKurS_DdJ^-w662F6eJ4^}$?4`aD4=gG8i%LqAwAS_FJqfj;DdzDToDn#o8{ z6OnXLXh1pTxN`e#ayxuE|^&>tz#pCAzHFBSp!D$w^`(7({^S1#y#1nqZ0 z-={PaLq$dU0YNVViAY~zq(c?~PbkoJ_!gq7KSZ;up*KrLYRR+V8q#vIdgNs6A}t%h zE6;eJBkpYLX#`;TEsLP9DBynt@Eo}a`laOqE^e@(rL7^B6Ypc*`Q{LWLZ0k;hBR zRu_4KMBeElPn7a+xX6tB~X~Oto$4)|2xp)3hSTPj3G-#N#G+2 zJe-47@Dhd_lG-gUTA4)KLF?JpLkz3ZvS@WeS#EPJE2Skzd@*+pLa!a!4_%}M66qI2 zDzU!DNnM430+hggLc9(3^MqPW(<+PCYLhT>N_#m{7hB&$=DD}IR9<~)vOQ#do9BmR z@+#5_6Zl)K#7fH|Xa!OUK#Fsbrm*HKCGaO);F?rmO%4a1ZH?pFw$ZW(T8)GgMhv)W zXm6BtPjINSOBDH8kcem&4R5h58tp-P80=ox@)l|NEG^qPEEN5FnwH@kElh8>Xmt+h zZE$}9OV!VJ%J$5~un^@Iub!;E7PTr4;`Ri%v#nbpvObTH!Kp+-$eCk=n2TL%2@}vg~mgcMXP3Ic{?rTRn9}w z!>3)#Z%E5~X<1=Cp-${lg_Z$4340i#muN00sdLtM&A%(ne^2^ScJgsa{|)p!d3pYf z9B)AkA~gEd4E+>_0btJ|m4dx42+k2`M#LYa?k^xidkhf$1Iwbz^GIm%&%x`Q&E1XU)9W8yFCR$D^U9J} zC0LOyS{2+cEuW@keJ9y9z@6mwyyf9SUjiB~|BVgl_gFNlREC%4Ifi}@4XdG8T+E(Q z^z|-KKmy%FS}ql%r2b9<&$mk1gh3C#91!=&7lrsdBwrqj)88J4F)N4OFZGc5B!q>V zzJSvd(k%!fWSxYqHBCZrb{0}{0*SA343|>!3evYnlu{BrjO&sSrIaj0`s0XFN}7=} z5$15elpI2uF`|@`lSoTOlv460QglQqB@@tYcZ?*xk`lJ+u!#7@k{vhSdY66hS=oTp z|Cc-j$DlcmgS8ou}3lZZnI@u^dbjI7l+Qd;)hB?t=?!qGBY-z>RESO;U_z zFe>-6BPT1yCNgGnz!WM*15FySI$g%mkl}5of{&}n6!v_EcMlnN<4kSYim{iB1w6A( zRg42ke@_lmg#S zgs}3g8M*mc-rUK#dDd7f2wYE*$jbUSSh$5WUU+jCWL=%LA|IEo4j<8G_^hlf@-6WF zv!GOn*_i2YGsq2$0SY>V8Lda>Ti)EHQC5zNT!~Xywkws!IgT`AMLwmuIt(FjC9@)* z_`#`SMSch#@=C31vQ?BbvsdKXGN!Q^Ex<3@G|wa_-9q}Gc3h1obOPr#5ZOLCKz z<)y;u{0zm!S=w+3u!^J^hey(Mp3_`TX!DbLrq-3J6S0&V?FZPa9BYhihP)sty(XI> zixrr89&rjKkM&`04rZZ+Q7E`Lgt|LBLh;u6M0Z0>NP;f_Hr3aM@a~`U7GP6rH}BUs zH->OSKULYW98r059IsF52acunaL6~MaKF8@nXa9uWFVBFA=Zd8Rti4v?L-klcg0&` zN*htd+f=l$18gRkv*f3*U9P4hM>uDIk)P-OC!X)*G}xxxL`U7kC=xbLcUdB?H}GEMWA z;w*#a%|X%yNIZCpkFixVww`2cyg_I3H6CxVnRvWA##pqRH?~Zg_oPgkx06hocY;is zH*rjw_g_q!w@yr&cRfs+H!Dnn!rcx%Pfsu5t!FiXdlO@!+?P1_Zb`w_v|@x92YJoxYw7IMDI%ia3lpCCBugo*wUR zpFT50n%d)Skxo3diF7vOC0u_0imX`6*Kco*bm_Nl$$=yiYi&q1#5ZwXAh*O5iFl{L z7No9@wuA&wTV`m`679TML>d#(rcT!w+b-yIalC772j1%yi*{JulrIexikYIPf~2RfVMjV`3J=T~d_g0m5l-1megi^wy+4pde;5xZ4~l=R;Wj1;XX zBTBSkL_np!^cXlb?@-jw5T4P(f zjMv2@?QJ7>tQ(c?*XDS;+Ur)^mWX1n*H%|UHd+i0S-`F#c?Hzjj^I)nOx8D*#rEgT zr$`HXZup>GR8toonO!zAyL@E!+>zN8BeUnpmQ$lX*@*339imN6E?p}|-w@l}-IQ7> zj@Cwu4Yr0H(3R+)mUw*!TAKaB7Sa&1>7vx;lAuO}94X0x#qmU;9QY}th&^MjAf)Tv zZW8NjS48CeuPuvU*J6rG43b1Dhbuvf3acTvT~KpRau3~=A|NV zf(-A|6>DniTs`j6a|y=pt}B~ew!1?S8wO>2md#IJAk4|>swcaSjU-oNIXN4g#i=2d zh;B`3rSRNTa$YKVWhzD$N?yfZIkA^G8=KJN+~+quTrQdJl2+dw#ah0)AH1q7MzTaLv#Vus9X{njRs|BIilN9fEn-qmAIy7H+4Vs=uL^;}tWy?U zABo{C0z53WYMFgk7B}Ei9+d7yvcx)OO1fT(@NsNp)`j6tz~D3zqGR?4S#+IIdQ!61 zF;i04*$X4HE(~`T25%y3{N?{XXw75kq zFIqmsl+}UHt#(EbnpFV!c{6A*J+r(>-ZS=3b3wIM2DH{ra@pH~btn~2vkbh^!|}9M z8s0HrJ%YsUVcw_80bOOvA44+YKkl#$e>q8iR6dDRAi8wz45^0I7)~_WC<8`DWuFDk zX(YorXph=3t-mxoOO$b3aP%YxVl^DqraIFs!&!c^^4gi!N^`~?k2gy^cW!XY z=bls-nssp(S}V=9r+CGp()JPWcf)rDqV+=bRk zbD`NI*5_R~;%!o6d}x;8Y~t|xXstA7d>S-a;<@#)K~|=^(5#EQ&{}COG<(GQ)WFfk zRA-uHI4c}pAFY+<>_%X9N<6ndTRv5@cL-2 zG-rz_8g*p2Klm^_hcM%FJS%Z*HHT@2|I zOkPIf`J4GGs_bKK;}JFZ6Wp-}9SC!o}IpxhrhC8xumMj;AR>zQt!kjNCpzNZ&3EqDq;lUms zsIy2F;}Vl(wz86WO&S7U(6|xFh=Z(pq)`ggKRw{~Y%|zfQnkst9mxqn_r?ye_8>8G z<~E+QqwHQ7Q+@==@OuE{Q6vY6MOqn^ISy8~WVsi~B=H(PahNFsS4y%7iBT{Qpyg1u zb(EA>Bf**(#g=d{u_+Bp={jagdcA48P)gS`Q&QJ+C0N%YIhA2iY1C=^O<*OEJR*FQ zZ{3_mvcyI$rgpxJhhM?uK~_+*)-h93_q$60SVdCm8jv*;DXnjc!KzHvB&%Ao+_6X2 zDx?b-dqw*=cU;s$uMUar%zUFN7chS;JGISEgZCy9+MHPtwkKNR`eI~NvRKP(yW;jB zJFK|OUQpbZk)2aqX2p2Q31nh*DC`(avU3+OV}1cq+$@7b(FVg--s&r%6O0>xd<&uL|vnE>SA)yOnnF zUT|q62#DGma0gwKE?U33G`1z)utk){nj?)J(UzD}$IZYF+%J>rx_nbT(19Gq?M--X z1DZnF+}SBg>)TpdVz}WVF{52w9r4ZGT`>scO;cb*Tbq((ycPF|v}p6@4%~!yDEzE1 zVo*j-K#D-~X+D3_)KPI@&8Giv%9A0-w;yybzNhR|-;O65Hk9$0j)dta^=hG43xN$< zA3U}2C_~bE?a*t7UXhfj53RQxB-UbycL;iipmzi`)-QQbkEt37zZclX_`BBd!8>tuL_uq1)0R+(#oX^S4C2f?}Zk^$+tl3gStGp{}PXkrQe@H?`P1P z1)lZ`c!_Z{a=rsf`W*DmLC;3n^b1mKL&8jyHhhmXh{`h_jR!ONKIv{lkMEt@&^zGh zVHV1IU`=pt2PymG&^r!2%vkpz9*?_`SSR|C@03FCO_cRPJtjP^boCy-3tzinu%|$4 zDIHRW4L!b(8^!=)Jo?an9{_`X*)EmPtAySmHoS9ay|06YUi&WO@;AIMQ+T;)dXFkS ziT47)Ux1#*psFta2xZzzS2mFCqzr6V?-`WGAW@I+5Buz-3@lggd6ZcX>hU*K19nmd zmaBIfWwtT()Ng%bETGJBz=QFzo%)e99^W@UZ{u75o<69@^eU3ptHXs$-BclL@bsbU z%f2Ko{qi?Gx}bLieXI}NH}8N!ys#sn9{#%rWlSF+0jpgL?uSxH6UeEAl7O!{f) z*(^ARmQ6%KmnnK>D*8EJYb9kf()5nc6XFxBlyhhdzOkyy6pgwHZ;_3lcTJk!#)U#` zGW2x&)i`>(T~1tsmymR$0iV8@u1~{Twj7s$96-)N9Uhz0^uCFcs>Y^V>*b+rgd=_j zJ+77d&_(8)L;7flpdLYN$peFPg7p9?*A^4+={DTf;(&Axji+fduh^+5uM-{DcOG8H zGuLrND-T?+6|Gv4>$0NNz~lO>XcYk0Sw*Ya!1Ywos-d}VDw-=K>T{>e;2)PJIJge- z@X8e)Yn@B06_4whl5>T`+I5%Aps!XDu2Vd`a>lFmNYQLLweBdIy@Iucix&>B7^@1l z<%;LDSm1jv>8dOYw9NPFGiT;WNdaK?w0SGfMi z2-PDJ47%?OvBtVT@$2g{zKu@*==k(+RIol=8#S%tv+q`TlrKebJM7sm7Jj{gxgI~f z>C7)Xn#QlZ%Xo_n``aPcw8pP7rl z@ifi&8w{Fq?#ok$!ar=#lyje+DSy_WDd!u?ro3W*lBS${_0*y8HyJeL4F=8l_82tf z+{>p9W&gB6Q_ekord-^Uq$&3qH1TH{H09jurw)Z*XV8>$@1H5(VbGNK7&P%8F=)!U zH&7i4|Fl6<&b@-B+;<>JQ_j7E>QMG!gQlE&2~GKp22DBl7Mk)s22DBl8k+LQ44QK8 zJv8Ng22J@Z2F?0s-|MJjK2y%UiRw`CR~j_s+^cBHYYm!m?p-wH+YOp>?qxLPhYgx? z?rk*Xj~O)O-0Nt{<;A^ZsQ9_((UiYw(6r~?MN?jLFiBI+J&Nj3^=~j}%DHFJl=}`P zY09~8Q60+uO@o&H4VvvAyg#W=Irl88L)ljtH09jGXv(XxXHnCXa}T4YiT^ZS=rL*a z`+4L{5I@ByY1&z!pGMBxxtjhtXx>=V^shkk-5yQ<1~gy((e#U;`6iF1>7T#jtqyfQ zx1{`doOzWAf;CyLiV^SvKUzYUtN{b>5XK=Z91P5%uvU;5EBaf3+e zuq9vr439ov7rEyLHGYZ>I{o}fJbnGdUrWjWL(>*$%JumbKgA&O!O%3%w^Kmt^C52F z$-SofdJ2DaL|jDxn;$+U-r^_7LQIqRjb2l=Z})O^l8|K~{gDTC(qI_pEbv6$Z- zp!FVH(w_yb_d1h43R>Hbh0UX&_1?;CcOc)aIPQOelgHIU+Vg71I_bWu@nF2 zKxS2Mx}&9?^iVWTh= z^m0R923lW#=6NQFkAvp*GtKhQWBdh}BWRxk=t8#7deC)-{bta5k2mA*0lmqPe*rYF zcXWGv8#L$tCg4;5$Dk92K7aPc>_7enhklQO`n><8zYmc9D`>q>opf#n<}22BJ$~?} znS5oOYY^p?pm~1dHyhHcL7V=rqdv|rfR*wV(ER%fe5T6!cYrp>>!(5McL|7h2sE#6 z`D;p~zX+Pwv&5r)FKGQv1?7)|=JkMXpQk`?G1}wbLF;!psQ(&h{k{n4^Pu%%qY(6~ z>m!Xf6|~-SPksJahkjRs^fjP+?otRG&uc;J_e>~{f#&r$pV*Ra0nPJoFLX)o0>vub7&!04@zE9n!B`t~?L{U`K z<1cL)f3Qo`cXV}jbvHKRwX#TL<&yQ0niU)B@MpXtk%qQNQ=)BiG!bd&YU}8XM7y_O z^FM#56u&=OI&c2mD@Rts2JzOox*3n1z+D|%@prgz!#<+6^hea~dqqWf%Rfa`?^xu1 zM1w>$|jS4fULf= zTQ-3XKEf@;*s1Bh43M%Pl{=cbQy7m8@Yl?$s*-=MEJbbD_J8N43_jUVfAY+AC%12N zt85B@eqBNR@ify;ks3u ztJNQ<8_7gBi`<>7aU|1hPRZaNceU$V>#?TX9gZoO>|Oo|J=2r=z}&C%9|1YV2bW`DkO8sYw4A-jsd+iDt^@v~3dUH|UO8P1>X z8_7sEGOX0AFUC~j;+dgBiUnh2?{8@R7Oq|J(y;gj6QPqy)Tg06z>nG3xef(}DG zDWjM$2;P0wNxr{hOe}ZcNMQLE0|$cqD}~VIlg$*@+|-@IkgsE?zl&(rJw+$w{Rwxf z@&$#+%3CAr@v2iNp6D(~L_0h2gfqp|d{;p>c#4$oOz^KTj^sHxIp~OQ_F(09!Od28 nnaMUFu=Ye%^*WaPLy@L0xd5v_0co -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#define MAXTIMINGS 100 - -//#define DEBUG - -#define DHT11 11 -#define DHT22 22 -#define AM2302 22 - -int readDHT(int type, int pin); - -int main(int argc, char **argv) -{ - if (!bcm2835_init()) - return 1; - - if (argc != 3) { - printf("usage: %s [11|22|2302] GPIOpin#\n", argv[0]); - printf("example: %s 2302 4 - Read from an AM2302 connected to GPIO #4\n", argv[0]); - return 2; - } - int type = 0; - if (strcmp(argv[1], "11") == 0) type = DHT11; - if (strcmp(argv[1], "22") == 0) type = DHT22; - if (strcmp(argv[1], "2302") == 0) type = AM2302; - if (type == 0) { - printf("Select 11, 22, 2302 as type!\n"); - return 3; - } - - int dhtpin = atoi(argv[2]); - - if (dhtpin <= 0) { - printf("Please select a valid GPIO pin #\n"); - return 3; - } - - - printf("Using pin #%d\n", dhtpin); - readDHT(type, dhtpin); - return 0; - -} // main - - -int bits[250], data[100]; -int bitidx = 0; - -int readDHT(int type, int pin) { - int counter = 0; - int laststate = HIGH; - int j=0; - - // Set GPIO pin to output - bcm2835_gpio_fsel(pin, BCM2835_GPIO_FSEL_OUTP); - - bcm2835_gpio_write(pin, HIGH); - usleep(500000); // 500 ms - bcm2835_gpio_write(pin, LOW); - usleep(20000); - - bcm2835_gpio_fsel(pin, BCM2835_GPIO_FSEL_INPT); - - data[0] = data[1] = data[2] = data[3] = data[4] = 0; - - // wait for pin to drop? - while (bcm2835_gpio_lev(pin) == 1) { - usleep(1); - } - - // read data! - for (int i=0; i< MAXTIMINGS; i++) { - counter = 0; - while ( bcm2835_gpio_lev(pin) == laststate) { - counter++; - //nanosleep(1); // overclocking might change this? - if (counter == 1000) - break; - } - laststate = bcm2835_gpio_lev(pin); - if (counter == 1000) break; -#ifdef DEBUG - bits[bitidx++] = counter; -#endif - - if ((i>3) && (i%2 == 0)) { - // shove each bit into the storage bytes - data[j/8] <<= 1; - if (counter > 200) - data[j/8] |= 1; - j++; - } - } - - -#ifdef DEBUG - for (int i=3; i 200); - } -#endif - - printf("Data (%d): 0x%x 0x%x 0x%x 0x%x 0x%x\n", j, data[0], data[1], data[2], data[3], data[4]); - - if ((j >= 39) && - (data[4] == ((data[0] + data[1] + data[2] + data[3]) & 0xFF)) ) { - // yay! - if (type == DHT11) - printf("Temp = %d *C, Hum = %d \%\n", data[2], data[0]); - if (type == DHT22) { - float f, h; - h = data[0] * 256 + data[1]; - h /= 10; - - f = (data[2] & 0x7F)* 256 + data[3]; - f /= 10.0; - if (data[2] & 0x80) f *= -1; - printf("Temp = %.1f *C, Hum = %.1f \%\n", f, h); - } - return 1; - } - - return 0; -} diff --git a/Adafruit_DHT_Driver/Adafruit_DHT_googledocs.ex.py b/Adafruit_DHT_Driver/Adafruit_DHT_googledocs.ex.py deleted file mode 100755 index 9c9f6318..00000000 --- a/Adafruit_DHT_Driver/Adafruit_DHT_googledocs.ex.py +++ /dev/null @@ -1,72 +0,0 @@ -#!/usr/bin/python - -import subprocess -import re -import sys -import time -import datetime -import gspread - -# =========================================================================== -# Google Account Details -# =========================================================================== - -# Account details for google docs -email = 'you@somewhere.com' -password = '$hhh!' -spreadsheet = 'SpreadsheetName' - -# =========================================================================== -# Example Code -# =========================================================================== - - -# Login with your Google account -try: - gc = gspread.login(email, password) -except: - print "Unable to log in. Check your email address/password" - sys.exit() - -# Open a worksheet from your spreadsheet using the filename -try: - worksheet = gc.open(spreadsheet).sheet1 - # Alternatively, open a spreadsheet using the spreadsheet's key - # worksheet = gc.open_by_key('0BmgG6nO_6dprdS1MN3d3MkdPa142WFRrdnRRUWl1UFE').sheet1 -except: - print "Unable to open the spreadsheet. Check your filename: %s" % spreadsheet - sys.exit() - -# Continuously append data -while(True): - # Run the DHT program to get the humidity and temperature readings! - - output = subprocess.check_output(["./Adafruit_DHT", "2302", "4"]); - print output - matches = re.search("Temp =\s+([0-9.]+)", output) - if (not matches): - time.sleep(3) - continue - temp = float(matches.group(1)) - - # search for humidity printout - matches = re.search("Hum =\s+([0-9.]+)", output) - if (not matches): - time.sleep(3) - continue - humidity = float(matches.group(1)) - - print "Temperature: %.1f C" % temp - print "Humidity: %.1f %%" % humidity - - # Append the data in the spreadsheet, including a timestamp - try: - values = [datetime.datetime.now(), temp, humidity] - worksheet.append_row(values) - except: - print "Unable to append data. Check your connection?" - sys.exit() - - # Wait 30 seconds before continuing - print "Wrote a row to %s" % spreadsheet - time.sleep(30) diff --git a/Adafruit_DHT_Driver/DEPRECATED.txt b/Adafruit_DHT_Driver/DEPRECATED.txt deleted file mode 100644 index 41c4538a..00000000 --- a/Adafruit_DHT_Driver/DEPRECATED.txt +++ /dev/null @@ -1,5 +0,0 @@ -This Adafruit_DHT_Driver code is deprecated and has been superseded by the Python library -at https://github.com/adafruit/Adafruit_Python_DHT You can see the new library's C code -for interfacing with the DHT sensors on either a Raspberry Pi or Beaglebone Black in the -source/Raspberry_Pi or source/Beaglebone_Black directory of the new library. See more -details on installing and using the library in the learning guide at: https://learn.adafruit.com/dht-humidity-sensing-on-raspberry-pi-with-gdocs-logging/overview diff --git a/Adafruit_DHT_Driver/Makefile b/Adafruit_DHT_Driver/Makefile deleted file mode 100644 index 5a91e391..00000000 --- a/Adafruit_DHT_Driver/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -CC = gcc -CFLAGS = -std=c99 -I. -lbcm2835 -DEPS = -OBJ = Adafruit_DHT.o - -%.o: %.c $(DEPS) - $(CC) -c -o $@ $< $(CFLAGS) - -Adafruit_DHT: $(OBJ) - gcc -o $@ $^ $(CFLAGS) diff --git a/Adafruit_DHT_Driver_Python/Adafruit_DHT.py b/Adafruit_DHT_Driver_Python/Adafruit_DHT.py deleted file mode 100644 index 69cd4a82..00000000 --- a/Adafruit_DHT_Driver_Python/Adafruit_DHT.py +++ /dev/null @@ -1,40 +0,0 @@ -#!/usr/bin/env python -# -*- coding:utf-8 -*- - -import sys -import dhtreader - -DHT11 = 11 -DHT22 = 22 -AM2302 = 22 - - -dhtreader.init() - -if len(sys.argv) != 3: - print("usage: {0} [11|22|2302] GPIOpin#".format(sys.argv[0])) - print("example: {0} 2302 Read from an AM2302 connected to GPIO #4".format(sys.argv[0])) - sys.exit(2) - -dev_type = None -if sys.argv[1] == "11": - dev_type = DHT11 -elif sys.argv[1] == "22": - dev_type = DHT22 -elif sys.argv[1] == "2302": - dev_type = AM2302 -else: - print("invalid type, only 11, 22 and 2302 are supported for now!") - sys.exit(3) - -dhtpin = int(sys.argv[2]) -if dhtpin <= 0: - print("invalid GPIO pin#") - sys.exit(3) - -print("using pin #{0}".format(dhtpin)) -t, h = dhtreader.read(dev_type, dhtpin) -if t and h: - print("Temp = {0} *C, Hum = {1} %".format(t, h)) -else: - print("Failed to read from sensor, maybe try again?") diff --git a/Adafruit_DHT_Driver_Python/DEPRECATED.txt b/Adafruit_DHT_Driver_Python/DEPRECATED.txt deleted file mode 100644 index 96dd74ec..00000000 --- a/Adafruit_DHT_Driver_Python/DEPRECATED.txt +++ /dev/null @@ -1,5 +0,0 @@ -This Adafruit_DHT_Driver_Python code is deprecated and has been superseded by the Python -library at https://github.com/adafruit/Adafruit_Python_DHT You can see the new library's C -code for interfacing with the DHT sensors on either a Raspberry Pi or Beaglebone Black in the -source/Raspberry_Pi or source/Beaglebone_Black directory of the new library. See more details -on installing and using the library in the learning guide at: https://learn.adafruit.com/dht-humidity-sensing-on-raspberry-pi-with-gdocs-logging/overview diff --git a/Adafruit_DHT_Driver_Python/README.md b/Adafruit_DHT_Driver_Python/README.md deleted file mode 100644 index d5e5828c..00000000 --- a/Adafruit_DHT_Driver_Python/README.md +++ /dev/null @@ -1,25 +0,0 @@ -Build dependencies for dhtreader python library - -* python-dev -* bcm2835 library: http://www.airspayce.com/mikem/bcm2835/ - -Run following command to build the library: -``` -python setup.py build -``` - -After that you should be able to find a dhtreader.so file inside `build` -directory. Put that library file in the same directory with your Python script, -then you are good to go. - -Usage example: - -```python -import dhtreader - -type = 22 -pin = 24 - -dhtreader.init() -print dhtreader.read(type, pin) -``` diff --git a/Adafruit_DHT_Driver_Python/dhtreader.c b/Adafruit_DHT_Driver_Python/dhtreader.c deleted file mode 100644 index 9856c138..00000000 --- a/Adafruit_DHT_Driver_Python/dhtreader.c +++ /dev/null @@ -1,179 +0,0 @@ -/* Python module for DHT temperature/humidity sensors - * - * Modified by Qingping Hou from DHT reader example, original header: - * - * How to access GPIO registers from C-code on the Raspberry-Pi - * Example program - * 15-January-2012 - * Dom and Gert - */ - - -/* for usleep */ -#define _BSD_SOURCE - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include - -#define MAXTIMINGS 100 - -//#define DEBUG - -#define DHT11 11 -#define DHT22 22 -#define AM2302 22 - -int readDHT(int type, int pin, float *temp_p, float *hum_p) -{ - int counter = 0; - int laststate = HIGH; - int i = 0; - int j = 0; - int checksum = 0; -#ifdef DEBUG - int bitidx = 0; - int bits[250]; -#endif - int data[100]; - - // Set GPIO pin to output - bcm2835_gpio_fsel(pin, BCM2835_GPIO_FSEL_OUTP); - - bcm2835_gpio_write(pin, HIGH); - usleep(500000); // 500 ms - bcm2835_gpio_write(pin, LOW); - usleep(20000); - - bcm2835_gpio_fsel(pin, BCM2835_GPIO_FSEL_INPT); - - data[0] = data[1] = data[2] = data[3] = data[4] = 0; - - // wait for pin to drop? - while (bcm2835_gpio_lev(pin) == 1) { - usleep(1); - } - - // read data! - for (i = 0; i < MAXTIMINGS; i++) { - counter = 0; - while ( bcm2835_gpio_lev(pin) == laststate) { - counter++; - //nanosleep(1); // overclocking might change this? - if (counter == 1000) - break; - } - laststate = bcm2835_gpio_lev(pin); - if (counter == 1000) break; -#ifdef DEBUG - bits[bitidx++] = counter; -#endif - - if ((i>3) && (i%2 == 0)) { - // shove each bit into the storage bytes - data[j/8] <<= 1; - if (counter > 200) - data[j/8] |= 1; - j++; - } - } - -#ifdef DEBUG - for (int i=3; i 200); - } - printf("Data (%d): 0x%x 0x%x 0x%x 0x%x 0x%x\n", j, data[0], data[1], data[2], data[3], data[4]); -#endif - - if (j >= 39) { - checksum = (data[0] + data[1] + data[2] + data[3]) & 0xFF; - if (data[4] == checksum) { - /* yay! checksum is valid */ - if (type == DHT11) { - /*printf("Temp = %d *C, Hum = %d \%\n", data[2], data[0]);*/ - *temp_p = (float)data[2]; - *hum_p = (float)data[0]; - } else if (type == DHT22) { - *hum_p = data[0] * 256 + data[1]; - *hum_p /= 10; - - *temp_p = (data[2] & 0x7F)* 256 + data[3]; - *temp_p /= 10.0; - if (data[2] & 0x80) - *temp_p *= -1; - /*printf("Temp = %.1f *C, Hum = %.1f \%\n", f, h);*/ - } - return 0; - } - return -2; - } - - return -1; -} - - -static PyObject * -dhtreader_init(PyObject *self, PyObject *args) -{ - return Py_BuildValue("i", bcm2835_init()); -} - -static PyObject * -dhtreader_read(PyObject *self, PyObject *args) -{ - int type, dhtpin; - - if (!PyArg_ParseTuple(args, "ii", &type, &dhtpin)) - return NULL; - - float t, h; - int re = readDHT(type, dhtpin, &t, &h); - - if (re == 0) { - return Py_BuildValue("(d,d)", t, h); - } else if (re == -1) { -#ifdef DEBUG - printf("sensor read failed! not enough data received\n"); -#endif - } else if (re == -2) { -#ifdef DEBUG - printf("sensor read failed! checksum failed!\n"); -#endif - } - - return Py_BuildValue(""); -} - - -static PyMethodDef DHTReaderMethods[] = { - {"init", dhtreader_init, METH_VARARGS, - "initialize dht reader"}, - {"read", dhtreader_read, METH_VARARGS, - "temperature and humidity from sensor"}, - {NULL, NULL, 0, NULL} /* Sentinel */ -}; - -PyMODINIT_FUNC -initdhtreader(void) -{ - PyObject *m; - - m = Py_InitModule("dhtreader", DHTReaderMethods); - if (m == NULL) - return; -} - - diff --git a/Adafruit_DHT_Driver_Python/setup.py b/Adafruit_DHT_Driver_Python/setup.py deleted file mode 100644 index 61d551ff..00000000 --- a/Adafruit_DHT_Driver_Python/setup.py +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env python -# -*- coding:utf-8 -*- - -from distutils.core import setup, Extension - -dht_mod = Extension('dhtreader', - include_dirs = ['.'], - libraries = ['bcm2835'], - sources = ['dhtreader.c']) - -setup (name = 'dhtreader', - version = '1.0', - description = 'Python library to interface with dht sensors', - ext_modules = [dht_mod]) diff --git a/Adafruit_I2C/Adafruit_I2C.py b/Adafruit_I2C/Adafruit_I2C.py deleted file mode 100755 index 2b24b67f..00000000 --- a/Adafruit_I2C/Adafruit_I2C.py +++ /dev/null @@ -1,161 +0,0 @@ -#!/usr/bin/python -import re -import smbus - -# =========================================================================== -# Adafruit_I2C Class -# =========================================================================== - -class Adafruit_I2C(object): - - @staticmethod - def getPiRevision(): - "Gets the version number of the Raspberry Pi board" - # Revision list available at: http://elinux.org/RPi_HardwareHistory#Board_Revision_History - try: - with open('/proc/cpuinfo', 'r') as infile: - for line in infile: - # Match a line of the form "Revision : 0002" while ignoring extra - # info in front of the revsion (like 1000 when the Pi was over-volted). - match = re.match('Revision\s+:\s+.*(\w{4})$', line) - if match and match.group(1) in ['0000', '0002', '0003']: - # Return revision 1 if revision ends with 0000, 0002 or 0003. - return 1 - elif match: - # Assume revision 2 if revision ends with any other 4 chars. - return 2 - # Couldn't find the revision, assume revision 0 like older code for compatibility. - return 0 - except: - return 0 - - @staticmethod - def getPiI2CBusNumber(): - # Gets the I2C bus number /dev/i2c# - return 1 if Adafruit_I2C.getPiRevision() > 1 else 0 - - def __init__(self, address, busnum=-1, debug=False): - self.address = address - # By default, the correct I2C bus is auto-detected using /proc/cpuinfo - # Alternatively, you can hard-code the bus version below: - # self.bus = smbus.SMBus(0); # Force I2C0 (early 256MB Pi's) - # self.bus = smbus.SMBus(1); # Force I2C1 (512MB Pi's) - self.bus = smbus.SMBus(busnum if busnum >= 0 else Adafruit_I2C.getPiI2CBusNumber()) - self.debug = debug - - def reverseByteOrder(self, data): - "Reverses the byte order of an int (16-bit) or long (32-bit) value" - # Courtesy Vishal Sapre - byteCount = len(hex(data)[2:].replace('L','')[::2]) - val = 0 - for i in range(byteCount): - val = (val << 8) | (data & 0xff) - data >>= 8 - return val - - def errMsg(self): - print "Error accessing 0x%02X: Check your I2C address" % self.address - return -1 - - def write8(self, reg, value): - "Writes an 8-bit value to the specified register/address" - try: - self.bus.write_byte_data(self.address, reg, value) - if self.debug: - print "I2C: Wrote 0x%02X to register 0x%02X" % (value, reg) - except IOError, err: - return self.errMsg() - - def write16(self, reg, value): - "Writes a 16-bit value to the specified register/address pair" - try: - self.bus.write_word_data(self.address, reg, value) - if self.debug: - print ("I2C: Wrote 0x%02X to register pair 0x%02X,0x%02X" % - (value, reg, reg+1)) - except IOError, err: - return self.errMsg() - - def writeRaw8(self, value): - "Writes an 8-bit value on the bus" - try: - self.bus.write_byte(self.address, value) - if self.debug: - print "I2C: Wrote 0x%02X" % value - except IOError, err: - return self.errMsg() - - def writeList(self, reg, list): - "Writes an array of bytes using I2C format" - try: - if self.debug: - print "I2C: Writing list to register 0x%02X:" % reg - print list - self.bus.write_i2c_block_data(self.address, reg, list) - except IOError, err: - return self.errMsg() - - def readList(self, reg, length): - "Read a list of bytes from the I2C device" - try: - results = self.bus.read_i2c_block_data(self.address, reg, length) - if self.debug: - print ("I2C: Device 0x%02X returned the following from reg 0x%02X" % - (self.address, reg)) - print results - return results - except IOError, err: - return self.errMsg() - - def readU8(self, reg): - "Read an unsigned byte from the I2C device" - try: - result = self.bus.read_byte_data(self.address, reg) - if self.debug: - print ("I2C: Device 0x%02X returned 0x%02X from reg 0x%02X" % - (self.address, result & 0xFF, reg)) - return result - except IOError, err: - return self.errMsg() - - def readS8(self, reg): - "Reads a signed byte from the I2C device" - try: - result = self.bus.read_byte_data(self.address, reg) - if result > 127: result -= 256 - if self.debug: - print ("I2C: Device 0x%02X returned 0x%02X from reg 0x%02X" % - (self.address, result & 0xFF, reg)) - return result - except IOError, err: - return self.errMsg() - - def readU16(self, reg, little_endian=True): - "Reads an unsigned 16-bit value from the I2C device" - try: - result = self.bus.read_word_data(self.address,reg) - # Swap bytes if using big endian because read_word_data assumes little - # endian on ARM (little endian) systems. - if not little_endian: - result = ((result << 8) & 0xFF00) + (result >> 8) - if (self.debug): - print "I2C: Device 0x%02X returned 0x%04X from reg 0x%02X" % (self.address, result & 0xFFFF, reg) - return result - except IOError, err: - return self.errMsg() - - def readS16(self, reg, little_endian=True): - "Reads a signed 16-bit value from the I2C device" - try: - result = self.readU16(reg,little_endian) - if result > 32767: result -= 65536 - return result - except IOError, err: - return self.errMsg() - -if __name__ == '__main__': - try: - bus = Adafruit_I2C(address=0) - print "Default I2C bus is accessible" - except: - print "Error accessing default I2C bus" diff --git a/Adafruit_LEDBackpack/Adafruit_7Segment.py b/Adafruit_LEDBackpack/Adafruit_7Segment.py deleted file mode 100644 index f5965404..00000000 --- a/Adafruit_LEDBackpack/Adafruit_7Segment.py +++ /dev/null @@ -1,52 +0,0 @@ -#!/usr/bin/python - -import time -import datetime -from Adafruit_LEDBackpack import LEDBackpack - -# =========================================================================== -# 7-Segment Display -# =========================================================================== - -# This class is meant to be used with the four-character, seven segment -# displays available from Adafruit - -class SevenSegment: - disp = None - - # Hexadecimal character lookup table (row 1 = 0..9, row 2 = A..F) - digits = [ 0x3F, 0x06, 0x5B, 0x4F, 0x66, 0x6D, 0x7D, 0x07, 0x7F, 0x6F, \ - 0x77, 0x7C, 0x39, 0x5E, 0x79, 0x71 ] - - # Constructor - def __init__(self, address=0x70, debug=False): - if (debug): - print "Initializing a new instance of LEDBackpack at 0x%02X" % address - self.disp = LEDBackpack(address=address, debug=debug) - - def writeDigitRaw(self, charNumber, value): - "Sets a digit using the raw 16-bit value" - if (charNumber > 7): - return - # Set the appropriate digit - self.disp.setBufferRow(charNumber, value) - - def writeDigit(self, charNumber, value, dot=False): - "Sets a single decimal or hexademical value (0..9 and A..F)" - if (charNumber > 7): - return - if (value > 0xF): - return - # Set the appropriate digit - self.disp.setBufferRow(charNumber, self.digits[value] | (dot << 7)) - - def setColon(self, state=True): - "Enables or disables the colon character" - # Warning: This function assumes that the colon is character '2', - # which is the case on 4 char displays, but may need to be modified - # if another display type is used - if (state): - self.disp.setBufferRow(2, 0xFFFF) - else: - self.disp.setBufferRow(2, 0) - diff --git a/Adafruit_LEDBackpack/Adafruit_8x8.py b/Adafruit_LEDBackpack/Adafruit_8x8.py deleted file mode 100644 index df966dc9..00000000 --- a/Adafruit_LEDBackpack/Adafruit_8x8.py +++ /dev/null @@ -1,75 +0,0 @@ -#!/usr/bin/python - -import time -import datetime -from Adafruit_LEDBackpack import LEDBackpack - -# =========================================================================== -# 8x8 Pixel Display -# =========================================================================== - -class EightByEight: - disp = None - - # Constructor - def __init__(self, address=0x70, debug=False): - if (debug): - print "Initializing a new instance of LEDBackpack at 0x%02X" % address - self.disp = LEDBackpack(address=address, debug=debug) - - def writeRowRaw(self, charNumber, value): - "Sets a row of pixels using a raw 16-bit value" - if (charNumber > 7): - return - # Set the appropriate row - self.disp.setBufferRow(charNumber, value) - - def clearPixel(self, x, y): - "A wrapper function to clear pixels (purely cosmetic)" - self.setPixel(x, y, 0) - - def setPixel(self, x, y, color=1): - "Sets a single pixel" - if (x >= 8): - return - if (y >= 8): - return - x += 7 # ATTN: This might be a bug? On the color matrix, this causes x=0 to draw on the last line instead of the first. - x %= 8 - # Set the appropriate pixel - buffer = self.disp.getBuffer() - if (color): - self.disp.setBufferRow(y, buffer[y] | 1 << x) - else: - self.disp.setBufferRow(y, buffer[y] & ~(1 << x)) - - def clear(self): - "Clears the entire display" - self.disp.clear() - -class ColorEightByEight(EightByEight): - def setPixel(self, x, y, color=1): - "Sets a single pixel" - if (x >= 8): - return - if (y >= 8): - return - - x %= 8 - - # Set the appropriate pixel - buffer = self.disp.getBuffer() - - # TODO : Named color constants? - # ATNN : This code was mostly taken from the arduino code, but with the addition of clearing the other bit when setting red or green. - # The arduino code does not do that, and might have the bug where if you draw red or green, then the other color, it actually draws yellow. - # The bug doesn't show up in the examples because it's always clearing. - - if (color == 1): - self.disp.setBufferRow(y, (buffer[y] | (1 << x)) & ~(1 << (x+8)) ) - elif (color == 2): - self.disp.setBufferRow(y, (buffer[y] | 1 << (x+8)) & ~(1 << x) ) - elif (color == 3): - self.disp.setBufferRow(y, buffer[y] | (1 << (x+8)) | (1 << x) ) - else: - self.disp.setBufferRow(y, buffer[y] & ~(1 << x) & ~(1 << (x+8)) ) diff --git a/Adafruit_LEDBackpack/Adafruit_Bargraph.py b/Adafruit_LEDBackpack/Adafruit_Bargraph.py deleted file mode 100644 index 804991fa..00000000 --- a/Adafruit_LEDBackpack/Adafruit_Bargraph.py +++ /dev/null @@ -1,55 +0,0 @@ -#!/usr/bin/python - -import time -import datetime -from Adafruit_LEDBackpack import LEDBackpack - -# =========================================================================== -# Bargraph Display -# =========================================================================== - -# This class is meant to be used with the 24-LED bicolor bargraph -# displays available from Adafruit - -class Bargraph: - disp = None - - LED_OFF = 0 - LED_RED = 1 - LED_GREEN = 2 - LED_YELLOW = 3 - - # Constructor - def __init__(self, address=0x70, debug=False): - self.debug = debug - - if self.debug: - print "Initializing a new instance of LEDBackpack at 0x%02X" % address - self.disp = LEDBackpack(address=address, debug=debug) - - def setLed(self, bar, color): - if bar > 24: - return - if color > 3: - return - - if bar < 12: - c = bar / 4 - else: - c = (bar - 12) / 4 - - a = bar % 4; - if bar >= 12: - a += 4; - - if self.debug: - print "Ano = %d Cath %d" % (a, c) - - bufRow = self.disp.getBufferRow(c) & ~((1 << a) | (1 << (a+8))) # turn off the LED - - if color == self.LED_RED: - self.disp.setBufferRow(c, bufRow | (1 << a)) - elif color == self.LED_YELLOW: - self.disp.setBufferRow(c, bufRow | (1 << a) | (1 << (a+8))) - elif color == self.LED_GREEN: - self.disp.setBufferRow(c, bufRow | 1 << (a+8)) diff --git a/Adafruit_LEDBackpack/Adafruit_I2C.py b/Adafruit_LEDBackpack/Adafruit_I2C.py deleted file mode 120000 index 77f06164..00000000 --- a/Adafruit_LEDBackpack/Adafruit_I2C.py +++ /dev/null @@ -1 +0,0 @@ -../Adafruit_I2C/Adafruit_I2C.py \ No newline at end of file diff --git a/Adafruit_LEDBackpack/Adafruit_LEDBackpack.py b/Adafruit_LEDBackpack/Adafruit_LEDBackpack.py deleted file mode 100644 index 00d7ba6c..00000000 --- a/Adafruit_LEDBackpack/Adafruit_LEDBackpack.py +++ /dev/null @@ -1,101 +0,0 @@ -#!/usr/bin/python - -import time -from copy import copy -from Adafruit_I2C import Adafruit_I2C - -# ============================================================================ -# LEDBackpack Class -# ============================================================================ - -class LEDBackpack: - i2c = None - - # Registers - __HT16K33_REGISTER_DISPLAY_SETUP = 0x80 - __HT16K33_REGISTER_SYSTEM_SETUP = 0x20 - __HT16K33_REGISTER_DIMMING = 0xE0 - - # Data base addresses - __HT16K33_ADDRESS_KEY_DATA = 0x40 - - # Blink rate - __HT16K33_BLINKRATE_OFF = 0x00 - __HT16K33_BLINKRATE_2HZ = 0x01 - __HT16K33_BLINKRATE_1HZ = 0x02 - __HT16K33_BLINKRATE_HALFHZ = 0x03 - - # Display buffer (8x16-bits) - __buffer = [0x0000, 0x0000, 0x0000, 0x0000, \ - 0x0000, 0x0000, 0x0000, 0x0000 ] - - # Constructor - def __init__(self, address=0x70, debug=False): - self.i2c = Adafruit_I2C(address) - self.address = address - self.debug = debug - - # Turn the oscillator on - self.i2c.write8(self.__HT16K33_REGISTER_SYSTEM_SETUP | 0x01, 0x00) - - # Turn blink off - self.setBlinkRate(self.__HT16K33_BLINKRATE_OFF) - - # Set maximum brightness - self.setBrightness(15) - - # Clear the screen - self.clear() - - def setBrightness(self, brightness): - "Sets the brightness level from 0..15" - if (brightness > 15): - brightness = 15 - self.i2c.write8(self.__HT16K33_REGISTER_DIMMING | brightness, 0x00) - - def setBlinkRate(self, blinkRate): - "Sets the blink rate" - if (blinkRate > self.__HT16K33_BLINKRATE_HALFHZ): - blinkRate = self.__HT16K33_BLINKRATE_OFF - self.i2c.write8(self.__HT16K33_REGISTER_DISPLAY_SETUP | 0x01 | (blinkRate << 1), 0x00) - - def setBufferRow(self, row, value, update=True): - "Updates a single 16-bit entry in the 8*16-bit buffer" - if (row > 7): - return # Prevent buffer overflow - self.__buffer[row] = value # value # & 0xFFFF - if (update): - self.writeDisplay() # Update the display - - def getBufferRow(self, row): - "Returns a single 16-bit entry in the 8*16-bit buffer" - if (row > 7): - return - return self.__buffer[row] - - def getBuffer(self): - "Returns a copy of the raw buffer contents" - bufferCopy = copy(self.__buffer) - return bufferCopy - - def writeDisplay(self): - "Updates the display memory" - bytes = [] - for item in self.__buffer: - bytes.append(item & 0xFF) - bytes.append((item >> 8) & 0xFF) - self.i2c.writeList(0x00, bytes) - - def getKeys(self, row): - "Returns a row of scanned key press values as a single 13-bit value (K13:K1)" - if (row > 2): - return - return self.i2c.readU16(self.__HT16K33_ADDRESS_KEY_DATA + row*2) - - def clear(self, update=True): - "Clears the display memory" - self.__buffer = [ 0, 0, 0, 0, 0, 0, 0, 0 ] - if (update): - self.writeDisplay() - -led = LEDBackpack(0x70) diff --git a/Adafruit_LEDBackpack/ex_7segment_clock.py b/Adafruit_LEDBackpack/ex_7segment_clock.py deleted file mode 100644 index 51aee185..00000000 --- a/Adafruit_LEDBackpack/ex_7segment_clock.py +++ /dev/null @@ -1,29 +0,0 @@ -#!/usr/bin/python - -import time -import datetime -from Adafruit_7Segment import SevenSegment - -# =========================================================================== -# Clock Example -# =========================================================================== -segment = SevenSegment(address=0x70) - -print "Press CTRL+Z to exit" - -# Continually update the time on a 4 char, 7-segment display -while(True): - now = datetime.datetime.now() - hour = now.hour - minute = now.minute - second = now.second - # Set hours - segment.writeDigit(0, int(hour / 10)) # Tens - segment.writeDigit(1, hour % 10) # Ones - # Set minutes - segment.writeDigit(3, int(minute / 10)) # Tens - segment.writeDigit(4, minute % 10) # Ones - # Toggle colon - segment.setColon(second % 2) # Toggle colon at 1Hz - # Wait a quarter second (less than 1 second to prevent colon blinking getting in phase with odd/even seconds). - time.sleep(0.25) diff --git a/Adafruit_LEDBackpack/ex_8x8_color_pixels.py b/Adafruit_LEDBackpack/ex_8x8_color_pixels.py deleted file mode 100644 index 978db826..00000000 --- a/Adafruit_LEDBackpack/ex_8x8_color_pixels.py +++ /dev/null @@ -1,23 +0,0 @@ -#!/usr/bin/python - -import time -import datetime -from Adafruit_8x8 import ColorEightByEight - -# =========================================================================== -# 8x8 Pixel Example -# =========================================================================== -grid = ColorEightByEight(address=0x70) - -print "Press CTRL+Z to exit" - -iter = 0 - -# Continually update the 8x8 display one pixel at a time -while(True): - iter += 1 - - for x in range(0, 8): - for y in range(0, 8): - grid.setPixel(x, y, iter % 4 ) - time.sleep(0.02) diff --git a/Adafruit_LEDBackpack/ex_8x8_pixels.py b/Adafruit_LEDBackpack/ex_8x8_pixels.py deleted file mode 100644 index 4a396ee3..00000000 --- a/Adafruit_LEDBackpack/ex_8x8_pixels.py +++ /dev/null @@ -1,22 +0,0 @@ -#!/usr/bin/python - -import time -import datetime -from Adafruit_8x8 import EightByEight - -# =========================================================================== -# 8x8 Pixel Example -# =========================================================================== -grid = EightByEight(address=0x70) - -print "Press CTRL+Z to exit" - -# Continually update the 8x8 display one pixel at a time -while(True): - for x in range(0, 8): - for y in range(0, 8): - grid.setPixel(x, y) - time.sleep(0.05) - time.sleep(0.5) - grid.clear() - time.sleep(0.5) diff --git a/Adafruit_LEDBackpack/ex_bargraph.py b/Adafruit_LEDBackpack/ex_bargraph.py deleted file mode 100644 index 1fa0a31e..00000000 --- a/Adafruit_LEDBackpack/ex_bargraph.py +++ /dev/null @@ -1,19 +0,0 @@ -#!/usr/bin/python - -import time -import datetime -from Adafruit_Bargraph import Bargraph - -# =========================================================================== -# Scroll through colors example -# =========================================================================== -bargraph = Bargraph(address=0x70) - -print "Press CTRL+C to exit" - -while(True): - for color in range(1, 4): - for i in range(24): - print i - bargraph.setLed(i, color) - time.sleep(0.05) diff --git a/Adafruit_LEDpixels/Adafruit_LEDpixels.py b/Adafruit_LEDpixels/Adafruit_LEDpixels.py deleted file mode 100644 index 07e1a953..00000000 --- a/Adafruit_LEDpixels/Adafruit_LEDpixels.py +++ /dev/null @@ -1,81 +0,0 @@ -#!/usr/bin/env python - -# Test code for Adafruit LED Pixels, uses hardware SPI - -import RPi.GPIO as GPIO, time, os - -DEBUG = 1 -GPIO.setmode(GPIO.BCM) - -def slowspiwrite(clockpin, datapin, byteout): - GPIO.setup(clockpin, GPIO.OUT) - GPIO.setup(datapin, GPIO.OUT) - for i in range(8): - if (byteout & 0x80): - GPIO.output(datapin, True) - else: - GPIO.output(clockpin, False) - byteout <<= 1 - GPIO.output(clockpin, True) - GPIO.output(clockpin, False) - - -SPICLK = 18 -SPIDO = 17 - -ledpixels = [0] * 25 - -def writestrip(pixels): - spidev = file("/dev/spidev0.0", "w") - for i in range(len(pixels)): - spidev.write(chr((pixels[i]>>16) & 0xFF)) - spidev.write(chr((pixels[i]>>8) & 0xFF)) - spidev.write(chr(pixels[i] & 0xFF)) - spidev.close() - time.sleep(0.002) - -def Color(r, g, b): - return ((r & 0xFF) << 16) | ((g & 0xFF) << 8) | (b & 0xFF) - -def setpixelcolor(pixels, n, r, g, b): - if (n >= len(pixels)): - return - pixels[n] = Color(r,g,b) - -def setpixelcolor(pixels, n, c): - if (n >= len(pixels)): - return - pixels[n] = c - -def colorwipe(pixels, c, delay): - for i in range(len(pixels)): - setpixelcolor(pixels, i, c) - writestrip(pixels) - time.sleep(delay) - -def Wheel(WheelPos): - if (WheelPos < 85): - return Color(WheelPos * 3, 255 - WheelPos * 3, 0) - elif (WheelPos < 170): - WheelPos -= 85; - return Color(255 - WheelPos * 3, 0, WheelPos * 3) - else: - WheelPos -= 170; - return Color(0, WheelPos * 3, 255 - WheelPos * 3) - -def rainbowCycle(pixels, wait): - for j in range(256): # one cycle of all 256 colors in the wheel - for i in range(len(pixels)): -# tricky math! we use each pixel as a fraction of the full 96-color wheel -# (thats the i / strip.numPixels() part) -# Then add in j which makes the colors go around per pixel -# the % 96 is to make the wheel cycle around - setpixelcolor(pixels, i, Wheel( ((i * 256 / len(pixels)) + j) % 256) ) - writestrip(pixels) - time.sleep(wait) - -colorwipe(ledpixels, Color(255, 0, 0), 0.05) -colorwipe(ledpixels, Color(0, 255, 0), 0.05) -colorwipe(ledpixels, Color(0, 0, 255), 0.05) -while True: - rainbowCycle(ledpixels, 0.00) diff --git a/Adafruit_LSM303/Adafruit_I2C.py b/Adafruit_LSM303/Adafruit_I2C.py deleted file mode 120000 index 77f06164..00000000 --- a/Adafruit_LSM303/Adafruit_I2C.py +++ /dev/null @@ -1 +0,0 @@ -../Adafruit_I2C/Adafruit_I2C.py \ No newline at end of file diff --git a/Adafruit_LSM303/Adafruit_LSM303.py b/Adafruit_LSM303/Adafruit_LSM303.py deleted file mode 100755 index 9af1e83a..00000000 --- a/Adafruit_LSM303/Adafruit_LSM303.py +++ /dev/null @@ -1,122 +0,0 @@ -#!/usr/bin/python - -# Python library for Adafruit Flora Accelerometer/Compass Sensor (LSM303). -# This is pretty much a direct port of the current Arduino library and is -# similarly incomplete (e.g. no orientation value returned from read() -# method). This does add optional high resolution mode to accelerometer -# though. - -# Copyright 2013 Adafruit Industries - -# Permission is hereby granted, free of charge, to any person obtaining a -# copy of this software and associated documentation files (the "Software"), -# to deal in the Software without restriction, including without limitation -# the rights to use, copy, modify, merge, publish, distribute, sublicense, -# and/or sell copies of the Software, and to permit persons to whom the -# Software is furnished to do so, subject to the following conditions: - -# The above copyright notice and this permission notice shall be included -# in all copies or substantial portions of the Software. - -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION 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 Adafruit_I2C import Adafruit_I2C - - -class Adafruit_LSM303(Adafruit_I2C): - - # Minimal constants carried over from Arduino library - LSM303_ADDRESS_ACCEL = (0x32 >> 1) # 0011001x - LSM303_ADDRESS_MAG = (0x3C >> 1) # 0011110x - # Default Type - LSM303_REGISTER_ACCEL_CTRL_REG1_A = 0x20 # 00000111 rw - LSM303_REGISTER_ACCEL_CTRL_REG4_A = 0x23 # 00000000 rw - LSM303_REGISTER_ACCEL_OUT_X_L_A = 0x28 - LSM303_REGISTER_MAG_CRB_REG_M = 0x01 - LSM303_REGISTER_MAG_MR_REG_M = 0x02 - LSM303_REGISTER_MAG_OUT_X_H_M = 0x03 - - # Gain settings for setMagGain() - LSM303_MAGGAIN_1_3 = 0x20 # +/- 1.3 - LSM303_MAGGAIN_1_9 = 0x40 # +/- 1.9 - LSM303_MAGGAIN_2_5 = 0x60 # +/- 2.5 - LSM303_MAGGAIN_4_0 = 0x80 # +/- 4.0 - LSM303_MAGGAIN_4_7 = 0xA0 # +/- 4.7 - LSM303_MAGGAIN_5_6 = 0xC0 # +/- 5.6 - LSM303_MAGGAIN_8_1 = 0xE0 # +/- 8.1 - - - def __init__(self, busnum=-1, debug=False, hires=False): - - # Accelerometer and magnetometer are at different I2C - # addresses, so invoke a separate I2C instance for each - self.accel = Adafruit_I2C(self.LSM303_ADDRESS_ACCEL, busnum, debug) - self.mag = Adafruit_I2C(self.LSM303_ADDRESS_MAG , busnum, debug) - - # Enable the accelerometer - self.accel.write8(self.LSM303_REGISTER_ACCEL_CTRL_REG1_A, 0x27) - # Select hi-res (12-bit) or low-res (10-bit) output mode. - # Low-res mode uses less power and sustains a higher update rate, - # output is padded to compatible 12-bit units. - if hires: - self.accel.write8(self.LSM303_REGISTER_ACCEL_CTRL_REG4_A, - 0b00001000) - else: - self.accel.write8(self.LSM303_REGISTER_ACCEL_CTRL_REG4_A, 0) - - # Enable the magnetometer - self.mag.write8(self.LSM303_REGISTER_MAG_MR_REG_M, 0x00) - - - # Interpret signed 12-bit acceleration component from list - def accel12(self, list, idx): - n = list[idx] | (list[idx+1] << 8) # Low, high bytes - if n > 32767: n -= 65536 # 2's complement signed - return n >> 4 # 12-bit resolution - - - # Interpret signed 16-bit magnetometer component from list - def mag16(self, list, idx): - n = (list[idx] << 8) | list[idx+1] # High, low bytes - return n if n < 32768 else n - 65536 # 2's complement signed - - - def read(self): - # Read the accelerometer - list = self.accel.readList( - self.LSM303_REGISTER_ACCEL_OUT_X_L_A | 0x80, 6) - res = [( self.accel12(list, 0), - self.accel12(list, 2), - self.accel12(list, 4) )] - - # Read the magnetometer - list = self.mag.readList(self.LSM303_REGISTER_MAG_OUT_X_H_M, 6) - res.append((self.mag16(list, 0), - self.mag16(list, 2), - self.mag16(list, 4), - 0.0 )) # ToDo: Calculate orientation - - return res - - - def setMagGain(gain=LSM303_MAGGAIN_1_3): - self.mag.write8( LSM303_REGISTER_MAG_CRB_REG_M, gain) - - -# Simple example prints accel/mag data once per second: -if __name__ == '__main__': - - from time import sleep - - lsm = Adafruit_LSM303() - - print '[(Accelerometer X, Y, Z), (Magnetometer X, Y, Z, orientation)]' - while True: - print lsm.read() - sleep(1) # Output is fun to watch if this is commented out diff --git a/Adafruit_MCP230xx/Adafruit_I2C.py b/Adafruit_MCP230xx/Adafruit_I2C.py deleted file mode 120000 index 77f06164..00000000 --- a/Adafruit_MCP230xx/Adafruit_I2C.py +++ /dev/null @@ -1 +0,0 @@ -../Adafruit_I2C/Adafruit_I2C.py \ No newline at end of file diff --git a/Adafruit_MCP230xx/Adafruit_MCP230xx.py b/Adafruit_MCP230xx/Adafruit_MCP230xx.py deleted file mode 100755 index dc1b9c27..00000000 --- a/Adafruit_MCP230xx/Adafruit_MCP230xx.py +++ /dev/null @@ -1,204 +0,0 @@ -#!/usr/bin/python - -# Copyright 2012 Daniel Berlin (with some changes by Adafruit Industries/Limor Fried) -# -# Permission is hereby granted, free of charge, to any person obtaining a copy of -# this software and associated documentation files (the "Software"), to deal MCP230XX_GPIO(1, 0xin -# the Software without restriction, including without limitation the rights to -# use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies -# of the Software, and to permit persons to whom the Software is furnished to do -# so, subject to the following conditions: - -# The above copyright notice and this permission notice shall be included in all -# copies or substantial portions of the Software. - -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION 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 Adafruit_I2C import Adafruit_I2C -import smbus -import time - -MCP23017_IODIRA = 0x00 -MCP23017_IODIRB = 0x01 -MCP23017_GPIOA = 0x12 -MCP23017_GPIOB = 0x13 -MCP23017_GPPUA = 0x0C -MCP23017_GPPUB = 0x0D -MCP23017_OLATA = 0x14 -MCP23017_OLATB = 0x15 -MCP23008_GPIOA = 0x09 -MCP23008_GPPUA = 0x06 -MCP23008_OLATA = 0x0A - -class Adafruit_MCP230XX(object): - OUTPUT = 0 - INPUT = 1 - - def __init__(self, address, num_gpios, busnum=-1): - assert num_gpios >= 0 and num_gpios <= 16, "Number of GPIOs must be between 0 and 16" - self.i2c = Adafruit_I2C(address=address, busnum=busnum) - self.address = address - self.num_gpios = num_gpios - - # set defaults - if num_gpios <= 8: - self.i2c.write8(MCP23017_IODIRA, 0xFF) # all inputs on port A - self.direction = self.i2c.readU8(MCP23017_IODIRA) - self.i2c.write8(MCP23008_GPPUA, 0x00) - elif num_gpios > 8 and num_gpios <= 16: - self.i2c.write8(MCP23017_IODIRA, 0xFF) # all inputs on port A - self.i2c.write8(MCP23017_IODIRB, 0xFF) # all inputs on port B - self.direction = self.i2c.readU8(MCP23017_IODIRA) - self.direction |= self.i2c.readU8(MCP23017_IODIRB) << 8 - self.i2c.write8(MCP23017_GPPUA, 0x00) - self.i2c.write8(MCP23017_GPPUB, 0x00) - - def _changebit(self, bitmap, bit, value): - assert value == 1 or value == 0, "Value is %s must be 1 or 0" % value - if value == 0: - return bitmap & ~(1 << bit) - elif value == 1: - return bitmap | (1 << bit) - - def _readandchangepin(self, port, pin, value, currvalue = None): - assert pin >= 0 and pin < self.num_gpios, "Pin number %s is invalid, only 0-%s are valid" % (pin, self.num_gpios) - #assert self.direction & (1 << pin) == 0, "Pin %s not set to output" % pin - if not currvalue: - currvalue = self.i2c.readU8(port) - newvalue = self._changebit(currvalue, pin, value) - self.i2c.write8(port, newvalue) - return newvalue - - - def pullup(self, pin, value): - if self.num_gpios <= 8: - return self._readandchangepin(MCP23008_GPPUA, pin, value) - if self.num_gpios <= 16: - lvalue = self._readandchangepin(MCP23017_GPPUA, pin, value) - if (pin < 8): - return - else: - return self._readandchangepin(MCP23017_GPPUB, pin-8, value) << 8 - - # Set pin to either input or output mode - def config(self, pin, mode): - if self.num_gpios <= 8: - self.direction = self._readandchangepin(MCP23017_IODIRA, pin, mode) - if self.num_gpios <= 16: - if (pin < 8): - self.direction = self._readandchangepin(MCP23017_IODIRA, pin, mode) - else: - self.direction |= self._readandchangepin(MCP23017_IODIRB, pin-8, mode) << 8 - - return self.direction - - def output(self, pin, value): - # assert self.direction & (1 << pin) == 0, "Pin %s not set to output" % pin - if self.num_gpios <= 8: - self.outputvalue = self._readandchangepin(MCP23008_GPIOA, pin, value, self.i2c.readU8(MCP23008_OLATA)) - if self.num_gpios <= 16: - if (pin < 8): - self.outputvalue = self._readandchangepin(MCP23017_GPIOA, pin, value, self.i2c.readU8(MCP23017_OLATA)) - else: - self.outputvalue = self._readandchangepin(MCP23017_GPIOB, pin-8, value, self.i2c.readU8(MCP23017_OLATB)) << 8 - - return self.outputvalue - - - self.outputvalue = self._readandchangepin(MCP23017_IODIRA, pin, value, self.outputvalue) - return self.outputvalue - - def input(self, pin): - assert pin >= 0 and pin < self.num_gpios, "Pin number %s is invalid, only 0-%s are valid" % (pin, self.num_gpios) - assert self.direction & (1 << pin) != 0, "Pin %s not set to input" % pin - if self.num_gpios <= 8: - value = self.i2c.readU8(MCP23008_GPIOA) - elif self.num_gpios > 8 and self.num_gpios <= 16: - value = self.i2c.readU8(MCP23017_GPIOA) - value |= self.i2c.readU8(MCP23017_GPIOB) << 8 - return value & (1 << pin) - - def readU8(self): - result = self.i2c.readU8(MCP23008_OLATA) - return(result) - - def readS8(self): - result = self.i2c.readU8(MCP23008_OLATA) - if (result > 127): result -= 256 - return result - - def readU16(self): - assert self.num_gpios >= 16, "16bits required" - lo = self.i2c.readU8(MCP23017_OLATA) - hi = self.i2c.readU8(MCP23017_OLATB) - return((hi << 8) | lo) - - def readS16(self): - assert self.num_gpios >= 16, "16bits required" - lo = self.i2c.readU8(MCP23017_OLATA) - hi = self.i2c.readU8(MCP23017_OLATB) - if (hi > 127): hi -= 256 - return((hi << 8) | lo) - - def write8(self, value): - self.i2c.write8(MCP23008_OLATA, value) - - def write16(self, value): - assert self.num_gpios >= 16, "16bits required" - self.i2c.write8(MCP23017_OLATA, value & 0xFF) - self.i2c.write8(MCP23017_OLATB, (value >> 8) & 0xFF) - -# RPi.GPIO compatible interface for MCP23017 and MCP23008 - -class MCP230XX_GPIO(object): - OUT = 0 - IN = 1 - BCM = 0 - BOARD = 0 - def __init__(self, busnum, address, num_gpios): - self.chip = Adafruit_MCP230XX(address, num_gpios, busnum) - def setmode(self, mode): - # do nothing - pass - def setup(self, pin, mode): - self.chip.config(pin, mode) - def input(self, pin): - return self.chip.input(pin) - def output(self, pin, value): - self.chip.output(pin, value) - def pullup(self, pin, value): - self.chip.pullup(pin, value) - - -if __name__ == '__main__': - # *************************************************** - # Set num_gpios to 8 for MCP23008 or 16 for MCP23017! - # *************************************************** - mcp = Adafruit_MCP230XX(address = 0x20, num_gpios = 8) # MCP23008 - # mcp = Adafruit_MCP230XX(address = 0x20, num_gpios = 16) # MCP23017 - - # Set pins 0, 1 and 2 to output (you can set pins 0..15 this way) - mcp.config(0, mcp.OUTPUT) - mcp.config(1, mcp.OUTPUT) - mcp.config(2, mcp.OUTPUT) - - # Set pin 3 to input with the pullup resistor enabled - mcp.config(3, mcp.INPUT) - mcp.pullup(3, 1) - - # Read input pin and display the results - print "Pin 3 = %d" % (mcp.input(3) >> 3) - - # Python speed test on output 0 toggling at max speed - print "Starting blinky on pin 0 (CTRL+C to quit)" - while (True): - mcp.output(0, 1) # Pin 0 High - time.sleep(1); - mcp.output(0, 0) # Pin 0 Low - time.sleep(1); diff --git a/Adafruit_MCP3002/MCP3002.py b/Adafruit_MCP3002/MCP3002.py deleted file mode 100644 index 5b0b68b5..00000000 --- a/Adafruit_MCP3002/MCP3002.py +++ /dev/null @@ -1,94 +0,0 @@ -#!/usr/bin/env python - -# just some bitbang code for testing both channels - -import RPi.GPIO as GPIO, time, os - -DEBUG = 1 -GPIO.setmode(GPIO.BCM) - -# this function is not used, its for future reference! -def slowspiwrite(clockpin, datapin, byteout): - GPIO.setup(clockpin, GPIO.OUT) - GPIO.setup(datapin, GPIO.OUT) - for i in range(8): - if (byteout & 0x80): - GPIO.output(datapin, True) - else: - GPIO.output(datapin, False) - byteout <<= 1 - GPIO.output(clockpin, True) - GPIO.output(clockpin, False) - -# this function is not used, its for future reference! -def slowspiread(clockpin, datapin): - GPIO.setup(clockpin, GPIO.OUT) - GPIO.setup(datapin, GPIO.IN) - byteout = 0 - for i in range(8): - GPIO.output(clockpin, False) - GPIO.output(clockpin, True) - byteout <<= 1 - if (GPIO.input(datapin)): - byteout = byteout | 0x1 - return byteout - -# read SPI data from MCP3002 chip, 2 possible adc's (0 thru 1) -def readadc(adcnum, clockpin, mosipin, misopin, cspin): - if ((adcnum > 1) or (adcnum < 0)): - return -1 - GPIO.output(cspin, True) - - GPIO.output(clockpin, False) # start clock low - GPIO.output(cspin, False) # bring CS low - - commandout = adcnum << 1; - commandout |= 0x0D # start bit + single-ended bit + MSBF bit - commandout <<= 4 # we only need to send 4 bits here - - for i in range(4): - if (commandout & 0x80): - GPIO.output(mosipin, True) - else: - GPIO.output(mosipin, False) - commandout <<= 1 - GPIO.output(clockpin, True) - GPIO.output(clockpin, False) - - adcout = 0 - - # read in one null bit and 10 ADC bits - for i in range(11): - GPIO.output(clockpin, True) - GPIO.output(clockpin, False) - adcout <<= 1 - if (GPIO.input(misopin)): - adcout |= 0x1 - GPIO.output(cspin, True) - - adcout /= 2 # first bit is 'null' so drop it - return adcout -# change these as desired -SPICLK = 18 -SPIMOSI = 17 -SPIMISO = 21 -SPICS = 22 - -# set up the SPI interface pins -GPIO.setup(SPIMOSI, GPIO.OUT) -GPIO.setup(SPIMISO, GPIO.IN) -GPIO.setup(SPICLK, GPIO.OUT) -GPIO.setup(SPICS, GPIO.OUT) - -# Note that bitbanging SPI is incredibly slow on the Pi as its not -# a RTOS - reading the ADC takes about 30 ms (~30 samples per second) -# which is awful for a microcontroller but better-than-nothing for Linux - -print "| #0 \t #1|" -print "-----------------------------------------------------------------" -while True: - print "|", - for adcnum in range(2): - ret = readadc(adcnum, SPICLK, SPIMOSI, SPIMISO, SPICS) - print ret,"\t", - print "|" diff --git a/Adafruit_MCP3008/mcp3008.py b/Adafruit_MCP3008/mcp3008.py deleted file mode 100644 index 73dcd7dd..00000000 --- a/Adafruit_MCP3008/mcp3008.py +++ /dev/null @@ -1,102 +0,0 @@ -#!/usr/bin/env python - -# just some bitbang code for testing all 8 channels - -import RPi.GPIO as GPIO, time, os - -DEBUG = 1 -GPIO.setmode(GPIO.BCM) - -# this function is not used, its for future reference! -def slowspiwrite(clockpin, datapin, byteout): - GPIO.setup(clockpin, GPIO.OUT) - GPIO.setup(datapin, GPIO.OUT) - for i in range(8): - if (byteout & 0x80): - GPIO.output(datapin, True) - else: - GPIO.output(datapin, False) - byteout <<= 1 - GPIO.output(clockpin, True) - GPIO.output(clockpin, False) - -# this function is not used, its for future reference! -def slowspiread(clockpin, datapin): - GPIO.setup(clockpin, GPIO.OUT) - GPIO.setup(datapin, GPIO.IN) - byteout = 0 - for i in range(8): - GPIO.output(clockpin, False) - GPIO.output(clockpin, True) - byteout <<= 1 - if (GPIO.input(datapin)): - byteout = byteout | 0x1 - return byteout - -# read SPI data from MCP3008 chip, 8 possible adc's (0 thru 7) -def readadc(adcnum, clockpin, mosipin, misopin, cspin): - if ((adcnum > 7) or (adcnum < 0)): - return -1 - GPIO.output(cspin, True) - - GPIO.output(clockpin, False) # start clock low - GPIO.output(cspin, False) # bring CS low - - commandout = adcnum - commandout |= 0x18 # start bit + single-ended bit - commandout <<= 3 # we only need to send 5 bits here - for i in range(5): - if (commandout & 0x80): - GPIO.output(mosipin, True) - else: - GPIO.output(mosipin, False) - commandout <<= 1 - GPIO.output(clockpin, True) - GPIO.output(clockpin, False) - - adcout = 0 - # read in one empty bit, one null bit and 10 ADC bits - for i in range(12): - GPIO.output(clockpin, True) - GPIO.output(clockpin, False) - adcout <<= 1 - if (GPIO.input(misopin)): - adcout |= 0x1 - - GPIO.output(cspin, True) - - adcout /= 2 # first bit is 'null' so drop it - return adcout - -if __name__=='__main__': - - try: - # change these as desired - SPICLK = 18 - SPIMISO = 21 - SPIMOSI = 17 - SPICS = 22 - - # set up the SPI interface pins - GPIO.setup(SPICLK, GPIO.OUT) - GPIO.setup(SPIMISO, GPIO.IN) - GPIO.setup(SPIMOSI, GPIO.OUT) - GPIO.setup(SPICS, GPIO.OUT) - - # Note that bitbanging SPI is incredibly slow on the Pi as its not - # a RTOS - reading the ADC takes about 30 ms (~30 samples per second) - # which is awful for a microcontroller but better-than-nothing for Linux - - print "| #0 \t #1 \t #2 \t #3 \t #4 \t #5 \t #6 \t #7\t|" - print "-----------------------------------------------------------------" - while True: - print "|", - for adcnum in range(8): - ret = readadc(adcnum, SPICLK, SPIMOSI, SPIMISO, SPICS) - print ret,"\t", - print "|" - - except KeyboardInterrupt: - pass - - GPIO.cleanup() diff --git a/Adafruit_MCP4725/Adafruit_I2C.py b/Adafruit_MCP4725/Adafruit_I2C.py deleted file mode 120000 index 77f06164..00000000 --- a/Adafruit_MCP4725/Adafruit_I2C.py +++ /dev/null @@ -1 +0,0 @@ -../Adafruit_I2C/Adafruit_I2C.py \ No newline at end of file diff --git a/Adafruit_MCP4725/Adafruit_MCP4725.py b/Adafruit_MCP4725/Adafruit_MCP4725.py deleted file mode 100755 index 0cd66b20..00000000 --- a/Adafruit_MCP4725/Adafruit_MCP4725.py +++ /dev/null @@ -1,35 +0,0 @@ -#!/usr/bin/python - -from Adafruit_I2C import Adafruit_I2C - -# ============================================================================ -# Adafruit MCP4725 12-Bit DAC -# ============================================================================ - -class MCP4725 : - i2c = None - - # Registers - __REG_WRITEDAC = 0x40 - __REG_WRITEDACEEPROM = 0x60 - - # Constructor - def __init__(self, address=0x62, debug=False): - self.i2c = Adafruit_I2C(address) - self.address = address - self.debug = debug - - def setVoltage(self, voltage, persist=False): - "Sets the output voltage to the specified value" - if (voltage > 4095): - voltage = 4095 - if (voltage < 0): - voltage = 0 - if (self.debug): - print "Setting voltage to %04d" % voltage - # Value needs to be left-shifted four bytes for the MCP4725 - bytes = [(voltage >> 4) & 0xFF, (voltage << 4) & 0xFF] - if (persist): - self.i2c.writeList(self.__REG_WRITEDACEEPROM, bytes) - else: - self.i2c.writeList(self.__REG_WRITEDAC, bytes) diff --git a/Adafruit_MCP4725/sinewave.py b/Adafruit_MCP4725/sinewave.py deleted file mode 100755 index 11928251..00000000 --- a/Adafruit_MCP4725/sinewave.py +++ /dev/null @@ -1,172 +0,0 @@ -#!/usr/bin/python - -from Adafruit_MCP4725 import MCP4725 -import time - -# Set this value to 9, 8, 7, 6 or 5 to adjust the resolution -DAC_RESOLUTION = 9 - -# 9-Bit Lookup Table (512 values) -DACLookup_FullSine_9Bit = \ -[ 2048, 2073, 2098, 2123, 2148, 2174, 2199, 2224, - 2249, 2274, 2299, 2324, 2349, 2373, 2398, 2423, - 2448, 2472, 2497, 2521, 2546, 2570, 2594, 2618, - 2643, 2667, 2690, 2714, 2738, 2762, 2785, 2808, - 2832, 2855, 2878, 2901, 2924, 2946, 2969, 2991, - 3013, 3036, 3057, 3079, 3101, 3122, 3144, 3165, - 3186, 3207, 3227, 3248, 3268, 3288, 3308, 3328, - 3347, 3367, 3386, 3405, 3423, 3442, 3460, 3478, - 3496, 3514, 3531, 3548, 3565, 3582, 3599, 3615, - 3631, 3647, 3663, 3678, 3693, 3708, 3722, 3737, - 3751, 3765, 3778, 3792, 3805, 3817, 3830, 3842, - 3854, 3866, 3877, 3888, 3899, 3910, 3920, 3930, - 3940, 3950, 3959, 3968, 3976, 3985, 3993, 4000, - 4008, 4015, 4022, 4028, 4035, 4041, 4046, 4052, - 4057, 4061, 4066, 4070, 4074, 4077, 4081, 4084, - 4086, 4088, 4090, 4092, 4094, 4095, 4095, 4095, - 4095, 4095, 4095, 4095, 4094, 4092, 4090, 4088, - 4086, 4084, 4081, 4077, 4074, 4070, 4066, 4061, - 4057, 4052, 4046, 4041, 4035, 4028, 4022, 4015, - 4008, 4000, 3993, 3985, 3976, 3968, 3959, 3950, - 3940, 3930, 3920, 3910, 3899, 3888, 3877, 3866, - 3854, 3842, 3830, 3817, 3805, 3792, 3778, 3765, - 3751, 3737, 3722, 3708, 3693, 3678, 3663, 3647, - 3631, 3615, 3599, 3582, 3565, 3548, 3531, 3514, - 3496, 3478, 3460, 3442, 3423, 3405, 3386, 3367, - 3347, 3328, 3308, 3288, 3268, 3248, 3227, 3207, - 3186, 3165, 3144, 3122, 3101, 3079, 3057, 3036, - 3013, 2991, 2969, 2946, 2924, 2901, 2878, 2855, - 2832, 2808, 2785, 2762, 2738, 2714, 2690, 2667, - 2643, 2618, 2594, 2570, 2546, 2521, 2497, 2472, - 2448, 2423, 2398, 2373, 2349, 2324, 2299, 2274, - 2249, 2224, 2199, 2174, 2148, 2123, 2098, 2073, - 2048, 2023, 1998, 1973, 1948, 1922, 1897, 1872, - 1847, 1822, 1797, 1772, 1747, 1723, 1698, 1673, - 1648, 1624, 1599, 1575, 1550, 1526, 1502, 1478, - 1453, 1429, 1406, 1382, 1358, 1334, 1311, 1288, - 1264, 1241, 1218, 1195, 1172, 1150, 1127, 1105, - 1083, 1060, 1039, 1017, 995, 974, 952, 931, - 910, 889, 869, 848, 828, 808, 788, 768, - 749, 729, 710, 691, 673, 654, 636, 618, - 600, 582, 565, 548, 531, 514, 497, 481, - 465, 449, 433, 418, 403, 388, 374, 359, - 345, 331, 318, 304, 291, 279, 266, 254, - 242, 230, 219, 208, 197, 186, 176, 166, - 156, 146, 137, 128, 120, 111, 103, 96, - 88, 81, 74, 68, 61, 55, 50, 44, - 39, 35, 30, 26, 22, 19, 15, 12, - 10, 8, 6, 4, 2, 1, 1, 0, - 0, 0, 1, 1, 2, 4, 6, 8, - 10, 12, 15, 19, 22, 26, 30, 35, - 39, 44, 50, 55, 61, 68, 74, 81, - 88, 96, 103, 111, 120, 128, 137, 146, - 156, 166, 176, 186, 197, 208, 219, 230, - 242, 254, 266, 279, 291, 304, 318, 331, - 345, 359, 374, 388, 403, 418, 433, 449, - 465, 481, 497, 514, 531, 548, 565, 582, - 600, 618, 636, 654, 673, 691, 710, 729, - 749, 768, 788, 808, 828, 848, 869, 889, - 910, 931, 952, 974, 995, 1017, 1039, 1060, - 1083, 1105, 1127, 1150, 1172, 1195, 1218, 1241, - 1264, 1288, 1311, 1334, 1358, 1382, 1406, 1429, - 1453, 1478, 1502, 1526, 1550, 1575, 1599, 1624, - 1648, 1673, 1698, 1723, 1747, 1772, 1797, 1822, - 1847, 1872, 1897, 1922, 1948, 1973, 1998, 2023 ] - -# 8-bit Lookup Table (256 values) -DACLookup_FullSine_8Bit = \ -[ 2048, 2098, 2148, 2198, 2248, 2298, 2348, 2398, - 2447, 2496, 2545, 2594, 2642, 2690, 2737, 2784, - 2831, 2877, 2923, 2968, 3013, 3057, 3100, 3143, - 3185, 3226, 3267, 3307, 3346, 3385, 3423, 3459, - 3495, 3530, 3565, 3598, 3630, 3662, 3692, 3722, - 3750, 3777, 3804, 3829, 3853, 3876, 3898, 3919, - 3939, 3958, 3975, 3992, 4007, 4021, 4034, 4045, - 4056, 4065, 4073, 4080, 4085, 4089, 4093, 4094, - 4095, 4094, 4093, 4089, 4085, 4080, 4073, 4065, - 4056, 4045, 4034, 4021, 4007, 3992, 3975, 3958, - 3939, 3919, 3898, 3876, 3853, 3829, 3804, 3777, - 3750, 3722, 3692, 3662, 3630, 3598, 3565, 3530, - 3495, 3459, 3423, 3385, 3346, 3307, 3267, 3226, - 3185, 3143, 3100, 3057, 3013, 2968, 2923, 2877, - 2831, 2784, 2737, 2690, 2642, 2594, 2545, 2496, - 2447, 2398, 2348, 2298, 2248, 2198, 2148, 2098, - 2048, 1997, 1947, 1897, 1847, 1797, 1747, 1697, - 1648, 1599, 1550, 1501, 1453, 1405, 1358, 1311, - 1264, 1218, 1172, 1127, 1082, 1038, 995, 952, - 910, 869, 828, 788, 749, 710, 672, 636, - 600, 565, 530, 497, 465, 433, 403, 373, - 345, 318, 291, 266, 242, 219, 197, 176, - 156, 137, 120, 103, 88, 74, 61, 50, - 39, 30, 22, 15, 10, 6, 2, 1, - 0, 1, 2, 6, 10, 15, 22, 30, - 39, 50, 61, 74, 88, 103, 120, 137, - 156, 176, 197, 219, 242, 266, 291, 318, - 345, 373, 403, 433, 465, 497, 530, 565, - 600, 636, 672, 710, 749, 788, 828, 869, - 910, 952, 995, 1038, 1082, 1127, 1172, 1218, - 1264, 1311, 1358, 1405, 1453, 1501, 1550, 1599, - 1648, 1697, 1747, 1797, 1847, 1897, 1947, 1997 ] - -# 7-bit Lookup Table (128 values) -DACLookup_FullSine_7Bit = \ -[ 2048, 2148, 2248, 2348, 2447, 2545, 2642, 2737, - 2831, 2923, 3013, 3100, 3185, 3267, 3346, 3423, - 3495, 3565, 3630, 3692, 3750, 3804, 3853, 3898, - 3939, 3975, 4007, 4034, 4056, 4073, 4085, 4093, - 4095, 4093, 4085, 4073, 4056, 4034, 4007, 3975, - 3939, 3898, 3853, 3804, 3750, 3692, 3630, 3565, - 3495, 3423, 3346, 3267, 3185, 3100, 3013, 2923, - 2831, 2737, 2642, 2545, 2447, 2348, 2248, 2148, - 2048, 1947, 1847, 1747, 1648, 1550, 1453, 1358, - 1264, 1172, 1082, 995, 910, 828, 749, 672, - 600, 530, 465, 403, 345, 291, 242, 197, - 156, 120, 88, 61, 39, 22, 10, 2, - 0, 2, 10, 22, 39, 61, 88, 120, - 156, 197, 242, 291, 345, 403, 465, 530, - 600, 672, 749, 828, 910, 995, 1082, 1172, - 1264, 1358, 1453, 1550, 1648, 1747, 1847, 1947 ] - -# 6-bit Lookup Table (64 values) -DACLookup_FullSine_6Bit = \ -[ 2048, 2248, 2447, 2642, 2831, 3013, 3185, 3346, - 3495, 3630, 3750, 3853, 3939, 4007, 4056, 4085, - 4095, 4085, 4056, 4007, 3939, 3853, 3750, 3630, - 3495, 3346, 3185, 3013, 2831, 2642, 2447, 2248, - 2048, 1847, 1648, 1453, 1264, 1082, 910, 749, - 600, 465, 345, 242, 156, 88, 39, 10, - 0, 10, 39, 88, 156, 242, 345, 465, - 600, 749, 910, 1082, 1264, 1453, 1648, 1847 ] - -# 5-bit Lookup Table (32 values) -DACLookup_FullSine_5Bit = \ -[ 2048, 2447, 2831, 3185, 3495, 3750, 3939, 4056, - 4095, 4056, 3939, 3750, 3495, 3185, 2831, 2447, - 2048, 1648, 1264, 910, 600, 345, 156, 39, - 0, 39, 156, 345, 600, 910, 1264, 1648 ] - -# Initialise the DAC using the default address -dac = MCP4725(0x62) - -if (DAC_RESOLUTION < 5) | (DAC_RESOLUTION > 9): - print "Invalid DAC resolution: Set DAC_RESOLUTION from 5..9" -else: - print "Generating a sine wave with %d-bit resolution" % DAC_RESOLUTION - print "Press CTRL+C to stop" - while(True): - if (DAC_RESOLUTION == 9): - for val in DACLookup_FullSine_9Bit: - dac.setVoltage(val) - if (DAC_RESOLUTION == 8): - for val in DACLookup_FullSine_8Bit: - dac.setVoltage(val) - if (DAC_RESOLUTION == 7): - for val in DACLookup_FullSine_7Bit: - dac.setVoltage(val) - if (DAC_RESOLUTION == 6): - for val in DACLookup_FullSine_6Bit: - dac.setVoltage(val) - if (DAC_RESOLUTION == 5): - for val in DACLookup_FullSine_5Bit: - dac.setVoltage(val) - diff --git a/Adafruit_PWM_Servo_Driver/Adafruit_I2C.py b/Adafruit_PWM_Servo_Driver/Adafruit_I2C.py deleted file mode 120000 index 77f06164..00000000 --- a/Adafruit_PWM_Servo_Driver/Adafruit_I2C.py +++ /dev/null @@ -1 +0,0 @@ -../Adafruit_I2C/Adafruit_I2C.py \ No newline at end of file diff --git a/Adafruit_PWM_Servo_Driver/Adafruit_PWM_Servo_Driver.py b/Adafruit_PWM_Servo_Driver/Adafruit_PWM_Servo_Driver.py deleted file mode 100644 index 35c993ca..00000000 --- a/Adafruit_PWM_Servo_Driver/Adafruit_PWM_Servo_Driver.py +++ /dev/null @@ -1,92 +0,0 @@ -#!/usr/bin/python - -import time -import math -from Adafruit_I2C import Adafruit_I2C - -# ============================================================================ -# Adafruit PCA9685 16-Channel PWM Servo Driver -# ============================================================================ - -class PWM : - # Registers/etc. - __MODE1 = 0x00 - __MODE2 = 0x01 - __SUBADR1 = 0x02 - __SUBADR2 = 0x03 - __SUBADR3 = 0x04 - __PRESCALE = 0xFE - __LED0_ON_L = 0x06 - __LED0_ON_H = 0x07 - __LED0_OFF_L = 0x08 - __LED0_OFF_H = 0x09 - __ALL_LED_ON_L = 0xFA - __ALL_LED_ON_H = 0xFB - __ALL_LED_OFF_L = 0xFC - __ALL_LED_OFF_H = 0xFD - - # Bits - __RESTART = 0x80 - __SLEEP = 0x10 - __ALLCALL = 0x01 - __INVRT = 0x10 - __OUTDRV = 0x04 - - general_call_i2c = Adafruit_I2C(0x00) - - @classmethod - def softwareReset(cls): - "Sends a software reset (SWRST) command to all the servo drivers on the bus" - cls.general_call_i2c.writeRaw8(0x06) # SWRST - - def __init__(self, address=0x40, debug=False): - self.i2c = Adafruit_I2C(address) - self.i2c.debug = debug - self.address = address - self.debug = debug - if (self.debug): - print "Reseting PCA9685 MODE1 (without SLEEP) and MODE2" - self.setAllPWM(0, 0) - self.i2c.write8(self.__MODE2, self.__OUTDRV) - self.i2c.write8(self.__MODE1, self.__ALLCALL) - time.sleep(0.005) # wait for oscillator - - mode1 = self.i2c.readU8(self.__MODE1) - mode1 = mode1 & ~self.__SLEEP # wake up (reset sleep) - self.i2c.write8(self.__MODE1, mode1) - time.sleep(0.005) # wait for oscillator - - def setPWMFreq(self, freq): - "Sets the PWM frequency" - prescaleval = 25000000.0 # 25MHz - prescaleval /= 4096.0 # 12-bit - prescaleval /= float(freq) - prescaleval -= 1.0 - if (self.debug): - print "Setting PWM frequency to %d Hz" % freq - print "Estimated pre-scale: %d" % prescaleval - prescale = math.floor(prescaleval + 0.5) - if (self.debug): - print "Final pre-scale: %d" % prescale - - oldmode = self.i2c.readU8(self.__MODE1); - newmode = (oldmode & 0x7F) | 0x10 # sleep - self.i2c.write8(self.__MODE1, newmode) # go to sleep - self.i2c.write8(self.__PRESCALE, int(math.floor(prescale))) - self.i2c.write8(self.__MODE1, oldmode) - time.sleep(0.005) - self.i2c.write8(self.__MODE1, oldmode | 0x80) - - def setPWM(self, channel, on, off): - "Sets a single PWM channel" - self.i2c.write8(self.__LED0_ON_L+4*channel, on & 0xFF) - self.i2c.write8(self.__LED0_ON_H+4*channel, on >> 8) - self.i2c.write8(self.__LED0_OFF_L+4*channel, off & 0xFF) - self.i2c.write8(self.__LED0_OFF_H+4*channel, off >> 8) - - def setAllPWM(self, on, off): - "Sets a all PWM channels" - self.i2c.write8(self.__ALL_LED_ON_L, on & 0xFF) - self.i2c.write8(self.__ALL_LED_ON_H, on >> 8) - self.i2c.write8(self.__ALL_LED_OFF_L, off & 0xFF) - self.i2c.write8(self.__ALL_LED_OFF_H, off >> 8) diff --git a/Adafruit_PWM_Servo_Driver/Servo_Example.py b/Adafruit_PWM_Servo_Driver/Servo_Example.py deleted file mode 100644 index 66a0d7fa..00000000 --- a/Adafruit_PWM_Servo_Driver/Servo_Example.py +++ /dev/null @@ -1,37 +0,0 @@ -#!/usr/bin/python - -from Adafruit_PWM_Servo_Driver import PWM -import time - -# =========================================================================== -# Example Code -# =========================================================================== - -# Initialise the PWM device using the default address -pwm = PWM(0x40) -# Note if you'd like more debug output you can instead run: -#pwm = PWM(0x40, debug=True) - -servoMin = 150 # Min pulse length out of 4096 -servoMax = 600 # Max pulse length out of 4096 - -def setServoPulse(channel, pulse): - pulseLength = 1000000 # 1,000,000 us per second - pulseLength /= 60 # 60 Hz - print "%d us per period" % pulseLength - pulseLength /= 4096 # 12 bits of resolution - print "%d us per bit" % pulseLength - pulse *= 1000 - pulse /= pulseLength - pwm.setPWM(channel, 0, pulse) - -pwm.setPWMFreq(60) # Set frequency to 60 Hz -while (True): - # Change speed of continuous servo on channel O - pwm.setPWM(0, 0, servoMin) - time.sleep(1) - pwm.setPWM(0, 0, servoMax) - time.sleep(1) - - - diff --git a/Adafruit_TCS34725/Adafruit_I2C.py b/Adafruit_TCS34725/Adafruit_I2C.py deleted file mode 100644 index 3423461d..00000000 --- a/Adafruit_TCS34725/Adafruit_I2C.py +++ /dev/null @@ -1,170 +0,0 @@ -#!/usr/bin/python - -import smbus - -# =========================================================================== -# Adafruit_I2C Class -# =========================================================================== - -class Adafruit_I2C : - - @staticmethod - def getPiRevision(): - "Gets the version number of the Raspberry Pi board" - # Courtesy quick2wire-python-api - # https://github.com/quick2wire/quick2wire-python-api - try: - with open('/proc/cpuinfo','r') as f: - for line in f: - if line.startswith('Revision'): - return 1 if line.rstrip()[-1] in ['1','2'] else 2 - except: - return 0 - - @staticmethod - def getPiI2CBusNumber(): - # Gets the I2C bus number /dev/i2c# - return 1 if Adafruit_I2C.getPiRevision() > 1 else 0 - - def __init__(self, address, busnum=-1, debug=False): - self.address = address - # By default, the correct I2C bus is auto-detected using /proc/cpuinfo - # Alternatively, you can hard-code the bus version below: - # self.bus = smbus.SMBus(0); # Force I2C0 (early 256MB Pi's) - # self.bus = smbus.SMBus(1); # Force I2C1 (512MB Pi's) - self.bus = smbus.SMBus( - busnum if busnum >= 0 else Adafruit_I2C.getPiI2CBusNumber()) - self.debug = debug - - def reverseByteOrder(self, data): - "Reverses the byte order of an int (16-bit) or long (32-bit) value" - # Courtesy Vishal Sapre - byteCount = len(hex(data)[2:].replace('L','')[::2]) - val = 0 - for i in range(byteCount): - val = (val << 8) | (data & 0xff) - data >>= 8 - return val - - def errMsg(self): - print "Error accessing 0x%02X: Check your I2C address" % self.address - return -1 - - def write8(self, reg, value): - "Writes an 8-bit value to the specified register/address" - try: - self.bus.write_byte_data(self.address, reg, value) - if self.debug: - print "I2C: Wrote 0x%02X to register 0x%02X" % (value, reg) - except IOError, err: - return self.errMsg() - - def write16(self, reg, value): - "Writes a 16-bit value to the specified register/address pair" - try: - self.bus.write_word_data(self.address, reg, value) - if self.debug: - print ("I2C: Wrote 0x%02X to register pair 0x%02X,0x%02X" % - (value, reg, reg+1)) - except IOError, err: - return self.errMsg() - - def writeList(self, reg, list): - "Writes an array of bytes using I2C format" - try: - if self.debug: - print "I2C: Writing list to register 0x%02X:" % reg - print list - self.bus.write_i2c_block_data(self.address, reg, list) - except IOError, err: - return self.errMsg() - - def readList(self, reg, length): - "Read a list of bytes from the I2C device" - try: - results = self.bus.read_i2c_block_data(self.address, reg, length) - if self.debug: - print ("I2C: Device 0x%02X returned the following from reg 0x%02X" % - (self.address, reg)) - print results - return results - except IOError, err: - return self.errMsg() - - def readU8(self, reg): - "Read an unsigned byte from the I2C device" - try: - result = self.bus.read_byte_data(self.address, reg) - if self.debug: - print ("I2C: Device 0x%02X returned 0x%02X from reg 0x%02X" % - (self.address, result & 0xFF, reg)) - return result - except IOError, err: - return self.errMsg() - - def readS8(self, reg): - "Reads a signed byte from the I2C device" - try: - result = self.bus.read_byte_data(self.address, reg) - if result > 127: result -= 256 - if self.debug: - print ("I2C: Device 0x%02X returned 0x%02X from reg 0x%02X" % - (self.address, result & 0xFF, reg)) - return result - except IOError, err: - return self.errMsg() - - def readU16(self, reg): - "Reads an unsigned 16-bit value from the I2C device" - try: - hibyte = self.readU8(reg) - lobyte = self.readU8(reg+1) - result = (hibyte << 8) + lobyte - if (self.debug): - print "I2C: Device 0x%02X returned 0x%04X from reg 0x%02X" % (self.address, result & 0xFFFF, reg) - return result - except IOError, err: - return self.errMsg() - - def readS16(self, reg): - "Reads a signed 16-bit value from the I2C device" - try: - hibyte = self.readS8(reg) - lobyte = self.readU8(reg+1) - result = (hibyte << 8) + lobyte - if (self.debug): - print "I2C: Device 0x%02X returned 0x%04X from reg 0x%02X" % (self.address, result & 0xFFFF, reg) - return result - except IOError, err: - return self.errMsg() - - def readU16Rev(self, reg): - "Reads an unsigned 16-bit value from the I2C device with rev byte order" - try: - lobyte = self.readU8(reg) - hibyte = self.readU8(reg+1) - result = (hibyte << 8) + lobyte - if (self.debug): - print "I2C: Device 0x%02X returned 0x%04X from reg 0x%02X" % (self.address, result & 0xFFFF, reg) - return result - except IOError, err: - return self.errMsg() - - def readS16Rev(self, reg): - "Reads a signed 16-bit value from the I2C device with rev byte order" - try: - lobyte = self.readS8(reg) - hibyte = self.readU8(reg+1) - result = (hibyte << 8) + lobyte - if (self.debug): - print "I2C: Device 0x%02X returned 0x%04X from reg 0x%02X" % (self.address, result & 0xFFFF, reg) - return result - except IOError, err: - return self.errMsg() - -if __name__ == '__main__': - try: - bus = Adafruit_I2C(address=0) - print "Default I2C bus is accessible" - except: - print "Error accessing default I2C bus" diff --git a/Adafruit_TCS34725/Adafruit_TCS34725.py b/Adafruit_TCS34725/Adafruit_TCS34725.py deleted file mode 100644 index 08a50f78..00000000 --- a/Adafruit_TCS34725/Adafruit_TCS34725.py +++ /dev/null @@ -1,228 +0,0 @@ -#!/usr/bin/python - -import time -from Adafruit_I2C import Adafruit_I2C - -# =========================================================================== -# TCS3472 Class -# =========================================================================== - - -class TCS34725: - i2c = None - - __TCS34725_ADDRESS = 0x29 - __TCS34725_ID = 0x12 # 0x44 = TCS34721/TCS34725, 0x4D = TCS34723/TCS34727 - - __TCS34725_COMMAND_BIT = 0x80 - - __TCS34725_ENABLE = 0x00 - __TCS34725_ENABLE_AIEN = 0x10 # RGBC Interrupt Enable - __TCS34725_ENABLE_WEN = 0x08 # Wait enable - Writing 1 activates the wait timer - __TCS34725_ENABLE_AEN = 0x02 # RGBC Enable - Writing 1 actives the ADC, 0 disables it - __TCS34725_ENABLE_PON = 0x01 # Power on - Writing 1 activates the internal oscillator, 0 disables it - __TCS34725_ATIME = 0x01 # Integration time - __TCS34725_WTIME = 0x03 # Wait time (if TCS34725_ENABLE_WEN is asserted) - __TCS34725_WTIME_2_4MS = 0xFF # WLONG0 = 2.4ms WLONG1 = 0.029s - __TCS34725_WTIME_204MS = 0xAB # WLONG0 = 204ms WLONG1 = 2.45s - __TCS34725_WTIME_614MS = 0x00 # WLONG0 = 614ms WLONG1 = 7.4s - __TCS34725_AILTL = 0x04 # Clear channel lower interrupt threshold - __TCS34725_AILTH = 0x05 - __TCS34725_AIHTL = 0x06 # Clear channel upper interrupt threshold - __TCS34725_AIHTH = 0x07 - __TCS34725_PERS = 0x0C # Persistence register - basic SW filtering mechanism for interrupts - __TCS34725_PERS_NONE = 0b0000 # Every RGBC cycle generates an interrupt - __TCS34725_PERS_1_CYCLE = 0b0001 # 1 clean channel value outside threshold range generates an interrupt - __TCS34725_PERS_2_CYCLE = 0b0010 # 2 clean channel values outside threshold range generates an interrupt - __TCS34725_PERS_3_CYCLE = 0b0011 # 3 clean channel values outside threshold range generates an interrupt - __TCS34725_PERS_5_CYCLE = 0b0100 # 5 clean channel values outside threshold range generates an interrupt - __TCS34725_PERS_10_CYCLE = 0b0101 # 10 clean channel values outside threshold range generates an interrupt - __TCS34725_PERS_15_CYCLE = 0b0110 # 15 clean channel values outside threshold range generates an interrupt - __TCS34725_PERS_20_CYCLE = 0b0111 # 20 clean channel values outside threshold range generates an interrupt - __TCS34725_PERS_25_CYCLE = 0b1000 # 25 clean channel values outside threshold range generates an interrupt - __TCS34725_PERS_30_CYCLE = 0b1001 # 30 clean channel values outside threshold range generates an interrupt - __TCS34725_PERS_35_CYCLE = 0b1010 # 35 clean channel values outside threshold range generates an interrupt - __TCS34725_PERS_40_CYCLE = 0b1011 # 40 clean channel values outside threshold range generates an interrupt - __TCS34725_PERS_45_CYCLE = 0b1100 # 45 clean channel values outside threshold range generates an interrupt - __TCS34725_PERS_50_CYCLE = 0b1101 # 50 clean channel values outside threshold range generates an interrupt - __TCS34725_PERS_55_CYCLE = 0b1110 # 55 clean channel values outside threshold range generates an interrupt - __TCS34725_PERS_60_CYCLE = 0b1111 # 60 clean channel values outside threshold range generates an interrupt - __TCS34725_CONFIG = 0x0D - __TCS34725_CONFIG_WLONG = 0x02 # Choose between short and long (12x) wait times via TCS34725_WTIME - __TCS34725_CONTROL = 0x0F # Set the gain level for the sensor - __TCS34725_ID = 0x12 # 0x44 = TCS34721/TCS34725, 0x4D = TCS34723/TCS34727 - __TCS34725_STATUS = 0x13 - __TCS34725_STATUS_AINT = 0x10 # RGBC Clean channel interrupt - __TCS34725_STATUS_AVALID = 0x01 # Indicates that the RGBC channels have completed an integration cycle - - __TCS34725_CDATAL = 0x14 # Clear channel data - __TCS34725_CDATAH = 0x15 - __TCS34725_RDATAL = 0x16 # Red channel data - __TCS34725_RDATAH = 0x17 - __TCS34725_GDATAL = 0x18 # Green channel data - __TCS34725_GDATAH = 0x19 - __TCS34725_BDATAL = 0x1A # Blue channel data - __TCS34725_BDATAH = 0x1B - - __TCS34725_INTEGRATIONTIME_2_4MS = 0xFF # 2.4ms - 1 cycle - Max Count: 1024 - __TCS34725_INTEGRATIONTIME_24MS = 0xF6 # 24ms - 10 cycles - Max Count: 10240 - __TCS34725_INTEGRATIONTIME_50MS = 0xEB # 50ms - 20 cycles - Max Count: 20480 - __TCS34725_INTEGRATIONTIME_101MS = 0xD5 # 101ms - 42 cycles - Max Count: 43008 - __TCS34725_INTEGRATIONTIME_154MS = 0xC0 # 154ms - 64 cycles - Max Count: 65535 - __TCS34725_INTEGRATIONTIME_700MS = 0x00 # 700ms - 256 cycles - Max Count: 65535 - - __TCS34725_GAIN_1X = 0x00 # No gain - __TCS34725_GAIN_4X = 0x01 # 2x gain - __TCS34725_GAIN_16X = 0x02 # 16x gain - __TCS34725_GAIN_60X = 0x03 # 60x gain - - __integrationTimeDelay = { - 0xFF: 0.0024, # 2.4ms - 1 cycle - Max Count: 1024 - 0xF6: 0.024, # 24ms - 10 cycles - Max Count: 10240 - 0xEB: 0.050, # 50ms - 20 cycles - Max Count: 20480 - 0xD5: 0.101, # 101ms - 42 cycles - Max Count: 43008 - 0xC0: 0.154, # 154ms - 64 cycles - Max Count: 65535 - 0x00: 0.700 # 700ms - 256 cycles - Max Count: 65535 - } - - # Private Methods - def __readU8(self, reg): - return self.i2c.readU8(self.__TCS34725_COMMAND_BIT | reg) - - def __readU16Rev(self, reg): - return self.i2c.readU16Rev(self.__TCS34725_COMMAND_BIT | reg) - - def __write8(self, reg, value): - self.i2c.write8(self.__TCS34725_COMMAND_BIT | reg, value & 0xff) - - # Constructor - def __init__(self, address=0x29, debug=False, integrationTime=0xFF, gain=0x01): - self.i2c = Adafruit_I2C(address) - - self.address = address - self.debug = debug - self.integrationTime = integrationTime - self.initialize(integrationTime, gain) - - def initialize(self, integrationTime, gain): - "Initializes I2C and configures the sensor (call this function before \ - doing anything else)" - # Make sure we're actually connected - result = self.__readU8(self.__TCS34725_ID) - if (result != 0x44): - return -1 - - # Set default integration time and gain - self.setIntegrationTime(integrationTime) - self.setGain(gain) - - # Note: by default, the device is in power down mode on bootup - self.enable() - - def enable(self): - self.__write8(self.__TCS34725_ENABLE, self.__TCS34725_ENABLE_PON) - time.sleep(0.01) - self.__write8(self.__TCS34725_ENABLE, (self.__TCS34725_ENABLE_PON | self.__TCS34725_ENABLE_AEN)) - - def disable(self): - reg = 0 - reg = self.__readU8(self.__TCS34725_ENABLE) - self.__write8(self.__TCS34725_ENABLE, (reg & ~(self.__TCS34725_ENABLE_PON | self.__TCS34725_ENABLE_AEN))) - - def setIntegrationTime(self, integrationTime): - "Sets the integration time for the TC34725" - self.integrationTime = integrationTime - - self.__write8(self.__TCS34725_ATIME, integrationTime) - - def getIntegrationTime(self): - return self.__readU8(self.__TCS34725_ATIME) - - def setGain(self, gain): - "Adjusts the gain on the TCS34725 (adjusts the sensitivity to light)" - self.__write8(self.__TCS34725_CONTROL, gain) - - def getGain(self): - return self.__readU8(self.__TCS34725_CONTROL) - - def getRawData(self): - "Reads the raw red, green, blue and clear channel values" - - color = {} - - color["r"] = self.__readU16Rev(self.__TCS34725_RDATAL) - color["b"] = self.__readU16Rev(self.__TCS34725_BDATAL) - color["g"] = self.__readU16Rev(self.__TCS34725_GDATAL) - color["c"] = self.__readU16Rev(self.__TCS34725_CDATAL) - - # Set a delay for the integration time - delay = self.__integrationTimeDelay.get(self.integrationTime) - time.sleep(delay) - - return color - - def setInterrupt(self, int): - r = self.__readU8(self.__TCS34725_ENABLE) - - if (int): - r |= self.__TCS34725_ENABLE_AIEN - else: - r &= ~self.__TCS34725_ENABLE_AIEN - - self.__write8(self.__TCS34725_ENABLE, r) - - def clearInterrupt(self): - self.i2c.write8(0x66 & 0xff) - - def setIntLimits(self, low, high): - self.i2c.write8(0x04, low & 0xFF) - self.i2c.write8(0x05, low >> 8) - self.i2c.write8(0x06, high & 0xFF) - self.i2c.write8(0x07, high >> 8) - - #Static Utility Methods - @staticmethod - def calculateColorTemperature(rgb): - "Converts the raw R/G/B values to color temperature in degrees Kelvin" - - if not isinstance(rgb, dict): - raise ValueError('calculateColorTemperature expects dict as parameter') - - # 1. Map RGB values to their XYZ counterparts. - # Based on 6500K fluorescent, 3000K fluorescent - # and 60W incandescent values for a wide range. - # Note: Y = Illuminance or lux - X = (-0.14282 * rgb['r']) + (1.54924 * rgb['g']) + (-0.95641 * rgb['b']) - Y = (-0.32466 * rgb['r']) + (1.57837 * rgb['g']) + (-0.73191 * rgb['b']) - Z = (-0.68202 * rgb['r']) + (0.77073 * rgb['g']) + ( 0.56332 * rgb['b']) - - # Check for divide by 0 (total darkness) and return None. - if (X + Y + Z) == 0: - return None - - # 2. Calculate the chromaticity co-ordinates - xc = (X) / (X + Y + Z) - yc = (Y) / (X + Y + Z) - - # Check for divide by 0 again and return None. - if (0.1858 - yc) == 0: - return None - - # 3. Use McCamy's formula to determine the CCT - n = (xc - 0.3320) / (0.1858 - yc) - - # Calculate the final CCT - cct = (449.0 * (n ** 3.0)) + (3525.0 *(n ** 2.0)) + (6823.3 * n) + 5520.33 - - return int(cct) - - @staticmethod - def calculateLux(rgb): - "Converts the raw R/G/B values to color temperature in degrees Kelvin" - - if not isinstance(rgb, dict): - raise ValueError('calculateLux expects dict as parameter') - - illuminance = (-0.32466 * rgb['r']) + (1.57837 * rgb['g']) + (-0.73191 * rgb['b']) - - return int(illuminance) diff --git a/Adafruit_TCS34725/Adafruit_TCS34725_Example.py b/Adafruit_TCS34725/Adafruit_TCS34725_Example.py deleted file mode 100644 index c55ccb21..00000000 --- a/Adafruit_TCS34725/Adafruit_TCS34725_Example.py +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/bin/python -from time import sleep -from Adafruit_TCS34725 import TCS34725 - -# =========================================================================== -# Example Code -# =========================================================================== - -# Initialize the TCS34725 and use default integration time and gain -# tcs34725 = TCS34725(debug=True) -tcs = TCS34725(integrationTime=0xEB, gain=0x01) -tcs.setInterrupt(False) -sleep(1) - -rgb = tcs.getRawData() -colorTemp = tcs.calculateColorTemperature(rgb) -lux = tcs.calculateLux(rgb) -print rgb -if colorTemp is None: - print 'Too dark to determine color temperature!' -else: - print "Color Temperature: %d K" % colorTemp -print "Luminosity: %d lux" % lux -tcs.setInterrupt(True) -sleep(1) -tcs.disable() diff --git a/Adafruit_VCNL4000/Adafruit_I2C.py b/Adafruit_VCNL4000/Adafruit_I2C.py deleted file mode 120000 index 77f06164..00000000 --- a/Adafruit_VCNL4000/Adafruit_I2C.py +++ /dev/null @@ -1 +0,0 @@ -../Adafruit_I2C/Adafruit_I2C.py \ No newline at end of file diff --git a/Adafruit_VCNL4000/Adafruit_VCNL4000.py b/Adafruit_VCNL4000/Adafruit_VCNL4000.py deleted file mode 100755 index 4d307536..00000000 --- a/Adafruit_VCNL4000/Adafruit_VCNL4000.py +++ /dev/null @@ -1,61 +0,0 @@ -#!/usr/bin/python - -import time -from Adafruit_I2C import Adafruit_I2C - -# =========================================================================== -# VCNL4000 Class -# =========================================================================== - -# Address of the sensor -VCNL4000_ADDRESS = 0x13 - -# Commands -VCNL4000_COMMAND = 0x80 -VCNL4000_PRODUCTID = 0x81 -VCNL4000_IRLED = 0x83 -VCNL4000_AMBIENTPARAMETER = 0x84 -VCNL4000_AMBIENTDATA = 0x85 -VCNL4000_PROXIMITYDATA = 0x87 -VCNL4000_SIGNALFREQ = 0x89 -VCNL4000_PROXINITYADJUST = 0x8A - -VCNL4000_3M125 = 0 -VCNL4000_1M5625 = 1 -VCNL4000_781K25 = 2 -VCNL4000_390K625 = 3 - -VCNL4000_MEASUREAMBIENT = 0x10 -VCNL4000_MEASUREPROXIMITY = 0x08 -VCNL4000_AMBIENTREADY = 0x40 -VCNL4000_PROXIMITYREADY = 0x20 - -class VCNL4000 : - i2c = None - - # Constructor - def __init__(self, address=0x13): - self.i2c = Adafruit_I2C(address) - - self.address = address - - # Write proximity adjustement register - self.i2c.write8(VCNL4000_PROXINITYADJUST, 0x81); - - # Read data from proximity sensor - def read_proximity(self): - self.i2c.write8(VCNL4000_COMMAND, VCNL4000_MEASUREPROXIMITY) - while True: - result = self.i2c.readU8(VCNL4000_COMMAND) - if (result and VCNL4000_PROXIMITYREADY): - return self.i2c.readU16(VCNL4000_PROXIMITYDATA) - time.sleep(0.001) - - # Read data from ambient sensor - def read_ambient(self): - self.i2c.write8(VCNL4000_COMMAND, VCNL4000_MEASUREAMBIENT) - while True: - result = self.i2c.readU8(VCNL4000_COMMAND) - if (result and VCNL4000_AMBIENTREADY): - return self.i2c.readU16(VCNL4000_AMBIENTDATA) - time.sleep(0.001) diff --git a/Adafruit_VCNL4000/Adafruit_VCNL4000_example.py b/Adafruit_VCNL4000/Adafruit_VCNL4000_example.py deleted file mode 100755 index 36baa422..00000000 --- a/Adafruit_VCNL4000/Adafruit_VCNL4000_example.py +++ /dev/null @@ -1,17 +0,0 @@ -#!/usr/bin/python - -from Adafruit_VCNL4000 import VCNL4000 -import time - -# =========================================================================== -# Example Code -# =========================================================================== - -# Initialise the VNCL4000 sensor -vcnl = VCNL4000(0x13) - -# Print proximity sensor data every 100 ms -while True: - - print "Data from proximity sensor", vcnl.read_proximity() - time.sleep(0.1) diff --git a/README.md b/README.md index 8f342a3a..c2e41ed7 100644 --- a/README.md +++ b/README.md @@ -1,45 +1,63 @@ -Adafruit's Raspberry-Pi Python Code Library -============ - Here is a growing collection of libraries and example python scripts - for controlling a variety of Adafruit electronics with a Raspberry Pi - - In progress! - - Adafruit invests time and resources providing this open source code, - please support Adafruit and open-source hardware by purchasing - products from Adafruit! - - Written by Limor Fried, Kevin Townsend and Mikey Sklar for Adafruit Industries. - BSD license, all text above and below must be included in any redistribution - - To download, we suggest logging into your Pi with Internet accessibility and typing: - -```bash -git clone https://github.com/adafruit/Adafruit-Raspberry-Pi-Python-Code.git -``` - -============ -Copyright (c) 2012-2013 Limor Fried, Kevin Townsend and Mikey Sklar for Adafruit Industries. -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - * Neither the name of the nor the - names of its contributors may be used to endorse or promote products - derived from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL BE LIABLE FOR ANY -DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND -ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# Adafruit's Legacy Raspberry Pi Python Code Library + +## What happened to all the Raspberry Pi Python code!? + +In the past this repository held all of the Raspberry Pi related Python code +that Adafruit published. For example code to talk to sensors like the BMP085, +TCS34725, and other hardware like character LCD plates. Over time we found it +difficult to manage so much code in a single repository, and couldn't easily put +the code on Python's package index for simple installation. Now we've broken out +all of the previous Python code into individual GitHub repositories, and we've +loaded all of these repositories on the [Python package index](https://pypi.python.org/pypi) +so they can be installed with `pip` (note that pip won't install example code so for most users +it's recommended to install from source). + +In addition **all** of the Python libraries below support **both** Python 2.7 and Python 3.x! + +## Where do I find the new Raspberry Pi Python code? + +Here is a table with each of the old libraries and a link to their new unique +GitHub repositories and easy pip install names: + +| Old Library Name | New Library Location | New `pip install` Package Name | Notes | +|------------------|----------------------|--------------------------------|-------| +| Adafruit_ADS1x15 | https://github.com/adafruit/Adafruit_Python_ADS1X15 | adafruit-ads1x15 | [See guide](https://learn.adafruit.com/raspberry-pi-analog-to-digital-converters). | +| Adafruit_ADXL345 | https://github.com/adafruit/Adafruit_Python_ADXL345 | adafriut-adxl345 | - | +| Adafruit_BMP085 | https://github.com/adafruit/Adafruit_Python_BMP | adafruit-bmp | [See guide](https://learn.adafruit.com/using-the-bmp085-with-raspberry-pi/using-the-adafruit-bmp085-python-library). | +| Adafruit_CharLCD | https://github.com/adafruit/Adafruit_Python_CharLCD | adafruit-charlcd | [See new character LCD guide](https://learn.adafruit.com/character-lcd-with-raspberry-pi-or-beaglebone-black/overview). | +| Adafruit_CharLCDPlate | https://github.com/adafruit/Adafruit_Python_CharLCD | adafruit-charlcd | [See new character LCD guide](https://learn.adafruit.com/character-lcd-with-raspberry-pi-or-beaglebone-black/overview). | +| Adafruit_DHT_Driver | https://github.com/adafruit/Adafruit_Python_DHT | None, must be manually installed to properly compile C extension. | See the [C code for reading the DHT sensor](https://github.com/adafruit/Adafruit_Python_DHT/tree/master/source/Raspberry_Pi_2) in the updated Python driver. | +| Adafruit_DHT_Driver_Python | https://github.com/adafruit/Adafruit_Python_DHT | None, must be manually installed to properly compile C extension. | [See updated DHT sensor guide](https://learn.adafruit.com/dht-humidity-sensing-on-raspberry-pi-with-gdocs-logging/overview) | +| Adafruit_I2C | https://github.com/adafruit/Adafruit_Python_GPIO | adafruit-gpio | See [updated I2C code](https://github.com/adafruit/Adafruit_Python_GPIO/blob/master/Adafruit_GPIO/I2C.py) in the Python GPIO library. Import with `import Adafruit_GPIO.I2C as I2C` and create an instance of `I2C.Device` instead of the old `Adafruit_I2C` class. | +| Adafruit_LEDBackpack | https://github.com/adafruit/Adafruit_Python_LED_Backpack | adafruit-led-backpack | [See new LED backpacks guide.](https://learn.adafruit.com/led-backpack-displays-on-raspberry-pi-and-beaglebone-black/overview) | +| Adafruit_LEDpixels | https://github.com/adafruit/Adafruit_Python_WS2801 | adafruit-ws2801 | - | +| Adafruit_LSM303 | https://github.com/adafruit/Adafruit_Python_LSM303 | adafruit-lsm303 | - | +| Adafruit_MCP230xx | https://github.com/adafruit/Adafruit_Python_GPIO | adafruit-gpio | See [updated MCP230xx code](https://github.com/adafruit/Adafruit_Python_GPIO/blob/master/Adafruit_GPIO/MCP230xx.py). | +| Adafruit_MCP3002 | Deprecated, see MCP3008 chip. | - | - | +| Adafruit_MCP3008 | https://github.com/adafruit/Adafruit_Python_MCP3008 | adafruit-mcp3008 | [See guide](https://learn.adafruit.com/raspberry-pi-analog-to-digital-converters). | +| Adafruit_MCP4725 | https://github.com/adafruit/Adafruit_Python_MCP4725 | adafruit-mcp4725 | [See guide](https://learn.adafruit.com/mcp4725-12-bit-dac-with-raspberry-pi/overview) | +| Adafruit_PWM_Servo_Driver | https://github.com/adafruit/Adafruit_Python_PCA9685 | adafruit-pca9685 | [See guide](https://learn.adafruit.com/adafruit-16-channel-servo-driver-with-raspberry-pi/overview) | +| Adafruit_TCS34725 | https://github.com/adafruit/Adafruit_Python_TCS34725 | adafruit-tcs34725 | - | +| Adafruit_VCNL4000 | https://github.com/adafruit/Adafruit_Python_VCNL40xx | adafruit-vcnl40xx | - | + +You might also be interested in other Python libraries which were never in this repository but are handy for talking +to other hardware: + +| Device / Guide | Library Location | `pip install` Package Name | +|----------------|------------------|----------------------------| +| [BME280 Humidity & Pressure Sensor](https://learn.adafruit.com/adafruit-bme280-humidity-barometric-pressure-temperature-sensor-breakout/overview) | https://github.com/adafruit/Adafruit_Python_BME280 | TBD | +| [BNO055 Absolute Orientation Sensor](https://learn.adafruit.com/bno055-absolute-orientation-sensor-with-raspberry-pi-and-beaglebone-black/overview) | https://github.com/adafruit/Adafruit_Python_BNO055 | adafruit-bno055 | +| [ILI9341 LCD Displays](https://learn.adafruit.com/user-space-spi-tft-python-library-ili9341-2-8/overview) | https://github.com/adafruit/Adafruit_Python_ILI9341 | adafruit-ili9341 | +| [MAX31855 Thermocouple Sensor](https://learn.adafruit.com/max31855-thermocouple-python-library/overview) | https://github.com/adafruit/Adafruit_Python_MAX31855 | adafruit-max31855 | +| [MAX9744 Class D Amplifier](https://learn.adafruit.com/adafruit-20w-stereo-audio-amplifier-class-d-max9744/overview) | https://github.com/adafruit/Adafruit_Python_MAX9744 | adafruit-max9744 | +| [MCP9808 Temperature Sensor](https://learn.adafruit.com/mcp9808-temperature-sensor-python-library/overview) | https://github.com/adafruit/Adafruit_Python_MCP9808 | adafruit-mcp9808 | +| [PN532 NFC Interface](https://learn.adafruit.com/raspberry-pi-nfc-minecraft-blocks/overview) | https://github.com/adafruit/Adafruit_Python_PN532 | adafruit-pn532 | +| [SSD1306 OLED Displays](https://learn.adafruit.com/ssd1306-oled-displays-with-raspberry-pi-and-beaglebone-black/overview) | https://github.com/adafruit/Adafruit_Python_SSD1306 | adafruit-ssd1306 | +| [TMP006 & TMP007 Temperature Sensors](https://learn.adafruit.com/tmp006-temperature-sensor-python-library/overview) | https://github.com/adafruit/Adafruit_Python_TMP | adafruit-tmp | + +## But I **need** the old code! What can I do? + +Don't worry the old Adafruit Raspberry-Pi Python code can be found in the +[legacy branch](https://github.com/adafruit/Adafruit-Raspberry-Pi-Python-Code/tree/legacy) of this repository. This is a snapshot of the old code before it +was refactored into individual libraries. **Note this legacy code will not be +maintained!** From eecd6e60cbe683b80aa0a5c14e37c450808cc88c Mon Sep 17 00:00:00 2001 From: Tony DiCola Date: Fri, 22 Apr 2016 11:48:19 -0700 Subject: [PATCH 78/79] Update README.md --- README.md | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index c2e41ed7..e345a0d0 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,16 @@ loaded all of these repositories on the [Python package index](https://pypi.pyth so they can be installed with `pip` (note that pip won't install example code so for most users it's recommended to install from source). -In addition **all** of the Python libraries below support **both** Python 2.7 and Python 3.x! +In addition **all** of the Python libraries below support **both** Python 2.7 and Python 3.x! Note +if you do plan to use Python 3 it has totally separate libraries from Python 2 so you might +need to install all the libraries you use in **both** Python 2 and 3. See this video stream +for more details: https://www.youtube.com/watch?v=rRFG32EebNc In particular on a Raspberry Pi +you probably want to install Python 3, PIP for Python 3, and the RPi.GPIO library (used +to talk to GPIO pins on the Pi) with these commands: + + sudo apt-get update + sudo apt-get install -y python3 python3-pip python-dev + sudo pip3 install rpi.gpio ## Where do I find the new Raspberry Pi Python code? From b4aeee58b670645149f6f682a6c5ac04a0a0d314 Mon Sep 17 00:00:00 2001 From: "Limor \"Ladyada\" Fried" Date: Sun, 29 Sep 2019 23:09:41 -0400 Subject: [PATCH 79/79] Update README.md --- README.md | 52 ++++------------------------------------------------ 1 file changed, 4 insertions(+), 48 deletions(-) diff --git a/README.md b/README.md index e345a0d0..501b3a75 100644 --- a/README.md +++ b/README.md @@ -12,57 +12,13 @@ loaded all of these repositories on the [Python package index](https://pypi.pyth so they can be installed with `pip` (note that pip won't install example code so for most users it's recommended to install from source). -In addition **all** of the Python libraries below support **both** Python 2.7 and Python 3.x! Note -if you do plan to use Python 3 it has totally separate libraries from Python 2 so you might -need to install all the libraries you use in **both** Python 2 and 3. See this video stream -for more details: https://www.youtube.com/watch?v=rRFG32EebNc In particular on a Raspberry Pi -you probably want to install Python 3, PIP for Python 3, and the RPi.GPIO library (used -to talk to GPIO pins on the Pi) with these commands: - - sudo apt-get update - sudo apt-get install -y python3 python3-pip python-dev - sudo pip3 install rpi.gpio - ## Where do I find the new Raspberry Pi Python code? -Here is a table with each of the old libraries and a link to their new unique -GitHub repositories and easy pip install names: - -| Old Library Name | New Library Location | New `pip install` Package Name | Notes | -|------------------|----------------------|--------------------------------|-------| -| Adafruit_ADS1x15 | https://github.com/adafruit/Adafruit_Python_ADS1X15 | adafruit-ads1x15 | [See guide](https://learn.adafruit.com/raspberry-pi-analog-to-digital-converters). | -| Adafruit_ADXL345 | https://github.com/adafruit/Adafruit_Python_ADXL345 | adafriut-adxl345 | - | -| Adafruit_BMP085 | https://github.com/adafruit/Adafruit_Python_BMP | adafruit-bmp | [See guide](https://learn.adafruit.com/using-the-bmp085-with-raspberry-pi/using-the-adafruit-bmp085-python-library). | -| Adafruit_CharLCD | https://github.com/adafruit/Adafruit_Python_CharLCD | adafruit-charlcd | [See new character LCD guide](https://learn.adafruit.com/character-lcd-with-raspberry-pi-or-beaglebone-black/overview). | -| Adafruit_CharLCDPlate | https://github.com/adafruit/Adafruit_Python_CharLCD | adafruit-charlcd | [See new character LCD guide](https://learn.adafruit.com/character-lcd-with-raspberry-pi-or-beaglebone-black/overview). | -| Adafruit_DHT_Driver | https://github.com/adafruit/Adafruit_Python_DHT | None, must be manually installed to properly compile C extension. | See the [C code for reading the DHT sensor](https://github.com/adafruit/Adafruit_Python_DHT/tree/master/source/Raspberry_Pi_2) in the updated Python driver. | -| Adafruit_DHT_Driver_Python | https://github.com/adafruit/Adafruit_Python_DHT | None, must be manually installed to properly compile C extension. | [See updated DHT sensor guide](https://learn.adafruit.com/dht-humidity-sensing-on-raspberry-pi-with-gdocs-logging/overview) | -| Adafruit_I2C | https://github.com/adafruit/Adafruit_Python_GPIO | adafruit-gpio | See [updated I2C code](https://github.com/adafruit/Adafruit_Python_GPIO/blob/master/Adafruit_GPIO/I2C.py) in the Python GPIO library. Import with `import Adafruit_GPIO.I2C as I2C` and create an instance of `I2C.Device` instead of the old `Adafruit_I2C` class. | -| Adafruit_LEDBackpack | https://github.com/adafruit/Adafruit_Python_LED_Backpack | adafruit-led-backpack | [See new LED backpacks guide.](https://learn.adafruit.com/led-backpack-displays-on-raspberry-pi-and-beaglebone-black/overview) | -| Adafruit_LEDpixels | https://github.com/adafruit/Adafruit_Python_WS2801 | adafruit-ws2801 | - | -| Adafruit_LSM303 | https://github.com/adafruit/Adafruit_Python_LSM303 | adafruit-lsm303 | - | -| Adafruit_MCP230xx | https://github.com/adafruit/Adafruit_Python_GPIO | adafruit-gpio | See [updated MCP230xx code](https://github.com/adafruit/Adafruit_Python_GPIO/blob/master/Adafruit_GPIO/MCP230xx.py). | -| Adafruit_MCP3002 | Deprecated, see MCP3008 chip. | - | - | -| Adafruit_MCP3008 | https://github.com/adafruit/Adafruit_Python_MCP3008 | adafruit-mcp3008 | [See guide](https://learn.adafruit.com/raspberry-pi-analog-to-digital-converters). | -| Adafruit_MCP4725 | https://github.com/adafruit/Adafruit_Python_MCP4725 | adafruit-mcp4725 | [See guide](https://learn.adafruit.com/mcp4725-12-bit-dac-with-raspberry-pi/overview) | -| Adafruit_PWM_Servo_Driver | https://github.com/adafruit/Adafruit_Python_PCA9685 | adafruit-pca9685 | [See guide](https://learn.adafruit.com/adafruit-16-channel-servo-driver-with-raspberry-pi/overview) | -| Adafruit_TCS34725 | https://github.com/adafruit/Adafruit_Python_TCS34725 | adafruit-tcs34725 | - | -| Adafruit_VCNL4000 | https://github.com/adafruit/Adafruit_Python_VCNL40xx | adafruit-vcnl40xx | - | - -You might also be interested in other Python libraries which were never in this repository but are handy for talking -to other hardware: +**All** of the Python libraries now support Python 3.x and a wide variety of Linux/Single Board Computers. -| Device / Guide | Library Location | `pip install` Package Name | -|----------------|------------------|----------------------------| -| [BME280 Humidity & Pressure Sensor](https://learn.adafruit.com/adafruit-bme280-humidity-barometric-pressure-temperature-sensor-breakout/overview) | https://github.com/adafruit/Adafruit_Python_BME280 | TBD | -| [BNO055 Absolute Orientation Sensor](https://learn.adafruit.com/bno055-absolute-orientation-sensor-with-raspberry-pi-and-beaglebone-black/overview) | https://github.com/adafruit/Adafruit_Python_BNO055 | adafruit-bno055 | -| [ILI9341 LCD Displays](https://learn.adafruit.com/user-space-spi-tft-python-library-ili9341-2-8/overview) | https://github.com/adafruit/Adafruit_Python_ILI9341 | adafruit-ili9341 | -| [MAX31855 Thermocouple Sensor](https://learn.adafruit.com/max31855-thermocouple-python-library/overview) | https://github.com/adafruit/Adafruit_Python_MAX31855 | adafruit-max31855 | -| [MAX9744 Class D Amplifier](https://learn.adafruit.com/adafruit-20w-stereo-audio-amplifier-class-d-max9744/overview) | https://github.com/adafruit/Adafruit_Python_MAX9744 | adafruit-max9744 | -| [MCP9808 Temperature Sensor](https://learn.adafruit.com/mcp9808-temperature-sensor-python-library/overview) | https://github.com/adafruit/Adafruit_Python_MCP9808 | adafruit-mcp9808 | -| [PN532 NFC Interface](https://learn.adafruit.com/raspberry-pi-nfc-minecraft-blocks/overview) | https://github.com/adafruit/Adafruit_Python_PN532 | adafruit-pn532 | -| [SSD1306 OLED Displays](https://learn.adafruit.com/ssd1306-oled-displays-with-raspberry-pi-and-beaglebone-black/overview) | https://github.com/adafruit/Adafruit_Python_SSD1306 | adafruit-ssd1306 | -| [TMP006 & TMP007 Temperature Sensors](https://learn.adafruit.com/tmp006-temperature-sensor-python-library/overview) | https://github.com/adafruit/Adafruit_Python_TMP | adafruit-tmp | +This library has been deprecated in favor of our python3 Blinka library. We have replaced all of the libraries that use this repo with CircuitPython libraries that are Python3 compatible, and support a wide variety of single board/linux computers!

+

Visit https://circuitpython.org/blinka for more information

+

CircuitPython has support for almost 200 different drivers, and a as well as FT232H support for Mac/Win/Linux!

## But I **need** the old code! What can I do?