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

Merge ecd060c27b into eed96df5dd

Browse source
This commit is contained in:
quietboil 2018-06-05 17:58:22 +00:00 • committed by GitHub
commit 5280a3d328
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

6
extras/ssd1306/component.mk
View file

@ -1,17 +1,19 @@
# Component makefile for extras/ssd1306 # Component makefile for extras/ssd1306
# expected anyone using ssd1306 driver includes it as 'ssd1306/ssd1306.h' # expected anyone using ssd1306 driver includes it as 'ssd1306/ssd1306.h'
INC_DIRS += $(ssd1306_ROOT).. INC_DIRS += $(ROOT)extras
# I2C support is on by default # I2C support is on by default
SSD1306_I2C_SUPPORT ?= 1 SSD1306_I2C_SUPPORT ?= 1
# SPI4 support is on by default # SPI4 support is on by default
SSD1306_SPI4_SUPPORT ?= 1 SSD1306_SPI4_SUPPORT ?= 1
# SPI3 support is on by default
SSD1306_SPI3_SUPPORT ?= 1
# args for passing into compile rule generation # args for passing into compile rule generation
ssd1306_SRC_DIR = $(ssd1306_ROOT) ssd1306_SRC_DIR = $(ssd1306_ROOT)
ssd1306_CFLAGS = -DSSD1306_I2C_SUPPORT=${SSD1306_I2C_SUPPORT} -DSSD1306_SPI4_SUPPORT=${SSD1306_SPI4_SUPPORT} $(CFLAGS) ssd1306_CFLAGS = -DSSD1306_I2C_SUPPORT=${SSD1306_I2C_SUPPORT} -DSSD1306_SPI4_SUPPORT=${SSD1306_SPI4_SUPPORT} -DSSD1306_SPI3_SUPPORT=${SSD1306_SPI3_SUPPORT} $(CFLAGS)
$(eval $(call component_compile_rules,ssd1306)) $(eval $(call component_compile_rules,ssd1306))

11
extras/ssd1306/ssd1306.h
View file

@ -64,17 +64,16 @@ typedef enum
*/ */
typedef struct typedef struct
{ {
ssd1306_protocol_t protocol; struct {
ssd1306_screen_t screen; uint8_t protocol : 4; //!< I/O protocol
union uint8_t screen : 4; //!< Screen type
{ };
#if (SSD1306_I2C_SUPPORT) #if (SSD1306_I2C_SUPPORT)
i2c_dev_t i2c_dev; //!< I2C devuce descriptor, used by SSD1306_PROTO_I2C i2c_dev_t i2c_dev; //!< I2C device descriptor, used by SSD1306_PROTO_I2C
#endif #endif
#if (SSD1306_SPI4_SUPPORT) || (SSD1306_SPI3_SUPPORT) #if (SSD1306_SPI4_SUPPORT) || (SSD1306_SPI3_SUPPORT)
uint8_t cs_pin; //!< Chip Select GPIO pin, used by SSD1306_PROTO_SPI3, SSD1306_PROTO_SPI4 uint8_t cs_pin; //!< Chip Select GPIO pin, used by SSD1306_PROTO_SPI3, SSD1306_PROTO_SPI4
#endif #endif
};
#if (SSD1306_SPI4_SUPPORT) #if (SSD1306_SPI4_SUPPORT)
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