rename since there's a lot o chips

Author: ladyada

README.rst

@@ -2,9 +2,9 @@
 Introduction
 ============
 
-.. image:: https://readthedocs.org/projects/adafruit-circuitpython-ft62xx/badge/?version=latest
+.. image:: https://readthedocs.org/projects/adafruit-circuitpython-focaltouch/badge/?version=latest
 
-    :target: https://circuitpython.readthedocs.io/projects/ft62xx/en/latest/
+    :target: https://circuitpython.readthedocs.io/projects/focaltouch/en/latest/
 
     :alt: Documentation Status
 
@@ -13,7 +13,7 @@ Introduction
     :alt: Discord
 
 CircuitPython driver for common low-cost FocalTech capacitive touch chips.
-Currently supports FT6206
+Currently supports FT6206 & FT6236
 
 Dependencies
 =============
@@ -34,12 +34,12 @@ Usage Example
 	import time
 	import busio
 	import board
-	from ft62xx import adafruit_ft62xx
+	import adafruit_focaltouch
 
 	# Create library object using our Bus I2C port
 	i2c = busio.I2C(board.SCL, board.SDA)
 
-	ft = adafruit_ft62xx.Adafruit_FT6206(i2c, debug=True)
+	ft = adafruit_focaltouch.Adafruit_FT6XXX(i2c, debug=True)
 
 	while True:
 	    n = ft.touched
@@ -58,7 +58,7 @@ Contributing
 ============
 
 Contributions are welcome! Please read our `Code of Conduct
-<https://github.com/adafruit/Adafruit_CircuitPython_ft62xx/blob/master/CODE_OF_CONDUCT.md>`_
+<https://github.com/adafruit/Adafruit_CircuitPython_FocalTouch/blob/master/CODE_OF_CONDUCT.md>`_
 before contributing to help this project stay welcoming.
 
 Building locally
@@ -83,4 +83,4 @@ Then run the build:
 
 .. code-block:: shell
 
-    circuitpython-build-bundles --filename_prefix adafruit-circuitpython-ft62xx --library_location .
+    circuitpython-build-bundles --filename_prefix adafruit-circuitpython-focaltouch --library_location .

adafruit_ft62xx.py renamed to adafruit_focaltouch.py

