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

Merge pull request #635 from quietboil/improved

Browse source 
ssd1306: Allow SPI3 support to be disabled
This commit is contained in:
Ruslan V. Uss 2018-06-06 19:30:05 +05:00 committed by GitHub
commit d9c5f2eaa2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
extras/ssd1306/component.mk
View file

@ -7,11 +7,13 @@ INC_DIRS += $(ssd1306_ROOT)..
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))

2
extras/ssd1306/ssd1306.c
View file

@ -236,7 +236,9 @@ static int sh1106_go_coordinate(const ssd1306_t *dev, uint8_t x, uint8_t y)
int ssd1306_load_frame_buffer(const ssd1306_t *dev, uint8_t buf[]) int ssd1306_load_frame_buffer(const ssd1306_t *dev, uint8_t buf[])
{ {
uint16_t i; uint16_t i;
#if (SSD1306_SPI3_SUPPORT)
uint8_t j; uint8_t j;
#endif
#if (SSD1306_I2C_SUPPORT) #if (SSD1306_I2C_SUPPORT)
uint8_t tab[16] = { 0 }; uint8_t tab[16] = { 0 };
#endif #endif