Mirrors/espurna
2
0
Fork 0
mirror of https://github.com/xoseperez/espurna.git synced 2026-03-12 19:27:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove code for I2Cdevlib-ADS1115

Browse Source
This commit is contained in:
Xose Pérez
2017-12-17 17:37:04 +01:00
parent d26f875763
commit cf27d853cb
4 changed files with 55 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
code/espurna/config/prototypes.h
View File

@@ -78,9 +78,6 @@ template<typename T> bool idbSend(const char * topic, unsigned char id, T payloa
#if DS18B20_SUPPORT
#include <OneWire.h>
#endif
#if EMON_ADS1X15_SUPPORT & EMON_ADS1X15_USE_I2CDEVLIB
#include <ADS1115.h>
#endif
// -----------------------------------------------------------------------------
// Utils

4
code/espurna/config/sensors.h
View File

@@ -186,11 +186,9 @@
//--------------------------------------------------------------------------------
#ifndef EMON_ADS1X15_SUPPORT
#define EMON_ADS1X15_SUPPORT 1 // Do not build support by default
#define EMON_ADS1X15_SUPPORT 0 // Do not build support by default
#endif
#define EMON_ADS1X15_USE_I2CDEVLIB 0 // Use I2CDevLib
#define EMON_ADS1X15_ADS1115 1 // 0 for ADS10115, 1 for ADS1115
#define EMON_ADS1X15_PORT_MASK 0x08 // A0=1 A1=2 A2=4 A4=8
#define EMON_ADS1X15_I2C_ADDRESS 0x48 // I2C address of the ADS1115

140
code/espurna/sensors/EmonADS1X15Sensor.h
View File

@@ -8,14 +8,10 @@
#include "BaseSensor.h"
#include "EmonSensor.h"
#if EMON_ADS1X15_USE_I2CDEVLIB
#include <ADS1115.h>
#if I2C_USE_BRZO
#include <brzo_i2c.h>
#else
#if I2C_USE_BRZO
#include <brzo_i2c.h>
#else
#include <Wire.h>
#endif
#include <Wire.h>
#endif
#define ADS1015_CONVERSIONDELAY (1)
@@ -112,9 +108,6 @@ class EmonADS1X15Sensor : public EmonSensor {
}
_count = _ports * EMON_ADS1X15_MAGNITUDES_PER_PORT;
// initialize
init();
// warmup
warmup();
@@ -206,80 +199,62 @@ class EmonADS1X15Sensor : public EmonSensor {
// I2C
//----------------------------------------------------------------------
void init() {
#if EMON_ADS1X15_USE_I2CDEVLIB
_ads = new ADS1115(_address);
_ads->initialize();
_ads->setMode(ADS1115_MODE_CONTINUOUS);
_ads->setRate(ADS1115_RATE_860);
_ads->setGain(ADS1115_PGA_4P096);
#endif
}
#if EMON_ADS1X15_USE_I2CDEVLIB == 0
void setConfigRegistry(unsigned char channel, bool continuous, bool start) {
// Start with default values
uint16_t config = 0;
config |= ADS1X15_REG_CONFIG_PGA_4_096V; // Set PGA/voltage range (0x0200)
config |= ADS1X15_REG_CONFIG_DR_MASK; // Always at max speed (0x00E0)
//config |= ADS1X15_REG_CONFIG_CMODE_TRAD; // Traditional comparator (default val) (0x0000)
//config |= ADS1X15_REG_CONFIG_CPOL_ACTVLOW; // Alert/Rdy active low (default val) (0x0000)
//config |= ADS1X15_REG_CONFIG_CLAT_NONLAT; // Non-latching (default val) (0x0000)
config |= ADS1X15_REG_CONFIG_CQUE_NONE; // Disable the comparator (default val) (0x0003)
if (start) {
config |= ADS1X15_REG_CONFIG_OS_SINGLE; // Start a single-conversion (0x8000)
}
if (continuous) {
//config |= ADS1X15_REG_CONFIG_MODE_CONTIN; // Continuous mode (default) (0x0000)
} else {
config |= ADS1X15_REG_CONFIG_MODE_SINGLE; // Single-shot mode (0x0100)
}
config |= ((channel + 4) << 12); // Set single-ended input channel (0x4000 - 0x7000)
#if EMON_DEBUG
Serial.printf("[EMON] ADS1X115 Config Registry: %04X\n", config);
#endif
// Write config register to the ADC
#if I2C_USE_BRZO
uint8_t buffer[3];
buffer[0] = ADS1X15_REG_POINTER_CONFIG;
buffer[1] = config >> 8;
buffer[2] = config & 0xFF;
brzo_i2c_start_transaction(_address, I2C_SCL_FREQUENCY);
brzo_i2c_write(buffer, 3, false);
brzo_i2c_end_transaction();
#else
Wire.beginTransmission(_address);
Wire.write((uint8_t) ADS1X15_REG_POINTER_CONFIG);
Wire.write((uint8_t) (config >> 8));
Wire.write((uint8_t) (config & 0xFF));
Wire.endTransmission();
#endif
void setConfigRegistry(unsigned char channel, bool continuous, bool start) {
// Start with default values
uint16_t config = 0;
config |= ADS1X15_REG_CONFIG_PGA_4_096V; // Set PGA/voltage range (0x0200)
config |= ADS1X15_REG_CONFIG_DR_MASK; // Always at max speed (0x00E0)
//config |= ADS1X15_REG_CONFIG_CMODE_TRAD; // Traditional comparator (default val) (0x0000)
//config |= ADS1X15_REG_CONFIG_CPOL_ACTVLOW; // Alert/Rdy active low (default val) (0x0000)
//config |= ADS1X15_REG_CONFIG_CLAT_NONLAT; // Non-latching (default val) (0x0000)
config |= ADS1X15_REG_CONFIG_CQUE_NONE; // Disable the comparator (default val) (0x0003)
if (start) {
config |= ADS1X15_REG_CONFIG_OS_SINGLE; // Start a single-conversion (0x8000)
}
if (continuous) {
//config |= ADS1X15_REG_CONFIG_MODE_CONTIN; // Continuous mode (default) (0x0000)
} else {
config |= ADS1X15_REG_CONFIG_MODE_SINGLE; // Single-shot mode (0x0100)
}
config |= ((channel + 4) << 12); // Set single-ended input channel (0x4000 - 0x7000)
#endif
#if EMON_DEBUG
Serial.printf("[EMON] ADS1X115 Config Registry: %04X\n", config);
#endif
// Write config register to the ADC
#if I2C_USE_BRZO
uint8_t buffer[3];
buffer[0] = ADS1X15_REG_POINTER_CONFIG;
buffer[1] = config >> 8;
buffer[2] = config & 0xFF;
brzo_i2c_start_transaction(_address, I2C_SCL_FREQUENCY);
brzo_i2c_write(buffer, 3, false);
brzo_i2c_end_transaction();
#else
Wire.beginTransmission(_address);
Wire.write((uint8_t) ADS1X15_REG_POINTER_CONFIG);
Wire.write((uint8_t) (config >> 8));
Wire.write((uint8_t) (config & 0xFF));
Wire.endTransmission();
#endif
}
double getCurrent(unsigned char channel) {
#if EMON_ADS1X15_USE_I2CDEVLIB
_ads->setMultiplexer(channel + 4);
#else
// Force stop by setting single mode and back to continuous
static unsigned char previous = 9;
if (previous != channel) {
setConfigRegistry(channel, true, false);
setConfigRegistry(channel, false, false);
setConfigRegistry(channel, false, true);
delay(10);
readADC(channel);
previous = channel;
}
setConfigRegistry(channel, true, true);
#endif
// Force stop by setting single mode and back to continuous
static unsigned char previous = 9;
if (previous != channel) {
setConfigRegistry(channel, true, false);
setConfigRegistry(channel, false, false);
setConfigRegistry(channel, false, true);
delay(10);
readADC(channel);
previous = channel;
}
setConfigRegistry(channel, true, true);
return read(channel, _pivot[channel]);
@@ -289,10 +264,7 @@ class EmonADS1X15Sensor : public EmonSensor {
unsigned int value = 0;
#if EMON_ADS1X15_USE_I2CDEVLIB
value = _ads->getConversion();
#elif I2C_USE_BRZO
#if I2C_USE_BRZO
uint8_t buffer[3];
buffer[0] = ADS1X15_REG_POINTER_CONVERT;
brzo_i2c_start_transaction(_address, I2C_SCL_FREQUENCY);
@@ -319,10 +291,6 @@ class EmonADS1X15Sensor : public EmonSensor {
}
#if EMON_ADS1X15_USE_I2CDEVLIB
ADS1115 * _ads;
#endif
bool _is_ads1115 = true;
unsigned char _address;
unsigned char _mask;

1
code/platformio.ini
View File

@@ -21,7 +21,6 @@ lib_deps =
NtpClientLib
OneWire
Brzo I2C
I2Cdevlib-ADS1115
EspSoftwareSerial
https://bitbucket.org/xoseperez/justwifi.git#1.1.4
https://bitbucket.org/xoseperez/hlw8012.git#1.1.0