PicoVector 2 text word wrap and transform

drivers/plasma/apa102.cpp

@@ -4,10 +4,26 @@
 namespace plasma {
 
 APA102::APA102(uint num_leds, PIO pio, uint sm, uint pin_dat, uint pin_clk, uint freq, RGB* buffer) : buffer(buffer), num_leds(num_leds), pio(pio), sm(sm) {
+    // NOTE: This sets the gpio_base for *the entire PIO* not just this state machine
+    uint range_max = std::max(pin_dat, pin_clk);
+    uint range_min = std::min(pin_dat, pin_clk);
+
+    // Both pins in 16-48 range
+    if(range_max >= 32 && range_min >= 16) {
+        pio_set_gpio_base(pio, 16);
+    // Both pins in 0-31 range
+    } else if(range_max <= 31) {
+        pio_set_gpio_base(pio, 0);
+    // Pins in different ranges: invalid combo!
+    } else {
+        // TODO: Need some means to notify the caller
+        pio_set_gpio_base(pio, 0);
+    }
+
     pio_program_offset = pio_add_program(pio, &apa102_program);
 
-    pio_sm_set_pins_with_mask(pio, sm, 0, (1u << pin_clk) | (1u << pin_dat));
-    pio_sm_set_pindirs_with_mask(pio, sm, ~0u, (1u << pin_clk) | (1u << pin_dat));
+    pio_sm_set_pins_with_mask(pio, sm, 0, (1u << (pin_clk - pio_get_gpio_base(pio))) | (1u << (pin_dat - pio_get_gpio_base(pio))));
+    pio_sm_set_pindirs_with_mask(pio, sm, ~0u, (1u << (pin_clk - pio_get_gpio_base(pio))) | (1u << (pin_dat - pio_get_gpio_base(pio))));
     pio_gpio_init(pio, pin_clk);
     pio_gpio_init(pio, pin_dat);
 

drivers/plasma/ws2812.cpp

@@ -4,6 +4,9 @@
 namespace plasma {
 
 WS2812::WS2812(uint num_leds, PIO pio, uint sm, uint pin, uint freq, bool rgbw, COLOR_ORDER color_order, RGB* buffer) : buffer(buffer), num_leds(num_leds), color_order(color_order), pio(pio), sm(sm) {
+    // NOTE: This sets the gpio_base for *the entire PIO* not just this state machine
+    pio_set_gpio_base(pio, pin >= 32 ? 16 : 0);
+
     pio_program_offset = pio_add_program(pio, &ws2812_program);
 
     pio_gpio_init(pio, pin);

drivers/st7735/st7735.cpp

@@ -165,7 +165,7 @@ namespace pimoroni {
 
   // Native 16-bit framebuffer update
   void ST7735::update(PicoGraphics *graphics) {
-    if(graphics->pen_type == PicoGraphics::PEN_RGB565) {
+    if(graphics->pen_type == PicoGraphics::PEN_RGB565 && graphics->layers == 1) {
       command(reg::RAMWR, width * height * sizeof(uint16_t), (const char*)graphics->frame_buffer);
     } else {
       command(reg::RAMWR);

drivers/st7789/st7789.cpp

@@ -282,7 +282,7 @@ namespace pimoroni {
   void ST7789::update(PicoGraphics *graphics) {
     uint8_t cmd = reg::RAMWR;
 
-    if(graphics->pen_type == PicoGraphics::PEN_RGB565) { // Display buffer is screen native
+    if(graphics->pen_type == PicoGraphics::PEN_RGB565 && graphics->layers == 1) { // Display buffer is screen native
       command(cmd, width * height * sizeof(uint16_t), (const char*)graphics->frame_buffer);
     } else {
       gpio_put(dc, 0); // command mode

examples/CMakeLists.txt

@@ -63,3 +63,4 @@ add_subdirectory(galactic_unicorn)
 add_subdirectory(gfx_pack)
 add_subdirectory(cosmic_unicorn)
 add_subdirectory(stellar_unicorn)
+add_subdirectory(pico_w_explorer)

examples/pico_display_2/CMakeLists.txt

@@ -1,14 +1,3 @@
 add_subdirectory(mandelbrot)
-
-set(OUTPUT_NAME pico_display2_demo)
-
-add_executable(
-  ${OUTPUT_NAME}
-  pico_display_2_demo.cpp
-)
-
-# Pull in pico libraries that we need
-target_link_libraries(${OUTPUT_NAME} pico_stdlib hardware_spi hardware_pwm hardware_dma rgbled button pico_display_2 st7789 pico_graphics)
-
-# create map/bin/hex file etc.
-pico_add_extra_outputs(${OUTPUT_NAME})
+include(pico_display_2_demo.cmake)
+include(pico_display_2_vector.cmake)

examples/pico_display_2/pico_display_2_demo.cmake

@@ -0,0 +1,10 @@
+add_executable(
+  pico_display_2_demo
+  pico_display_2_demo.cpp
+)
+
+# Pull in pico libraries that we need
+target_link_libraries(pico_display_2_demo pico_stdlib hardware_spi hardware_pwm hardware_dma rgbled button pico_display_2 st7789 pico_graphics)
+
+# create map/bin/hex file etc.
+pico_add_extra_outputs(pico_display_2_demo)

examples/pico_display_2/pico_display_2_vector.cmake

@@ -0,0 +1,41 @@
+function(static_asset NAME PATH)
+  get_filename_component(PATH ${PATH} ABSOLUTE)
+  get_filename_component(ASSET ${PATH} NAME)
+  get_filename_component(PATH ${PATH} DIRECTORY)
+  set(OBJNAME ${ASSET}.o)
+  add_custom_command(OUTPUT ${OBJNAME}
+    DEPENDS ${PATH}/${ASSET}
+    COMMENT "Building ${OBJNAME}"
+    WORKING_DIRECTORY "${PATH}"
+    COMMAND ${CMAKE_LINKER} -r -b binary -o ${CMAKE_CURRENT_BINARY_DIR}/${OBJNAME} ${ASSET}
+    COMMAND ${CMAKE_OBJDUMP} -t ${CMAKE_CURRENT_BINARY_DIR}/${OBJNAME}
+  )
+  # TODO figure out how to make static resources work
+  ## COMMAND ${CMAKE_OBJCOPY} --rename-section .data=.rodata,alloc,load,readonly,data,contents ${CMAKE_CURRENT_BINARY_DIR}/${OBJNAME} ${CMAKE_CURRENT_BINARY_DIR}/${OBJNAME})
+  target_sources(${NAME} PRIVATE ${OBJNAME})
+endfunction()
+
+add_executable(
+    pico_display_2_vector
+    pico_display_2_vector.cpp
+)
+
+# Pull in pico libraries that we need
+target_link_libraries(pico_display_2_vector 
+    pico_stdlib
+    hardware_spi
+    hardware_pwm
+    hardware_dma
+    pico_display_2
+    st7789
+    pico_graphics
+    pico_vector
+    )
+
+static_asset(pico_display_2_vector ${CMAKE_CURRENT_LIST_DIR}/vector/DynaPuff-Medium.af)
+
+pico_enable_stdio_usb(pico_display_2_vector 0)
+pico_enable_stdio_uart(pico_display_2_vector 1)
+
+# create map/bin/hex file etc.
+pico_add_extra_outputs(pico_display_2_vector)

examples/pico_display_2/pico_display_2_vector.cpp

@@ -0,0 +1,67 @@
+#include <string.h>
+#include <math.h>
+#include <vector>
+#include <cstdlib>
+
+#include "libraries/pico_display_2/pico_display_2.hpp"
+#include "drivers/st7789/st7789.hpp"
+#include "libraries/pico_graphics/pico_graphics.hpp"
+#include "libraries/pico_vector/pico_vector.hpp"
+
+
+using namespace pimoroni;
+
+ST7789 st7789(320, 240, ROTATE_180, false, get_spi_pins(BG_SPI_FRONT));
+PicoGraphics_PenRGB332 graphics(st7789.width, st7789.height, nullptr);
+
+uint8_t vector_mem[PicoVector::pretty_poly_buffer_size()];
+
+PicoVector vector(&graphics);
+
+extern char _binary_DynaPuff_Medium_af_start[];
+extern size_t _binary_DynaPuff_Medium_af_size;
+
+int main() {
+    stdio_init_all();
+
+    Pen BG = graphics.create_pen(120, 40, 60);
+    Pen TEXT = graphics.create_pen(255, 255, 255);
+
+    st7789.set_backlight(255);
+
+    vector.set_font(_binary_DynaPuff_Medium_af_start, 30);
+
+    unsigned int a = 0;
+
+    while (true) {
+        Point text_location(0, 0);
+        graphics.set_pen(BG);
+        graphics.clear();
+        graphics.set_pen(TEXT);
+        graphics.text("Hello World", text_location, 320);
+
+        pp_point_t outline[] = {{-64, -64}, {64, -64}, {64, 64}, {-64, 64}};
+        pp_point_t hole[]    = {{ -32,   32}, { 32,   32}, { 32, -32}, { -32, -32}};
+
+        pp_poly_t *poly = pp_poly_new();
+        pp_path_add_points(pp_poly_add_path(poly), outline, sizeof(outline) / sizeof(pp_point_t));
+        pp_path_add_points(pp_poly_add_path(poly), hole, sizeof(hole) / sizeof(pp_point_t));
+
+        pp_mat3_t pos = pp_mat3_identity();
+        pp_mat3_translate(&pos, 50, 50);
+        pp_mat3_rotate(&pos, a);
+        vector.draw(poly);
+        vector.text("Hello World", 0, 0, &pos);
+
+        // update screen
+        st7789.update(&graphics);
+        a += 1;
+        if (a > 359) {
+            a = 0;
+        }
+
+        pp_poly_free(poly);
+    }
+
+    return 0;
+}

examples/pico_w_explorer/CMakeLists.txt

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

examples/pico_w_explorer/pico_w_explorer_vector.cmake

@@ -0,0 +1,10 @@
+add_executable(
+  pico_w_explorer_vector
+  pico_w_explorer_vector.cpp
+)
+
+# Pull in pico libraries that we need
+target_link_libraries(pico_w_explorer_vector pico_stdlib pico_graphics pico_vector st7789)
+
+# create map/bin/hex file etc.
+pico_add_extra_outputs(pico_w_explorer_vector)

examples/pico_w_explorer/pico_w_explorer_vector.cpp

@@ -0,0 +1,56 @@
+#include <string.h>
+#include <math.h>
+#include <vector>
+#include <cstdlib>
+
+#include "drivers/st7789/st7789.hpp"
+#include "libraries/pico_graphics/pico_graphics.hpp"
+#include "libraries/pico_vector/pico_vector.hpp"
+
+using namespace pimoroni;
+
+
+ST7789 st7789(320, 240, ROTATE_0, false, {PIMORONI_SPI_DEFAULT_INSTANCE, 17, SPI_DEFAULT_SCK, SPI_DEFAULT_MOSI, PIN_UNUSED, SPI_DEFAULT_MISO, 9});
+PicoGraphics_PenRGB332 graphics(st7789.width, st7789.height, nullptr);
+PicoVector vector(&graphics);
+
+int main() {
+  st7789.set_backlight(255);
+
+  Pen WHITE = graphics.create_pen(255, 255, 255);
+  Pen BLACK = graphics.create_pen(0, 0, 0);
+
+  float angle = 0.0f;
+
+  while(true) {
+    graphics.set_pen(BLACK);
+    graphics.clear();
+
+    graphics.set_pen(WHITE);
+    graphics.text("Hello World", Point(0, 0), 320);
+
+    pp_point_t outline[] = {{-128, -128}, {128, -128}, {128, 128}, {-128, 128}};
+    pp_point_t hole[]    = {{ -64,   64}, { 64,   64}, { 64, -64}, { -64, -64}};
+
+    pp_poly_t *poly = pp_poly_new();
+    pp_path_add_points(pp_poly_add_path(poly), outline, sizeof(outline) / sizeof(pp_point_t));
+    pp_path_add_points(pp_poly_add_path(poly), hole, sizeof(hole) / sizeof(pp_point_t));
+
+    vector.rotate(poly, {0, 0}, angle);
+    vector.translate(poly, {160, 120});
+
+    vector.draw(poly);
+
+    pp_mat3_t t = pp_mat3_identity();
+    vector.text("Hello World", 0, 0, &t);
+
+    // update screen
+    st7789.update(&graphics);
+
+    angle += 1.0f;
+
+    pp_poly_free(poly);
+  }
+
+    return 0;
+}

libraries/CMakeLists.txt

@@ -44,3 +44,4 @@ add_subdirectory(gfx_pack)
 add_subdirectory(interstate75)
 add_subdirectory(cosmic_unicorn)
 add_subdirectory(stellar_unicorn)
+add_subdirectory(pico_vector)

libraries/pico_graphics/pico_graphics.cpp

@@ -19,6 +19,14 @@ namespace pimoroni {
   RGB* PicoGraphics::get_palette() {return nullptr;}
   bool PicoGraphics::supports_alpha_blend() {return false;}
 
+  void PicoGraphics::set_layer(uint l) {
+    this->layer = l;
+    this->layer_offset = this->bounds.w * this->bounds.h * l;
+  };
+  uint PicoGraphics::get_layer() {
+    return this->layer;
+  };
+
   void PicoGraphics::set_dimensions(int width, int height) {
     bounds = clip = {0, 0, width, height};
   }