@@ -20,7 +20,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 """
-`adafruit_ft62xx`
+`adafruit_focaltouch`
 ====================================================
 
 TODO(description)
@@ -31,7 +31,7 @@
 # imports
 
 __version__ = "0.0.0-auto.0"
-__repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_ft62xx.git"
+__repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_FocalTouch.git"
 
 try:
     import struct
@@ -45,42 +45,56 @@
 
 _FT6206_DEFAULT_I2C_ADDR = 0x38
 
-_FT6206_REG_DATA = 0x00
-_FT6206_REG_NUMTOUCHES = 0x02
-_FT6206_REG_FACTORYMODE = 0x40
-_FT6206_REG_THRESHHOLD = 0x80
-_FT6206_REG_POINTRATE = 0x88
-_FT6206_REG_FIRMVERS = 0xA6
-_FT6206_REG_CHIPID = 0xA3
-_FT6206_REG_VENDID = 0xA8
-
-class Adafruit_FT6206:
+_FT6XXX_REG_DATA = 0x00
+_FT6XXX_REG_NUMTOUCHES = 0x02
+_FT6XXX_REG_THRESHHOLD = 0x80
+_FT6XXX_REG_POINTRATE = 0x88
+_FT6XXX_REG_LIBH = 0xA1
+_FT6XXX_REG_LIBL = 0xA2
+_FT6XXX_REG_CHIPID = 0xA3
+_FT6XXX_REG_FIRMVERS = 0xA6
+_FT6XXX_REG_VENDID = 0xA8
+_FT6XXX_REG_RELEASE = 0xAF
+
+class Adafruit_FocalTouch:
     """
     A driver for the FocalTech capacitive touch sensor.
     """
 
     _debug = False
+    chip = None
 
     def __init__(self, i2c, address=_FT6206_DEFAULT_I2C_ADDR, debug=False):
         self._i2c = I2CDevice(i2c, address)
         self._debug = debug
 
-        if self._read(_FT6206_REG_VENDID, 1)[0] != 17 or self._read(_FT6206_REG_CHIPID, 1)[0] != 6:
-            raise RuntimeError("Did not find FT6206 chip")
+        chip_data = self._read(_FT6XXX_REG_LIBH, 9)
+        lib_ver, chip_id, g_mode, pwr_mode, firm_id, skip, vend_id = struct.unpack('>HBBBBBB', chip_data)
+
+        if vend_id != 0x11:
+            raise RuntimeError("Did not find FT chip")
+
+        if chip_id == 0x06:
+            chip = "FT6206"
+        elif chip_id == 0x64:
+            chip = "FT6236"
 
         if debug:
-            print("Firmware vers %d" % self._read(_FT6206_REG_FIRMVERS, 1)[0])
-            print("Point rate %d Hz" % self._read(_FT6206_REG_POINTRATE, 1)[0])
-            print("Thresh %d" % self._read(_FT6206_REG_THRESHHOLD, 1)[0])
+            print("Library vers %04X" % lib_ver)
+            print("Firmware ID %02X" % firm_id)
+            print("Point rate %d Hz" % self._read(_FT6XXX_REG_POINTRATE, 1)[0])
+            print("Thresh %d" % self._read(_FT6XXX_REG_THRESHHOLD, 1)[0])
+            
+
 
     @property
     def touched(self):
-         return self._read(_FT6206_REG_NUMTOUCHES, 1)[0]
+         return self._read(_FT6XXX_REG_NUMTOUCHES, 1)[0]
 
     @property
     def touches(self):
         touchpoints = []
-        data = self._read(_FT6206_REG_DATA, 32)
+        data = self._read(_FT6XXX_REG_DATA, 32)
 
         for t in range(2):
             point_data = data[t*6+3 : t*6+9]

api.rst

@@ -1,5 +1,5 @@
 
 .. If you created a package, create one automodule per module in the package.
 
-.. automodule:: adafruit_ft62xx
+.. automodule:: adafruit_focaltouch
    :members:

conf.py

@@ -31,7 +31,7 @@
 master_doc = 'README'
 
 # General information about the project.
-project = u'Adafruit ft62xx Library'
+project = u'Adafruit FocalTouch Library'
 copyright = u'2017 ladyada'
 author = u'ladyada'
 
@@ -96,7 +96,7 @@
 html_static_path = ['_static']
 
 # Output file base name for HTML help builder.
-htmlhelp_basename = 'AdafruitFt62xxLibrarydoc'
+htmlhelp_basename = 'AdafruitFocalTouchLibrarydoc'
 
 # -- Options for LaTeX output ---------------------------------------------
 
@@ -122,7 +122,7 @@
 # (source start file, target name, title,
 #  author, documentclass [howto, manual, or own class]).
 latex_documents = [
-    (master_doc, 'Adafruitft62xxLibrary.tex', u'Adafruitft62xx Library Documentation',
+    (master_doc, 'AdafruitFocalTouchLibrary.tex', u'AdafruitFocalTouch Library Documentation',
      author, 'manual'),
 ]
 
@@ -131,7 +131,7 @@
 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
 man_pages = [
-    (master_doc, 'Adafruitft62xxlibrary', u'Adafruit ft62xx Library Documentation',
+    (master_doc, 'AdafruitFocalTouchlibrary', u'Adafruit FocalTouch Library Documentation',
      [author], 1)
 ]
 
@@ -141,7 +141,7 @@
 # (source start file, target name, title, author,
 #  dir menu entry, description, category)
 texinfo_documents = [
-    (master_doc, 'Adafruitft62xxLibrary', u'Adafruit ft62xx Library Documentation',
-     author, 'Adafruitft62xxLibrary', 'One line description of project.',
+    (master_doc, 'AdafruitFocalTouchLibrary', u'Adafruit FocalTouch Library Documentation',
+     author, 'AdafruitFocalTouchLibrary', 'One line description of project.',
      'Miscellaneous'),
 ]

examples/print_touches.py

@@ -1,12 +1,12 @@
 import time
 import busio
 import board
-import adafruit_ft62xx
+import adafruit_focaltouch
 
 # Create library object using our Bus I2C port
 i2c = busio.I2C(board.SCL, board.SDA)
 
-ft = adafruit_ft62xx.Adafruit_FT6206(i2c, debug=False)
+ft = adafruit_focaltouch.Adafruit_FocalTouch(i2c, debug=True)
 
 while True:
     n = ft.touched

examples/simple_paint.py

@@ -4,7 +4,7 @@
 import busio
 import board
 import digitalio
-from ft62xx import adafruit_ft62xx
+import adafruit_focaltouch
 
 # Create library object using our Bus I2C & SPI port
 i2c = busio.I2C(board.SCL, board.SDA)
@@ -20,7 +20,7 @@
 # Fill with black!
 display.fill(color565(0, 0, 0))
 
-ft = adafruit_ft62xx.Adafruit_FT6206(i2c)
+ft = adafruit_focaltouch.Adafruit_FocalTouch(i2c)
 
 while True:
     if ft.touched: