j3d1/esp-open-rtos
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Update and fix

Browse source
This commit is contained in:
lilian 2016-12-19 10:54:26 +01:00
parent 9ee3ec59ab
commit b9e1472e81
2 changed files with 11 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

29
extras/ina3221/ina3221.c
View file

@ -8,7 +8,7 @@
#include "ina3221.h" #include "ina3221.h"
#ifdef INA3221_DEBUG #ifdef INA3221_DEBUG
#define debug(fmt, ...) printf("%s: " fmt "\n", "SSD1306", ## __VA_ARGS__) #define debug(fmt, ...) printf("%s: " fmt "\n", "INA3221", ## __VA_ARGS__)
#else #else
#define debug(fmt, ...) #define debug(fmt, ...)
#endif #endif
@ -107,23 +107,19 @@ int ina3221_setShuntConversionTime(ina3221_t *dev,ina3221_ct_t ct)
int ina3221_reset(ina3221_t *dev) int ina3221_reset(ina3221_t *dev)
{ {
dev->config.config_register = INA3221_DEFAULT_CONFIG ; //internal lib reset dev->config.config_register = INA3221_DEFAULT_CONFIG ; //dev reset
dev->config.mask = INA3221_DEFAULT_CONFIG ; //dev reset
dev->config.reset = 1 ; dev->config.reset = 1 ;
return _wireWriteRegister(dev->addr, INA3221_REG_CONFIG, dev->config.config_register); // send reset to device return _wireWriteRegister(dev->addr, INA3221_REG_CONFIG, dev->config.config_register); // send reset to device
} }
static int _get_raw(uint8_t addr, uint8_t reg, ina3221_channel_t channel, uint16_t *raw)
{
return _wireReadRegister(addr,reg+channel*2, raw);
}
int ina3221_getBusVoltage(ina3221_t *dev, ina3221_channel_t channel, uint32_t *voltage) int ina3221_getBusVoltage(ina3221_t *dev, ina3221_channel_t channel, uint32_t *voltage)
{ {
uint16_t raw_value ; uint16_t raw_value ;
int err = 0 ; int err = 0 ;
if ((err = _get_raw(dev->addr,INA3221_REG_BUSVOLTAGE_1, channel, &raw_value))) if ((err = _wireReadRegister(dev->addr,INA3221_REG_BUSVOLTAGE_1+channel*2, &raw_value)))
return err; return err;
*voltage = (raw_value>>3)*8 ; //mV *voltage = (raw_value>>3)*8 ; //mV 8mV step
return 0; return 0;
} }
@ -131,26 +127,21 @@ int ina3221_getShuntValue(ina3221_t *dev, ina3221_channel_t channel, uint32_t *v
{ {
uint16_t raw_value ; uint16_t raw_value ;
int err = 0 ; int err = 0 ;
if ((err = _get_raw(dev->addr,INA3221_REG_SHUNTVOLTAGE_1, channel, &raw_value))) if ((err = _wireReadRegister(dev->addr,INA3221_REG_SHUNTVOLTAGE_1+channel*2, &raw_value)))
return err; return err;
*voltage = (raw_value>>3)*40 ; //uV *voltage = (raw_value>>3)*40 ; //uV 40uV step
*current = *voltage/dev->shunt[channel] ; //mA = uV / mOhm if(dev->shunt[channel]) *current = *voltage/dev->shunt[channel] ; //mA = uV / mOhm
return 0; return 0;
} }
static int _set_raw(uint8_t addr, uint8_t reg, ina3221_channel_t channel, uint16_t raw)
{
return _wireWriteRegister(addr,reg+channel*2, raw);
}
int ina3221_setCriticalAlert(ina3221_t *dev, ina3221_channel_t channel, uint32_t current) int ina3221_setCriticalAlert(ina3221_t *dev, ina3221_channel_t channel, uint32_t current)
{ {
uint16_t raw_value = (current*dev->shunt[channel]/40)<<3 ; uint16_t raw_value = (current*dev->shunt[channel]/40)<<3 ;
return _set_raw(dev->addr,INA3221_REG_CRITICAL_ALERT_1, channel, raw_value) ; return _wireWriteRegister(dev->addr,INA3221_REG_CRITICAL_ALERT_1+channel*2, raw_value);
} }
int ina3221_setWarningAlert(ina3221_t *dev, ina3221_channel_t channel, uint32_t current) int ina3221_setWarningAlert(ina3221_t *dev, ina3221_channel_t channel, uint32_t current)
{ {
uint16_t raw_value = (current*dev->shunt[channel]/40)<<3 ; uint16_t raw_value = (current*dev->shunt[channel]/40)<<3 ;
return _set_raw(dev->addr,INA3221_REG_WARNING_ALERT_1, channel, raw_value) ; return _wireWriteRegister(dev->addr,INA3221_REG_WARNING_ALERT_1+channel*2, raw_value);
} }

2
extras/ina3221/ina3221.h
View file

@ -30,8 +30,8 @@
#define INA3221_REG_VALID_POWER_UPPER_LIMIT (0x10) #define INA3221_REG_VALID_POWER_UPPER_LIMIT (0x10)
#define INA3221_REG_VALID_POWER_LOWER_LIMIT (0x11) #define INA3221_REG_VALID_POWER_LOWER_LIMIT (0x11)
#define INA3221_DEFAULT_CONFIG (0x7127) //Default register after reset #define INA3221_DEFAULT_CONFIG (0x7127) //Default register after reset
#define INA3221_DEFAULT_MASK (0x0002)
#define INA3221_DEFAULT_POWER_UPPER_LIMIT (0x2710) //10V #define INA3221_DEFAULT_POWER_UPPER_LIMIT (0x2710) //10V
#define INA3221_DEFAULT_POWER_LOWER_LIMIT (0x2328) //9V #define INA3221_DEFAULT_POWER_LOWER_LIMIT (0x2328) //9V
/* /*