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:
lilian 2016-12-28 13:08:19 +01:00
commit 3987a16f21
2 changed files with 17 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

9
extras/ssd1306/ssd1306.c
View file

@ -128,6 +128,15 @@ int ssd1306_command(const ssd1306_t *dev, uint8_t cmd)
gpio_write(dev->cs_pin, true); gpio_write(dev->cs_pin, true);
break; break;
#endif #endif
#if (SSD1306_SPI3_SUPPORT)
case SSD1306_PROTO_SPI3:
gpio_write(dev->cs_pin, false);
spi_set_command(SPI_BUS,1,0); // command mode
spi_transfer_8(SPI_BUS, cmd);
spi_clear_command(SPI_BUS);
gpio_write(dev->cs_pin, true);
break;
#endif
#if (SSD1306_SPI3_SUPPORT) #if (SSD1306_SPI3_SUPPORT)
case SSD1306_PROTO_SPI3: case SSD1306_PROTO_SPI3:
gpio_write(dev->cs_pin, false); gpio_write(dev->cs_pin, false);

8
extras/ssd1306/ssd1306.h
View file

@ -192,6 +192,14 @@ int ssd1306_set_display_offset(const ssd1306_t *dev, uint8_t offset);
*/ */
int sh1106_set_charge_pump_voltage(const ssd1306_t *dev, sh1106_voltage_t select); int sh1106_set_charge_pump_voltage(const ssd1306_t *dev, sh1106_voltage_t select);
/**
* Select charge pump voltage. See value in datasheet.
* @param dev Pointer to device descriptor
* @param select Select charge pump voltage value
* @return Non-zero if error occured
*/
int sh1106_set_charge_pump_voltage(const ssd1306_t *dev, sh1106_voltage_t select);
/** /**
* Enable or disable the charge pump. See application note in datasheet. * Enable or disable the charge pump. See application note in datasheet.
* @param dev Pointer to device descriptor * @param dev Pointer to device descriptor