From 91fbe68b7841c628398fb8dfa409914a3689381a Mon Sep 17 00:00:00 2001
From: Jerry Needell <jerryneedell@gmail.com>
Date: Wed, 28 Aug 2019 22:06:36 -0400
Subject: [PATCH]  fix read_adc_raw, update lis3dh_adc example

---
 adafruit_lis3dh.py     |  6 +++---
 examples/lis3dh_adc.py | 36 +++++++++++++++++++-----------------
 2 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/adafruit_lis3dh.py b/adafruit_lis3dh.py
index 873486e..5cd2318 100755
--- a/adafruit_lis3dh.py
+++ b/adafruit_lis3dh.py
@@ -203,7 +203,8 @@ def read_adc_raw(self, adc):
         if adc < 1 or adc > 3:
             raise ValueError('ADC must be a value 1 to 3!')
 
-        return struct.unpack('<h', self._read_register((_REG_OUTADC1_L+((adc-1)*2)) | 0x80, 2))[0]
+        return struct.unpack('<h',
+                             self._read_register((_REG_OUTADC1_L+((adc-1)*2)) | 0x80, 2)[0:2])[0]
 
     def read_adc_mV(self, adc): # pylint: disable=invalid-name
         """Read the specified analog to digital converter value in millivolts.
@@ -280,8 +281,7 @@ def set_tap(self, tap, threshold, *,
             self._write_register_byte(_REG_CTRL3, ctrl3 & ~(0x80))  # Turn off I1_CLICK.
             self._write_register_byte(_REG_CLICKCFG, 0)
             return
-        else:
-            self._write_register_byte(_REG_CTRL3, ctrl3 | 0x80)  # Turn on int1 click output
+        self._write_register_byte(_REG_CTRL3, ctrl3 | 0x80)  # Turn on int1 click output
 
         if click_cfg is None:
             if tap == 1:
diff --git a/examples/lis3dh_adc.py b/examples/lis3dh_adc.py
index 1011766..edc169f 100644
--- a/examples/lis3dh_adc.py
+++ b/examples/lis3dh_adc.py
@@ -1,30 +1,32 @@
 # Analog to digital converter example.
 # Will loop forever printing ADC channel 1 raw and mV values every second.
-# Open the serial port after running to see the output printed.
-# NOTE the ADC can only read voltages in the range of ~900mV to 1200mV!
-# Author: Tony DiCola
+# NOTE the ADC can only read voltages in the range of ~900mV to 1800mV!
+
 import time
 import board
 import busio
 import adafruit_lis3dh
+# Uncomment if using SPI
+#import digitalio
 
 
-# Uncomment _one_ of the hardware setups below depending on your wiring:
-
-# Hardware I2C setup:
-i2c = busio.I2C(board.SCL, board.SDA)
-lis3dh = adafruit_lis3dh.LIS3DH_I2C(i2c)
-
-# Software I2C setup:
-#import bitbangio
-#i2c = bitbangio.I2C(board.SCL, board.SDA)
-#lis3dh = adafruit_lis3dh.LIS3DH_I2C(i2c)
+# Hardware I2C setup. Use the CircuitPlayground built-in accelerometer if available;
+# otherwise check I2C pins.
+if hasattr(board, 'ACCELEROMETER_SCL'):
+    i2c = busio.I2C(board.ACCELEROMETER_SCL, board.ACCELEROMETER_SDA)
+    lis3dh = adafruit_lis3dh.LIS3DH_I2C(i2c, address=0x19)
+else:
+    i2c = busio.I2C(board.SCL, board.SDA)
+    lis3dh = adafruit_lis3dh.LIS3DH_I2C(i2c)
 
 # Hardware SPI setup:
-#import busio
-#spi = busio.SPI(board.SCK, board.MOSI, board.MISO)
-#cs = busio.DigitalInOut(board.D6)  # Set to appropriate CS pin!
-#lis3dh = adafruit_lis3dh.LIS3DH_SPI(spi, cs)
+# spi = busio.SPI(board.SCK, board.MOSI, board.MISO)
+# cs = digitalio.DigitalInOut(board.D5)  # Set to correct CS pin!
+# lis3dh = adafruit_lis3dh.LIS3DH_SPI(spi, cs)
+
+#PyGamer I2C Setup:
+#i2c = busio.I2C(board.SCL, board.SDA)
+#lis3dh = adafruit_lis3dh.LIS3DH_I2C(i2c, address=0x19)
 
 
 # Loop forever printing ADC readings.