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

Fix conflict

Browse source
This commit is contained in:
Zaltora 2017-01-05 14:44:54 +01:00
commit 47bc6a5e8b
1 changed files with 4 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
extras/ssd1306/ssd1306.c
View file

@ -254,7 +254,11 @@ int ssd1306_load_frame_buffer(const ssd1306_t *dev, uint8_t buf[])
case SSD1306_PROTO_I2C: case SSD1306_PROTO_I2C:
for (i = 0; i < len; i++) 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 && 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); i2c_send(dev, 0x40, buf ? &buf[i] : tab, 16);
} }
break; break;