SSD1331: fixed hardware SPI

This commit is contained in:
Jeroen Vermeulen - MageHost 2020-12-30 23:51:02 +01:00
parent e866db7364
commit db7e0ff97a
1 changed files with 8 additions and 7 deletions

View File

@ -32,6 +32,7 @@
#define SSD1331_WHITE 0xFFFF // 255, 255, 255 #define SSD1331_WHITE 0xFFFF // 255, 255, 255
#include <Adafruit_SSD1331.h> #include <Adafruit_SSD1331.h>
#include <SPI.h>
extern uint8_t *buffer; extern uint8_t *buffer;
extern uint8_t color_type; extern uint8_t color_type;
@ -60,15 +61,15 @@ void SSD1331_InitDriver() {
bg_color = SSD1331_BLACK; bg_color = SSD1331_BLACK;
// init renderer // init renderer
if (PinUsed(GPIO_SSPI_CS) && PinUsed(GPIO_SSPI_MOSI) && PinUsed(GPIO_SSPI_SCLK)){ if (PinUsed(GPIO_SSPI_CS) && PinUsed(GPIO_SSPI_DC) && PinUsed(GPIO_SSPI_MOSI) && PinUsed(GPIO_SSPI_SCLK) && PinUsed(GPIO_OLED_RESET)) {
ssd1331 = new Adafruit_SSD1331(Pin(GPIO_SSPI_CS),Pin(GPIO_SSPI_DC),Pin(GPIO_SSPI_MOSI),Pin(GPIO_SSPI_SCLK),OLED_RESET); ssd1331 = new Adafruit_SSD1331(Pin(GPIO_SSPI_CS),Pin(GPIO_SSPI_DC),Pin(GPIO_SSPI_MOSI),Pin(GPIO_SSPI_SCLK),Pin(GPIO_OLED_RESET));
} else { } else if (PinUsed(GPIO_SPI_CS) && PinUsed(GPIO_SPI_DC) && PinUsed(GPIO_OLED_RESET)) {
if (PinUsed(GPIO_SPI_CS) && PinUsed(GPIO_SPI_MOSI) && PinUsed(GPIO_SPI_CLK)) { ssd1331 = new Adafruit_SSD1331(Pin(GPIO_SPI_CS),Pin(GPIO_SPI_DC),Pin(GPIO_OLED_RESET));
ssd1331 = new Adafruit_SSD1331(Pin(GPIO_SPI_CS),Pin(GPIO_SPI_DC),Pin(GPIO_SPI_MOSI),Pin(GPIO_SPI_CLK),OLED_RESET); } else if (PinUsed(GPIO_SPI_CS) && PinUsed(GPIO_SPI_DC)) {
ssd1331 = new Adafruit_SSD1331(&SPI,Pin(GPIO_SPI_CS),Pin(GPIO_SPI_DC));
} else { } else {
return; return;
} }
}
delay(100); delay(100);
ssd1331->begin(); ssd1331->begin();