uGFX/ugfx
2
0
Fork 0
Code Issues 2 Pull requests Projects Releases Wiki Activity

Updates to SSD1306 driver to raise thread priority during flushing.

Browse source
This commit is contained in:
inmarket 2013-10-24 11:59:41 +10:00
parent 4a5506df0a
commit 90ad93c41f
3 changed files with 26 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
drivers/gdisp/SSD1306/board_SSD1306_i2c.h
View file

@ -41,6 +41,10 @@
// I2C configuration structure. // I2C configuration structure.
static I2CConfig i2cconfig; static I2CConfig i2cconfig;
#if GFX_USE_OS_CHIBIOS
static int32_t thdPriority = 0;
#endif
static inline void init_board(GDisplay *g) { static inline void init_board(GDisplay *g) {
// As we are not using multiple displays we set g->board to NULL as we don't use it. // As we are not using multiple displays we set g->board to NULL as we don't use it.
@ -62,10 +66,10 @@ static inline void init_board(GDisplay *g) {
* 0x0030020A; // 400kHz Fast Mode * 0x0030020A; // 400kHz Fast Mode
* 0x00100002; // 800kHz Fast Mode + * 0x00100002; // 800kHz Fast Mode +
*/ */
i2cconfig.timingr = 0x00100002; // 800kHz Fast Mode+
i2cInit();
palSetPadMode(SSD1306_SCL_PORT, SSD1306_SCL_PIN, PAL_MODE_ALTERNATE(1)); palSetPadMode(SSD1306_SCL_PORT, SSD1306_SCL_PIN, PAL_MODE_ALTERNATE(1));
palSetPadMode(SSD1306_SDA_PORT, SSD1306_SDA_PIN, PAL_MODE_ALTERNATE(1)); palSetPadMode(SSD1306_SDA_PORT, SSD1306_SDA_PIN, PAL_MODE_ALTERNATE(1));
i2cconfig.timingr = 0x00100002; // 800kHz Fast Mode+
i2cInit();
break; break;
} }
} }
@ -84,11 +88,18 @@ static inline void setpin_reset(GDisplay *g, bool_t state) {
static inline void acquire_bus(GDisplay *g) { static inline void acquire_bus(GDisplay *g) {
(void) g; (void) g;
#if GFX_USE_OS_CHIBIOS
thdPriority = (int32_t)chThdGetPriority();
chThdSetPriority(HIGHPRIO);
#endif
i2cAcquireBus(&I2CD1); i2cAcquireBus(&I2CD1);
} }
static inline void release_bus(GDisplay *g) { static inline void release_bus(GDisplay *g) {
(void) g; (void) g;
#if GFX_USE_OS_CHIBIOS
chThdSetPriority(thdPriority);
#endif
i2cReleaseBus(&I2CD1); i2cReleaseBus(&I2CD1);
} }

13
drivers/gdisp/SSD1306/board_SSD1306_spi.h
View file

@ -44,6 +44,10 @@ static const SPIConfig spi1config = {
//SPI_CR1_BR_0 //SPI_CR1_BR_0
}; };
#if GFX_USE_OS_CHIBIOS
static int32_t thdPriority = 0;
#endif
static inline void init_board(GDisplay *g) { static inline void init_board(GDisplay *g) {
// As we are not using multiple displays we set g->board to NULL as we don't use it. // As we are not using multiple displays we set g->board to NULL as we don't use it.
@ -54,7 +58,6 @@ static inline void init_board(GDisplay *g) {
// RESET pin. // RESET pin.
palSetPadMode(SSD1306_RESET_PORT, SSD1306_RESET_PIN, PAL_MODE_OUTPUT_PUSHPULL); palSetPadMode(SSD1306_RESET_PORT, SSD1306_RESET_PIN, PAL_MODE_OUTPUT_PUSHPULL);
spiInit();
palSetPadMode(SSD1306_MISO_PORT, SSD1306_MISO_PIN, PAL_MODE_ALTERNATE(1)| palSetPadMode(SSD1306_MISO_PORT, SSD1306_MISO_PIN, PAL_MODE_ALTERNATE(1)|
PAL_STM32_OSPEED_HIGHEST); PAL_STM32_OSPEED_HIGHEST);
palSetPadMode(SSD1306_MOSI_PORT, SSD1306_MOSI_PIN, PAL_MODE_ALTERNATE(1)| palSetPadMode(SSD1306_MOSI_PORT, SSD1306_MOSI_PIN, PAL_MODE_ALTERNATE(1)|
@ -64,6 +67,7 @@ static inline void init_board(GDisplay *g) {
palSetPad(SSD1306_CS_PORT, SSD1306_CS_PIN); palSetPad(SSD1306_CS_PORT, SSD1306_CS_PIN);
palSetPadMode(SSD1306_CS_PORT, SSD1306_CS_PIN, PAL_MODE_ALTERNATE(1)| palSetPadMode(SSD1306_CS_PORT, SSD1306_CS_PIN, PAL_MODE_ALTERNATE(1)|
PAL_STM32_OSPEED_HIGHEST); PAL_STM32_OSPEED_HIGHEST);
spiInit();
break; break;
} }
} }
@ -82,11 +86,18 @@ static inline void setpin_reset(GDisplay *g, bool_t state) {
static inline void acquire_bus(GDisplay *g) { static inline void acquire_bus(GDisplay *g) {
(void) g; (void) g;
#if GFX_USE_OS_CHIBIOS
thdPriority = (int32_t)chThdGetPriority();
chThdSetPriority(HIGHPRIO);
#endif
spiAcquireBus(&SPID1); spiAcquireBus(&SPID1);
} }
static inline void release_bus(GDisplay *g) { static inline void release_bus(GDisplay *g) {
(void) g; (void) g;
#if GFX_USE_OS_CHIBIOS
chThdSetPriority(thdPriority);
#endif
spiReleaseBus(&SPID1); spiReleaseBus(&SPID1);
} }

2
drivers/gdisp/SSD1306/gdisp_lld.c
View file

@ -12,7 +12,7 @@
#include "gfx.h" #include "gfx.h"
#if GFX_USE_GDISP || defined(__DOXYGEN__) #if GFX_USE_GDISP
#define GDISP_DRIVER_VMT GDISPVMT_SSD1306 #define GDISP_DRIVER_VMT GDISPVMT_SSD1306
#include "../drivers/gdisp/SSD1306/gdisp_lld_config.h" #include "../drivers/gdisp/SSD1306/gdisp_lld_config.h"