Inky 7.3: Direct pen & PSRAM update.

Author: AndrewCapon

drivers/CMakeLists.txt

@@ -39,4 +39,6 @@ add_subdirectory(vl53l5cx)
 add_subdirectory(pcf85063a)
 add_subdirectory(pms5003)
 add_subdirectory(sh1107)
-add_subdirectory(st7567)
+add_subdirectory(st7567)
+add_subdirectory(psram_display)
+add_subdirectory(uc8159_inky7)

drivers/psram_display/CMakeLists.txt

@@ -0,0 +1 @@
+include(psram_display.cmake)

drivers/psram_display/psram_display.cmake

@@ -0,0 +1,10 @@
+set(DRIVER_NAME psram_display)
+add_library(${DRIVER_NAME} INTERFACE)
+
+target_sources(${DRIVER_NAME} INTERFACE
+  ${CMAKE_CURRENT_LIST_DIR}/${DRIVER_NAME}.cpp)
+
+target_include_directories(${DRIVER_NAME} INTERFACE ${CMAKE_CURRENT_LIST_DIR})
+
+# Pull in pico libraries that we need
+target_link_libraries(${DRIVER_NAME} INTERFACE pico_stdlib hardware_spi)

drivers/psram_display/psram_display.cpp

@@ -0,0 +1,75 @@
+#include "psram_display.hpp"
+
+#include <cstdlib>
+#include <math.h>
+#include <string.h>
+
+namespace pimoroni {
+
+  enum reg {
+    WRITE = 0x02,
+    READ = 0x03,
+    RESET_ENABLE = 0x66,
+    RESET = 0x99
+  };
+
+  void PSRamDisplay::init() {
+    uint baud = spi_init(spi, 31'250'000);
+    printf("PSRam connected at %u\n", baud);
+    gpio_set_function(CS, GPIO_FUNC_SIO);
+    gpio_set_dir(CS, GPIO_OUT);
+    gpio_put(CS, 1);
+
+    gpio_set_function(SCK,  GPIO_FUNC_SPI);
+    gpio_set_function(MOSI, GPIO_FUNC_SPI);
+    gpio_set_function(MISO, GPIO_FUNC_SPI);
+
+    gpio_put(CS, 0);
+    uint8_t command_buffer[2] = {RESET_ENABLE, RESET};
+    spi_write_blocking(spi, command_buffer, 2);
+    gpio_put(CS, 1);
+  }
+  
+  void PSRamDisplay::write(uint32_t address, size_t len, const uint8_t *data)
+  {
+    gpio_put(CS, 0);
+    uint8_t command_buffer[4] = {WRITE, (uint8_t)((address >> 16) & 0xFF), (uint8_t)((address >> 8) & 0xFF), (uint8_t)(address & 0xFF)};
+    spi_write_blocking(spi, command_buffer, 4);
+    spi_write_blocking(spi, data, len);
+    gpio_put(CS, 1);
+  }
+
+  void PSRamDisplay::write(uint32_t address, size_t len, const uint8_t byte)
+  {
+    gpio_put(CS, 0);
+    uint8_t command_buffer[4] = {WRITE, (uint8_t)((address >> 16) & 0xFF), (uint8_t)((address >> 8) & 0xFF), (uint8_t)(address & 0xFF)};
+    spi_write_blocking(spi, command_buffer, 4);
+    SpiSetBlocking(byte, len);
+    gpio_put(CS, 1);
+  }
+
+
+  void PSRamDisplay::read(uint32_t address, size_t len, uint8_t *data)
+  {
+    gpio_put(CS, 0);
+    uint8_t command_buffer[4] = {READ, (uint8_t)((address >> 16) & 0xFF), (uint8_t)((address >> 8) & 0xFF), (uint8_t)(address & 0xFF)};
+    spi_write_blocking(spi, command_buffer, 4);
+    spi_read_blocking(spi, 0, data, len);
+    gpio_put(CS, 1);
+  }
+
+  void PSRamDisplay::write_pixel(const Point &p, uint8_t colour)
+  {
+    write(pointToAddress(p), 1, colour);
+  }
+
+  void PSRamDisplay::write_pixel_span(const Point &p, uint l, uint8_t colour)
+  {
+    write(pointToAddress(p), l, colour);
+  }
+
+  void PSRamDisplay::read_pixel_span(const Point &p, uint l, uint8_t *data)
+  {
+    read(pointToAddress(p), l, data);
+  }
+}

drivers/psram_display/psram_display.hpp

