hisyam fs
update data rate, jadi 860SPS. Belum ditest
Diff: Adafruit_ADS1015.cpp
- Revision:
- 7:653f782ce3aa
- Parent:
- 6:441bc773778a
--- a/Adafruit_ADS1015.cpp Mon Feb 25 15:50:05 2019 +0000
+++ b/Adafruit_ADS1015.cpp Tue Mar 12 13:38:55 2019 +0000
@@ -3,28 +3,28 @@
@file Adafruit_ADS1015.cpp
@author K.Townsend (Adafruit Industries)
@license BSD (see LICENSE.txt)
-
+
Ported to mbed by Arve Seljebu - arve0.github.io
-
+
Driver for the ADS1015/ADS1115 ADC
-
+
This is a library for the Adafruit MPL115A2 breakout
----> https://www.adafruit.com/products/1083
-
+
Adafruit invests time and resources providing this open source code,
please support Adafruit and open-source hardware by purchasing
products from Adafruit!
-
+
@section HISTORY
-
+
v1.0 - First release
v1.1.1 - Ported to mbed
*/
/**************************************************************************/
-
+
#include <mbed.h>
-#include "Adafruit_ADS1015.h"
-
+#include "Adafruit_ADS1015.h "
+
/**************************************************************************/
/*!
@brief Writes 16-bits to the specified destination register
@@ -38,7 +38,7 @@
cmd[2] = (char)(value & 0xFF);
m_i2c->write(i2cAddress, cmd, 3);
}
-
+
/**************************************************************************/
/*!
@brief Reads 16-bits from the specified register
@@ -48,11 +48,11 @@
{
char data[2];
data[0] = reg; // temporary use this to send address to conversion register
- m_i2c->write(i2cAddress, data, 1);
+ m_i2c->write(i2cAddress, data, 1, 1); // no stop
m_i2c->read(i2cAddress, data, 2);
return (data[0] << 8 | data [1]);
}
-
+
/**************************************************************************/
/*!
@brief Instantiates a new ADS1015 class w/appropriate properties
@@ -62,13 +62,12 @@
{
// shift 7 bit address 1 left: read expects 8 bit address, see I2C.h
m_i2cAddress = i2cAddress << 1;
- m_conversionDelay = ADS1015_CONVERSIONDELAY;
+ m_conversionDelay = ADS1115_CONVERSIONDELAY_860SPS;
m_bitShift = 4;
m_gain = GAIN_TWOTHIRDS; /* +/- 6.144V range (limited to VDD +0.3V max!) */
-// m_gain = GAIN_TWO; /* +/- 2.048V range (limited to VDD +0.3V max!) */
m_i2c = i2c;
}
-
+
/**************************************************************************/
/*!
@brief Instantiates a new ADS1115 class w/appropriate properties
@@ -78,13 +77,12 @@
{
// shift 7 bit address 1 left: read expects 8 bit address, see mbed's I2C.h
m_i2cAddress = i2cAddress << 1;
- m_conversionDelay = ADS1115_CONVERSIONDELAY;
+ m_conversionDelay = ADS1115_CONVERSIONDELAY_860SPS;
m_bitShift = 0;
m_gain = GAIN_TWOTHIRDS; /* +/- 6.144V range (limited to VDD +0.3V max!) */
-// m_gain = GAIN_TWO; /* +/- 2.048V range (limited to VDD +0.3V max!) */
m_i2c = i2c;
}
-
+
/**************************************************************************/
/*!
@brief Sets the gain and input voltage range
@@ -94,7 +92,7 @@
{
m_gain = gain;
}
-
+
/**************************************************************************/
/*!
@brief Gets a gain and input voltage range
@@ -104,7 +102,7 @@
{
return m_gain;
}
-
+
/**************************************************************************/
/*!
@brief Gets a single-ended ADC reading from the specified channel
@@ -115,18 +113,18 @@
if (channel > 3) {
return 0;
}
-
+
// Start with default values
uint16_t config = ADS1015_REG_CONFIG_CQUE_NONE | // Disable the comparator (default val)
ADS1015_REG_CONFIG_CLAT_NONLAT | // Non-latching (default val)
ADS1015_REG_CONFIG_CPOL_ACTVLOW | // Alert/Rdy active low (default val)
ADS1015_REG_CONFIG_CMODE_TRAD | // Traditional comparator (default val)
- ADS1015_REG_CONFIG_DR_1600SPS | // 1600(ADS1015) or 250(ADS1115) samples per second (default)
+ ADS1115_REG_CONFIG_DR_860SPS | // 860 Samples per Second, ADS1115
ADS1015_REG_CONFIG_MODE_SINGLE; // Single-shot mode (default)
-
+
// Set PGA/voltage range
config |= m_gain;
-
+
// Set single-ended input channel
switch (channel) {
case (0):
@@ -142,21 +140,21 @@
config |= ADS1015_REG_CONFIG_MUX_SINGLE_3;
break;
}
-
+
// Set 'start single-conversion' bit
config |= ADS1015_REG_CONFIG_OS_SINGLE;
-
+
// Write config register to the ADC
writeRegister(m_i2cAddress, ADS1015_REG_POINTER_CONFIG, config);
-
+
// Wait for the conversion to complete
wait_ms(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 readRegister(m_i2cAddress, ADS1015_REG_POINTER_CONVERT);
}
-
+
/**************************************************************************/
/*!
@brief Reads the conversion results, measuring the voltage
@@ -174,22 +172,22 @@
ADS1015_REG_CONFIG_CMODE_TRAD | // Traditional comparator (default val)
ADS1015_REG_CONFIG_DR_1600SPS | // 1600(ADS1015) or 250(ADS1115) samples per second (default)
ADS1015_REG_CONFIG_MODE_SINGLE; // Single-shot mode (default)
-
+
// Set PGA/voltage range
config |= m_gain;
-
+
// Set channels
config |= ADS1015_REG_CONFIG_MUX_DIFF_0_1; // AIN0 = P, AIN1 = N
-
+
// Set 'start single-conversion' bit
config |= ADS1015_REG_CONFIG_OS_SINGLE;
-
+
// Write config register to the ADC
writeRegister(m_i2cAddress, ADS1015_REG_POINTER_CONFIG, config);
-
+
// Wait for the conversion to complete
wait_ms(m_conversionDelay);
-
+
// Read the conversion results
uint16_t res = readRegister(m_i2cAddress, ADS1015_REG_POINTER_CONVERT) >> m_bitShift;
if (m_bitShift == 0) {
@@ -204,7 +202,7 @@
return (int16_t)res;
}
}
-
+
/**************************************************************************/
/*!
@brief Reads the conversion results, measuring the voltage
@@ -222,22 +220,22 @@
ADS1015_REG_CONFIG_CMODE_TRAD | // Traditional comparator (default val)
ADS1015_REG_CONFIG_DR_1600SPS | // 1600(ADS1015) or 250(ADS1115) samples per second (default)
ADS1015_REG_CONFIG_MODE_SINGLE; // Single-shot mode (default)
-
+
// Set PGA/voltage range
config |= m_gain;
-
+
// Set channels
config |= ADS1015_REG_CONFIG_MUX_DIFF_2_3; // AIN2 = P, AIN3 = N
-
+
// Set 'start single-conversion' bit
config |= ADS1015_REG_CONFIG_OS_SINGLE;
-
+
// Write config register to the ADC
writeRegister(m_i2cAddress, ADS1015_REG_POINTER_CONFIG, config);
-
+
// Wait for the conversion to complete
wait_ms(m_conversionDelay);
-
+
// Read the conversion results
uint16_t res = readRegister(m_i2cAddress, ADS1015_REG_POINTER_CONVERT) >> m_bitShift;
if (m_bitShift == 0) {
@@ -252,13 +250,13 @@
return (int16_t)res;
}
}
-
+
/**************************************************************************/
/*!
@brief Sets up the comparator to operate in basic mode, causing the
ALERT/RDY pin to assert (go from high to low) when the ADC
value exceeds the specified threshold.
-
+
This will also set the ADC in continuous conversion mode.
*/
/**************************************************************************/
@@ -272,10 +270,10 @@
ADS1015_REG_CONFIG_DR_1600SPS | // 1600(ADS1015) or 250(ADS1115) samples per second (default)
ADS1015_REG_CONFIG_MODE_CONTIN | // Continuous conversion mode
ADS1015_REG_CONFIG_MODE_CONTIN; // Continuous conversion mode
-
+
// Set PGA/voltage range
config |= m_gain;
-
+
// Set single-ended input channel
switch (channel) {
case (0):
@@ -291,15 +289,15 @@
config |= ADS1015_REG_CONFIG_MUX_SINGLE_3;
break;
}
-
+
// Set the high threshold register
// Shift 12-bit results left 4 bits for the ADS1015
writeRegister(m_i2cAddress, ADS1015_REG_POINTER_HITHRESH, threshold << m_bitShift);
-
+
// Write config register to the ADC
writeRegister(m_i2cAddress, ADS1015_REG_POINTER_CONFIG, config);
}
-
+
/**************************************************************************/
/*!
@brief In order to clear the comparator, we need to read the
@@ -311,7 +309,7 @@
{
// Wait for the conversion to complete
wait_ms(m_conversionDelay);
-
+
// Read the conversion results
uint16_t res = readRegister(m_i2cAddress, ADS1015_REG_POINTER_CONVERT) >> m_bitShift;
if (m_bitShift == 0) {