Hopefully finally fix the corrupt LCD

The SPI bus is now selected and deselected before each set of commands.
Also speed up things by buffering many commands into a single batch.

keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/board_ST7565.h

@@ -37,10 +37,14 @@
 // MSB First
 // CLK Low by default
 static const SPIConfig spi1config = {
-	NULL,
+   // Operation complete callback or @p NULL.
-	/* HW dependent part.*/
+  .end_cb = NULL,
-	ST7565_GPIOPORT,
+   //The chip select line port - when not using pcs.
-    ST7565_SS_PIN,
+  .ssport = ST7565_GPIOPORT,
+   // brief The chip select line pad number - when not using pcs.
+  .sspad=ST7565_SS_PIN,
+   // SPI initialization data.
+  .tar0 =
     SPIx_CTARn_FMSZ(7)
     | SPIx_CTARn_ASC(7)
     | SPIx_CTARn_DT(7)
@@ -50,13 +54,10 @@ static const SPIConfig spi1config = {
 	//SPI_CR1_BR_0
 };
 
-static bool_t st7565_is_data_mode = 1;
-
 static GFXINLINE void init_board(GDisplay *g) {
     (void) g;
     palSetPadModeNamed(A0, PAL_MODE_OUTPUT_PUSHPULL);
     palSetPad(ST7565_GPIOPORT, ST7565_A0_PIN);
-    st7565_is_data_mode = 1;
     palSetPadModeNamed(RST, PAL_MODE_OUTPUT_PUSHPULL);
     palSetPad(ST7565_GPIOPORT, ST7565_RST_PIN);
     palSetPadModeRaw(MOSI, ST7565_SPI_MODE);
@@ -65,7 +66,6 @@ static GFXINLINE void init_board(GDisplay *g) {
 
     spiInit();
     spiStart(&SPID1, &spi1config);
-    spiSelect(&SPID1);
 }
 
 static GFXINLINE void post_init_board(GDisplay *g) {
@@ -86,39 +86,27 @@ static GFXINLINE void acquire_bus(GDisplay *g) {
     (void) g;
     // Only the LCD is using the SPI bus, so no need to acquire
     // spiAcquireBus(&SPID1);
+    spiSelect(&SPID1);
 }
 
 static GFXINLINE void release_bus(GDisplay *g) {
     (void) g;
     // Only the LCD is using the SPI bus, so no need to release
     //spiReleaseBus(&SPID1);
+    spiUnselect(&SPID1);
 }
 
-static GFXINLINE void write_cmd(GDisplay *g, uint8_t cmd) {
+static GFXINLINE void enter_data_mode(GDisplay *g) {
-	(void) g;
+    palSetPad(ST7565_GPIOPORT, ST7565_A0_PIN);
-	if (st7565_is_data_mode) {
+}
-	    // The sleeps need to be at lest 10 vs 25 ns respectively
+
-	    // So let's sleep two ticks, one tick might not be enough
+static GFXINLINE void enter_cmd_mode(GDisplay *g) {
-	    // if we are at the end of the tick
-	    chThdSleep(2);
     palClearPad(ST7565_GPIOPORT, ST7565_A0_PIN);
-        chThdSleep(2);
-        st7565_is_data_mode = 0;
-	}
-	spiSend(&SPID1, 1, &cmd);
 }
 
+
 static GFXINLINE void write_data(GDisplay *g, uint8_t* data, uint16_t length) {
 	(void) g;
-	if (!st7565_is_data_mode) {
-	    // The sleeps need to be at lest 10 vs 25 ns respectively
-	    // So let's sleep two ticks, one tick might not be enough
-	    // if we are at the end of the tick
-	    chThdSleep(2);
-        palSetPad(ST7565_GPIOPORT, ST7565_A0_PIN);
-	    chThdSleep(2);
-        st7565_is_data_mode = 1;
-	}
 	spiSend(&SPID1, length, data);
 }
 

keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/gdisp_lld_ST7565.c

@@ -58,12 +58,24 @@
 
 typedef struct{
     bool_t buffer2;
+    uint8_t data_pos;
+    uint8_t data[16];
     uint8_t ram[GDISP_SCREEN_HEIGHT * GDISP_SCREEN_WIDTH / 8];
 }PrivData;
 
 // Some common routines and macros
 #define PRIV(g)                         ((PrivData*)g->priv)
 #define RAM(g)							(PRIV(g)->ram)
+
+static GFXINLINE void write_cmd(GDisplay* g, uint8_t cmd) {
+    PRIV(g)->data[PRIV(g)->data_pos++] = cmd;
+}
+
+static GFXINLINE void flush_cmd(GDisplay* g) {
+    write_data(g, PRIV(g)->data, PRIV(g)->data_pos);
+    PRIV(g)->data_pos = 0;
+}
+
 #define write_cmd2(g, cmd1, cmd2)		{ write_cmd(g, cmd1); write_cmd(g, cmd2); }
 #define write_cmd3(g, cmd1, cmd2, cmd3)	{ write_cmd(g, cmd1); write_cmd(g, cmd2); write_cmd(g, cmd3); }
 
@@ -89,6 +101,7 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) {
     // The private area is the display surface.
     g->priv = gfxAlloc(sizeof(PrivData));
     PRIV(g)->buffer2 = false;
+    PRIV(g)->data_pos = 0;
 
     // Initialise the board interface
     init_board(g);
@@ -100,6 +113,7 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) {
     gfxSleepMilliseconds(20);
 
     acquire_bus(g);
+    enter_cmd_mode(g);
     write_cmd(g, ST7565_DISPLAY_OFF);
     write_cmd(g, ST7565_LCD_BIAS);
     write_cmd(g, ST7565_ADC);
@@ -111,14 +125,17 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) {
 
     // turn on voltage converter (VC=1, VR=0, VF=0)
     write_cmd(g, ST7565_POWER_CONTROL | 0x04);
+    flush_cmd(g);
     delay_ms(50);
 
     // turn on voltage regulator (VC=1, VR=1, VF=0)
     write_cmd(g, ST7565_POWER_CONTROL | 0x06);
+    flush_cmd(g);
     delay_ms(50);
 
     // turn on voltage follower (VC=1, VR=1, VF=1)
     write_cmd(g, ST7565_POWER_CONTROL | 0x07);
+    flush_cmd(g);
     delay_ms(50);
 
     write_cmd(g, 0xE2);
@@ -130,6 +147,7 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) {
     write_cmd(g, ST7565_INVERT_DISPLAY);
 
     write_cmd(g, ST7565_RMW);
+    flush_cmd(g);
 
     // Finish Init
     post_init_board(g);
@@ -156,16 +174,21 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) {
         return;
 
     acquire_bus(g);
+    enter_cmd_mode(g);
     unsigned dstOffset = (PRIV(g)->buffer2 ? 4 : 0);
     for (p = 0; p < 4; p++) {
         write_cmd(g, ST7565_PAGE | (p + dstOffset));
         write_cmd(g, ST7565_COLUMN_MSB | 0);
         write_cmd(g, ST7565_COLUMN_LSB | 0);
         write_cmd(g, ST7565_RMW);
+        flush_cmd(g);
+        enter_data_mode(g);
         write_data(g, RAM(g) + (p*GDISP_SCREEN_WIDTH), GDISP_SCREEN_WIDTH);
+        enter_cmd_mode(g);
     }
     unsigned line = (PRIV(g)->buffer2 ? 32 : 0);
     write_cmd(g, ST7565_START_LINE | line);
+    flush_cmd(g);
     PRIV(g)->buffer2 = !PRIV(g)->buffer2;
     release_bus(g);
 
@@ -242,12 +265,16 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) {
         case powerSleep:
         case powerDeepSleep:
             acquire_bus(g);
+            enter_cmd_mode(g);
             write_cmd(g, ST7565_DISPLAY_OFF);
+            flush_cmd(g);
             release_bus(g);
             break;
         case powerOn:
             acquire_bus(g);
+            enter_cmd_mode(g);
             write_cmd(g, ST7565_DISPLAY_ON);
+            flush_cmd(g);
             release_bus(g);
             break;
         default:
@@ -281,7 +308,9 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) {
                 if ((unsigned)g->p.ptr > 100)
                     g->p.ptr = (void *)100;
                 acquire_bus(g);
+                enter_cmd_mode(g);
                 write_cmd2(g, ST7565_CONTRAST, ((((unsigned)g->p.ptr)<<6)/101) & 0x3F);
+                flush_cmd(g);
                 release_bus(g);
                 g->g.Contrast = (unsigned)g->p.ptr;
                 return;