@@ -0,0 +1,128 @@
+#pragma once
+
+#include <cstring>
+
+#include "pico/stdlib.h"
+#include "hardware/spi.h"
+#include "hardware/gpio.h"
+#include "common/pimoroni_common.hpp"
+#include "common/pimoroni_bus.hpp"
+#include "libraries/pico_graphics/pico_graphics.hpp"
+
+
+// 8 MB PSRam
+
+namespace pimoroni {
+
+  class PSRamDisplay : public IDirectDisplayDriver<uint8_t> {
+    //--------------------------------------------------
+    // Variables
+    //--------------------------------------------------
+  private:
+    spi_inst_t *spi = PIMORONI_SPI_DEFAULT_INSTANCE;
+
+    // interface pins with our standard defaults where appropriate
+    uint CS     = 3;
+    uint DC     = PIN_UNUSED;
+    uint SCK    = SPI_DEFAULT_SCK;
+    uint MOSI   = SPI_DEFAULT_MOSI;
+    uint MISO   = SPI_DEFAULT_MISO;
+    
+    uint32_t start_address = 0;
+    uint16_t width = 0;
+    uint16_t height = 0;
+    
+    absolute_time_t timeout;
+
+    bool blocking = false;
+
+  public:
+    enum colour : uint8_t {
+      BLACK = 0,
+      WHITE = 1,
+      GREEN = 2,
+      BLUE = 3,
+      RED = 4,
+      YELLOW = 5,
+      ORANGE = 6,
+      CLEAN = 7
+    };
+
+    PSRamDisplay(uint16_t width, uint16_t height) : PSRamDisplay(width, height, {PIMORONI_SPI_DEFAULT_INSTANCE, 3, SPI_DEFAULT_SCK, SPI_DEFAULT_MOSI, PIN_UNUSED, PIN_UNUSED, PIN_UNUSED}) {};
+
+    PSRamDisplay(uint16_t width, uint16_t height, SPIPins pins) :
+      spi(pins.spi),
+      CS(pins.cs), DC(pins.dc), SCK(pins.sck), MOSI(pins.mosi),
+      width(width), height(height) {
+        init();
+      }
+
+
+    //--------------------------------------------------
+    // Methods
+    //--------------------------------------------------
+    public:
+      void test(void){
+
+        char writeBuffer[1024];
+        char readBuffer[1024];
+
+        uint mb = 8;
+
+        for(uint k = 0; k < 1024*mb; k++)
+        {
+          sprintf(writeBuffer, "%u", k);
+
+          write(k*1024, strlen(writeBuffer)+1, (uint8_t *)writeBuffer);
+        }
+
+        bool bSame = true;
+        for(uint k = 0; k < 1024*mb && bSame; k++)
+        {
+          sprintf(writeBuffer, "%u", k);
+          read(k*1024, strlen(writeBuffer)+1, (uint8_t *)readBuffer);
+          bSame = strcmp(writeBuffer, readBuffer) ==0;
+          printf("[%u] %s == %s ? %s\n", k, writeBuffer, readBuffer, bSame ? "Success" : "Failure");
+        }
+      }
+      
+      void write_pixel(const Point &p, uint8_t colour) override;
+      void write_pixel_span(const Point &p, uint l, uint8_t colour) override;
+      void read_pixel_span(const Point &p, uint l, uint8_t *data) override;
+
+      int __not_in_flash_func(SpiSetBlocking)(const uint16_t uSrc, size_t uLen) 
+      {
+        invalid_params_if(SPI, 0 > (int)uLen);
+        // Deliberately overflow FIFO, then clean up afterward, to minimise amount
+        // of APB polling required per halfword
+        for (size_t i = 0; i < uLen; ++i) {
+            while (!spi_is_writable(spi))
+                tight_loop_contents();
+            spi_get_hw(spi)->dr = uSrc;
+        }
+
+        while (spi_is_readable(spi))
+            (void)spi_get_hw(spi)->dr;
+        while (spi_get_hw(spi)->sr & SPI_SSPSR_BSY_BITS)
+            tight_loop_contents();
+        while (spi_is_readable(spi))
+            (void)spi_get_hw(spi)->dr;
+
+        // Don't leave overrun flag set
+        spi_get_hw(spi)->icr = SPI_SSPICR_RORIC_BITS;
+
+        return (int)uLen;
+      }
+
+    private:
+      void init();
+      void write(uint32_t address, size_t len, const uint8_t *data);
+      void write(uint32_t address, size_t len, const uint8_t byte);
+      void read(uint32_t address, size_t len, uint8_t *data);
+
+      uint32_t pointToAddress(const Point &p)
+      {
+        return start_address + (p.y * width) + p.x;
+      }
+  };
+}

drivers/uc8159_inky7/CMakeLists.txt

@@ -0,0 +1 @@
+include(uc8159_inky7.cmake)

drivers/uc8159_inky7/uc8159_inky7.cmake

@@ -0,0 +1,10 @@
+set(DRIVER_NAME uc8159_inky7)
+add_library(${DRIVER_NAME} INTERFACE)
+
+target_sources(${DRIVER_NAME} INTERFACE
+  ${CMAKE_CURRENT_LIST_DIR}/${DRIVER_NAME}.cpp)
+
+target_include_directories(${DRIVER_NAME} INTERFACE ${CMAKE_CURRENT_LIST_DIR})
+
+# Pull in pico libraries that we need
+target_link_libraries(${DRIVER_NAME} INTERFACE pico_stdlib hardware_spi)