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

additional fix

Browse source
This commit is contained in:
cets 2017-01-05 14:59:11 +01:00
parent 47bc6a5e8b
commit 36d8e10279
2 changed files with 2 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

5
extras/ina3221/ina3221.c
View file

@ -29,12 +29,11 @@ static int _wireWriteRegister (uint8_t addr, uint8_t reg, uint16_t value)
static int _wireReadRegister(uint8_t addr, uint8_t reg, uint16_t *value)
{
int error = 0;
uint8_t d[] = {0, 0};
return i2c_slave_read(addr, &reg, d, sizeof(d), false);
int error = i2c_slave_read(addr, &reg, d, sizeof(d), false)
debug("Data read from %02X: %02X+%04X\n",addr,reg,*value);
*value = d[1] | (d[0] << 8);
return 0 ;
return error;
}
int ina3221_trigger(ina3221_t *dev)

4
extras/ssd1306/ssd1306.c
View file

@ -254,11 +254,7 @@ int ssd1306_load_frame_buffer(const ssd1306_t *dev, uint8_t buf[])
case SSD1306_PROTO_I2C:
for (i = 0; i < len; i++)
{
<<<<<<< HEAD
if(dev->screen == SH1106_SCREEN && i%dev->width == 0) sh1106_go_coordinate(dev,0,i/dev->width);
=======
if(dev->screen == SH1106_SCREEN) sh1106_go_coordinate(dev,0,i/dev->width);
>>>>>>> branch 'i2c_optimization' of https://github.com/Zaltora/esp-open-rtos.git
i2c_send(dev, 0x40, buf ? &buf[i] : tab, 16);
}
break;