diff options
| -rw-r--r-- | include/driver/ads111x.h | 3 | ||||
| -rw-r--r-- | src/driver/ads111x.cc | 10 |
2 files changed, 9 insertions, 4 deletions
diff --git a/include/driver/ads111x.h b/include/driver/ads111x.h index f25dcde..54cd876 100644 --- a/include/driver/ads111x.h +++ b/include/driver/ads111x.h @@ -8,6 +8,8 @@ #ifndef ADS111x_H #define ADS111x_H +#include <stdint.h> + class ADS111x { private: ADS111x(const ADS111x ©); @@ -80,6 +82,7 @@ class ADS111x { }; void configure(unsigned short config); + int16_t readRaw(); float readVoltage(); }; diff --git a/src/driver/ads111x.cc b/src/driver/ads111x.cc index 53be2a4..5d9ed41 100644 --- a/src/driver/ads111x.cc +++ b/src/driver/ads111x.cc @@ -12,8 +12,6 @@ #include "driver/soft_i2c.h" #endif -#include <stdint.h> - void ADS111x::configure(unsigned short config) { txbuf[0] = P_CONFIG; @@ -43,14 +41,18 @@ void ADS111x::configure(unsigned short config) } } -float ADS111x::readVoltage() +int16_t ADS111x::readRaw() { txbuf[0] = P_CONVERSION; i2c.xmit(address, 1, txbuf, 2, rxbuf); int16_t intermediate = ((int8_t)rxbuf[0]) * 256 + (uint8_t) rxbuf[1]; + return intermediate; +} - return intermediate * 0.256 / 0x7fff * fsr_scale; +float ADS111x::readVoltage() +{ + return readRaw() * 0.256 / 0x7fff * fsr_scale; } ADS111x ads111x(0x48); |