BAP TUDelft / ADS1015

Library for the ADS1015 and ADS1115 ADCS

Fork of ADS1015 by Momo-Medical

Diff: Adafruit_ADS1015.cpp

Revision:
10:da5d0da65437
Parent:
8:bf2e64504294
Child:
12:b8485d232bf8
diff -r bf2e64504294 -r da5d0da65437 Adafruit_ADS1015.cpp
--- a/Adafruit_ADS1015.cpp	Mon Jun 12 09:50:50 2017 +0000
+++ b/Adafruit_ADS1015.cpp	Mon Aug 28 10:15:58 2017 +0000
@@ -148,12 +148,12 @@
     writeRegister(m_i2cAddress, ADS1015_REG_POINTER_CONFIG, config);
 
     // Wait for the conversion to complete
-    //wait_us(m_conversionDelay);
+    wait_us(m_conversionDelay);
 
     // Read the conversion results
     // Shift 12-bit results right 4 bits for the ADS1015
-    //return readRegister(m_i2cAddress, ADS1015_REG_POINTER_CONVERT) >> m_bitShift;
-    return 1;
+    return readRegister(m_i2cAddress, ADS1015_REG_POINTER_CONVERT) >> m_bitShift;
+//    return 1;
 }
 
 /**************************************************************************/