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

SPI3 support

Browse source
This commit is contained in:
lilian 2016-12-05 14:25:56 +01:00
parent 762f73515b
commit 546504f14c
3 changed files with 38 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
extras/ssd1306/config.h
View file

@ -9,4 +9,8 @@
#define SSD1306_SPI4_SUPPORT 1 #define SSD1306_SPI4_SUPPORT 1
#endif #endif
#ifndef SSD1306_SPI3_SUPPORT
#define SSD1306_SPI3_SUPPORT 1
#endif
#endif /* _EXTRAS_SSD1306_CONFIG_H_ */ #endif /* _EXTRAS_SSD1306_CONFIG_H_ */

32
extras/ssd1306/ssd1306.c
View file

@ -107,6 +107,15 @@ int ssd1306_command(const ssd1306_t *dev, uint8_t cmd)
spi_transfer_8(SPI_BUS, cmd); spi_transfer_8(SPI_BUS, cmd);
gpio_write(dev->cs_pin, true); gpio_write(dev->cs_pin, true);
break; break;
#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 #endif
default: default:
debug("Unsupported protocol"); debug("Unsupported protocol");
@ -146,6 +155,13 @@ int ssd1306_init(const ssd1306_t *dev)
gpio_enable(dev->dc_pin, GPIO_OUTPUT); gpio_enable(dev->dc_pin, GPIO_OUTPUT);
spi_init(SPI_BUS, SPI_MODE0, SPI_FREQ_DIV_8M, true, SPI_LITTLE_ENDIAN, true); spi_init(SPI_BUS, SPI_MODE0, SPI_FREQ_DIV_8M, true, SPI_LITTLE_ENDIAN, true);
break; break;
#endif
#if (SSD1306_SPI3_SUPPORT)
case SSD1306_PROTO_SPI3:
gpio_enable(dev->cs_pin, GPIO_OUTPUT);
gpio_write(dev->cs_pin, true);
spi_init(SPI_BUS, SPI_MODE0, SPI_FREQ_DIV_8M, true, SPI_LITTLE_ENDIAN, true);
break;
#endif #endif
default: default:
debug("Unsupported protocol"); debug("Unsupported protocol");
@ -221,9 +237,19 @@ int ssd1306_load_frame_buffer(const ssd1306_t *dev, uint8_t buf[])
if (buf) if (buf)
spi_transfer(SPI_BUS, buf, NULL, len, SPI_8BIT); spi_transfer(SPI_BUS, buf, NULL, len, SPI_8BIT);
else else
for (i = 0; i < len; i ++) { spi_repeat_send_8(SPI_BUS,0,len);
spi_transfer_8(SPI_BUS, 0); gpio_write(dev->cs_pin, true);
} break;
#endif
#if (SSD1306_SPI3_SUPPORT)
case SSD1306_PROTO_SPI3:
spi_set_command(SPI_BUS,1,1); // data mode
gpio_write(dev->cs_pin, false);
if (buf)
spi_transfer(SPI_BUS, buf, NULL, len, SPI_8BIT);
else
spi_repeat_send_8(SPI_BUS,0,len);
spi_clear_command(SPI_BUS);
gpio_write(dev->cs_pin, true); gpio_write(dev->cs_pin, true);
break; break;
#endif #endif

8
extras/ssd1306/ssd1306.h
View file

@ -33,7 +33,7 @@ typedef enum
{ {
SSD1306_PROTO_I2C = 0, //!< I2C SSD1306_PROTO_I2C = 0, //!< I2C
SSD1306_PROTO_SPI4, //!< SPI 8 bits + D/C pin SSD1306_PROTO_SPI4, //!< SPI 8 bits + D/C pin
SSD1306_PROTO_SPI3 //!< SPI 9 bits, currently not supported SSD1306_PROTO_SPI3 //!< SPI 9 bits
} ssd1306_protocol_t; } ssd1306_protocol_t;
/** /**
@ -42,11 +42,13 @@ typedef enum
typedef struct typedef struct
{ {
ssd1306_protocol_t protocol; ssd1306_protocol_t protocol;
union {
#if (SSD1306_I2C_SUPPORT) #if (SSD1306_I2C_SUPPORT)
uint8_t addr; //!< I2C address, used by SSD1306_PROTO_I2C uint8_t addr ; //!< I2C address, used by SSD1306_PROTO_I2C
#endif #endif
uint8_t cs_pin ; //!< Chip Select GPIO pin, used by SSD1306_PROTO_SPI3, SSD1306_PROTO_SPI4
} ;
#if (SSD1306_SPI4_SUPPORT) #if (SSD1306_SPI4_SUPPORT)
uint8_t cs_pin; //!< Chip Select GPIO pin, used by SSD1306_PROTO_SPI3, SSD1306_PROTO_SPI4
uint8_t dc_pin; //!< Data/Command GPIO pin, used by SSD1306_PROTO_SPI4 uint8_t dc_pin; //!< Data/Command GPIO pin, used by SSD1306_PROTO_SPI4
#endif #endif
uint8_t width; //!< Screen width, currently supported 128px, 96px uint8_t width; //!< Screen width, currently supported 128px, 96px