From 16478e9d0bc86be82ecd6de4ac3cdb9eb2c86843 Mon Sep 17 00:00:00 2001 From: alanbjohnston Date: Wed, 24 Jul 2019 03:49:55 -0400 Subject: [PATCH] reverted removal of wireReadRegister --- afsk/main.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/afsk/main.c b/afsk/main.c index 1d6af9d2..9ef41aa5 100644 --- a/afsk/main.c +++ b/afsk/main.c @@ -35,7 +35,7 @@ #include #include #include -#include "Adafruit_INA219.h" // From Adafruit INA219 library for Arduino +#include "../Adafruit_INA219/Adafruit_INA219.h" // From Adafruit INA219 library for Arduino #define A 1 #define B 2 @@ -117,11 +117,8 @@ struct SensorData read_sensor_data(struct SensorConfig sensor) { int twos = twosToInt(valuec1, 16); // currently doesn't read negative currents correctly float valuec3 = (float)(twos); data.current = valuec3 / (float)sensor.currentDivider; -// uint16_t value2 = (uint16_t)wiringPiI2CReadReg16(sensor.fd, INA219_REG_BUSVOLTAGE); -// data.voltage = ((double)(value2 >> 3) * 4) / 1000; - valuec1 = wiringPiI2CReadReg16(sensor.fd, INA219_REG_BUSVOLTAGE); - data.voltage = ((double)((uint16_t)valuec1 >> 3) * 4) / 1000; - + uint16_t value2 = (uint16_t)wireReadRegister(sensor.fd, INA219_REG_BUSVOLTAGE); + data.voltage = ((double)(value2 >> 3) * 4) / 1000; data.power = (float)((uint16_t)wiringPiI2CReadReg16(sensor.fd, INA219_REG_POWER)) * (float)sensor.powerMultiplier; return data;