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

Merge branch 'master' into lvgl

Browse source
This commit is contained in:
zaltora 2018-10-07 12:01:25 +02:00
commit 20b0b22cb0
3 changed files with 31 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
core/sysparam.c
View file

@ -606,9 +606,9 @@ sysparam_status_t sysparam_create_area(uint32_t base_addr, uint16_t num_sectors,
if (!force) { if (!force) {
// First, scan through the area and make sure it's actually empty and // First, scan through the area and make sure it's actually empty and
// we're not going to be clobbering something else important. // we're not going to be clobbering something else important.
for (addr = base_addr; addr < base_addr + region_size * 2; addr += SCAN_BUFFER_SIZE) { for (addr = base_addr; addr < base_addr + region_size * 2; addr += SCAN_BUFFER_SIZE * sizeof(uint32_t)) {
debug(3, "read %d words @ 0x%08x", SCAN_BUFFER_SIZE, addr); debug(3, "read %d words @ 0x%08x", SCAN_BUFFER_SIZE, addr);
CHECK_FLASH_OP(spiflash_read(addr, (uint8_t*)buffer, SCAN_BUFFER_SIZE * 4)); CHECK_FLASH_OP(spiflash_read(addr, (uint8_t*)buffer, SCAN_BUFFER_SIZE * sizeof(uint32_t)));
for (i = 0; i < SCAN_BUFFER_SIZE; i++) { for (i = 0; i < SCAN_BUFFER_SIZE; i++) {
if (buffer[i] != 0xffffffff) { if (buffer[i] != 0xffffffff) {
// Uh oh, not empty. // Uh oh, not empty.

12
extras/ads111x/ads111x.c
View file

@ -93,6 +93,18 @@ int16_t ads111x_get_value(i2c_dev_t *dev)
return read_reg(dev, REG_CONVERSION); return read_reg(dev, REG_CONVERSION);
} }
int16_t ads101x_get_value(i2c_dev_t *dev)
{
uint16_t res = read_reg(dev, REG_CONVERSION) >> 4;
if (res > 0x07FF)
{
// negative number - extend the sign to 16th bit
res |= 0xF000;
}
return (int16_t)res;
}
ads111x_gain_t ads111x_get_gain(i2c_dev_t *dev) ads111x_gain_t ads111x_get_gain(i2c_dev_t *dev)
{ {
return read_conf_bits(dev, PGA_OFFSET, PGA_MASK); return read_conf_bits(dev, PGA_OFFSET, PGA_MASK);

17
extras/ads111x/ads111x.h
View file

@ -22,6 +22,16 @@ extern "C" {
#define ADS111X_ADDR_SCL 0x4b #define ADS111X_ADDR_SCL 0x4b
#define ADS111X_MAX_VALUE 0x7fff #define ADS111X_MAX_VALUE 0x7fff
#define ADS101X_MAX_VALUE 0x7ff
// ADS101X overrides
#define ADS101X_DATA_RATE_128 ADS111X_DATA_RATE_8
#define ADS101X_DATA_RATE_250 ADS111X_DATA_RATE_16
#define ADS101X_DATA_RATE_490 ADS111X_DATA_RATE_32
#define ADS101X_DATA_RATE_920 ADS111X_DATA_RATE_64
#define ADS101X_DATA_RATE_1600 ADS111X_DATA_RATE_128
#define ADS101X_DATA_RATE_2400 ADS111X_DATA_RATE_250
#define ADS101X_DATA_RATE_3300 ADS111X_DATA_RATE_475
/** /**
* Gain amplifier * Gain amplifier
@ -140,6 +150,13 @@ void ads111x_start_conversion(i2c_dev_t *dev);
*/ */
int16_t ads111x_get_value(i2c_dev_t *dev); int16_t ads111x_get_value(i2c_dev_t *dev);
/**
* Read last conversion result for 101x
* @param addr
* @return Last conversion result
*/
int16_t ads101x_get_value(i2c_dev_t *dev);
/** /**
* Read the programmable gain amplifier configuration * Read the programmable gain amplifier configuration
* (ADS1114 and ADS1115 only). * (ADS1114 and ADS1115 only).