Very messy attempt at using a bytearray as the buffer

libraries/pico_display/pico_display.cpp

@@ -11,9 +11,9 @@ const uint8_t LED_B = 8;
 
 namespace pimoroni {
 
-  PicoDisplay::PicoDisplay()
-    : PicoGraphics(WIDTH, HEIGHT, __fb), screen(WIDTH, HEIGHT, __fb)  {
-    memset(__fb, 0, sizeof(__fb));  
+  PicoDisplay::PicoDisplay(uint16_t *buf)
+    : PicoGraphics(WIDTH, HEIGHT, buf), screen(WIDTH, HEIGHT, buf)  {
+      __fb = buf;
   }
 
   void PicoDisplay::init() {

libraries/pico_display/pico_display.hpp

@@ -14,12 +14,12 @@ namespace pimoroni {
     static const uint8_t X = 14;
     static const uint8_t Y = 15;
 
+    uint16_t *__fb;
   private:
-    uint16_t __fb[WIDTH * HEIGHT];
     ST7789 screen;
 
   public:
-    PicoDisplay();
+    PicoDisplay(uint16_t *buf);
 
     void init();
     void update();

libraries/pico_graphics/pico_graphics.cpp

@@ -18,8 +18,7 @@ namespace pimoroni {
                  ((g & 0b11111100) << 3) |
                  ((b & 0b11111000) >> 3);
 
-    // endian swap, this should be possible another way...
-    return ((p & 0xff00) >> 8) | ((p & 0xff) << 8);
+    return __builtin_bswap16(p);
   }
 
   void PicoGraphics::set_clip(const rect &r) {

micropython/modules/pico_display/pico_display.c

@@ -15,7 +15,7 @@ enum buttons
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
 /***** Module Functions *****/
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(picodisplay_init_obj, picodisplay_init);
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(picodisplay_init_obj, picodisplay_init);
 STATIC MP_DEFINE_CONST_FUN_OBJ_0(picodisplay_get_width_obj, picodisplay_get_width);
 STATIC MP_DEFINE_CONST_FUN_OBJ_0(picodisplay_get_height_obj, picodisplay_get_height);
 STATIC MP_DEFINE_CONST_FUN_OBJ_0(picodisplay_update_obj, picodisplay_update);

micropython/modules/pico_display/pico_display.cpp

@@ -6,14 +6,20 @@
 
 using namespace pimoroni;
 
-PicoDisplay display;
+PicoDisplay *display;
 
 
 extern "C" {
 #include "pico_display.h"
 
-mp_obj_t picodisplay_init() {
-    display.init();
+mp_obj_t buf_obj;
+
+mp_obj_t picodisplay_init(mp_obj_t buf) {
+    mp_buffer_info_t bufinfo;
+    mp_get_buffer_raise(buf, &bufinfo, MP_BUFFER_RW);
+    buf_obj = buf;
+    display = new PicoDisplay((uint16_t *)bufinfo.buf);
+    display->init();
     return mp_const_none;
 }
 
@@ -26,7 +32,7 @@ mp_obj_t picodisplay_get_height() {
 }
 
 mp_obj_t picodisplay_update() {
-    display.update();
+    display->update();
     return mp_const_none;
 }
 
@@ -36,7 +42,7 @@ mp_obj_t picodisplay_set_backlight(mp_obj_t brightness_obj) {
     if(brightness < 0 || brightness > 1.0f)
         mp_raise_ValueError("brightness out of range. Expected 0.0 to 1.0");
     else
-        display.set_backlight((uint8_t)(brightness * 255.0f));
+        display->set_backlight((uint8_t)(brightness * 255.0f));
 
     return mp_const_none;
 }
@@ -53,7 +59,7 @@ mp_obj_t picodisplay_set_led(mp_obj_t r_obj, mp_obj_t g_obj, mp_obj_t b_obj) {
     else if(b < 0 || b > 255)
         mp_raise_ValueError("b out of range. Expected 0 to 255");
     else
-        display.set_led(r, g, b);
+        display->set_led(r, g, b);
 
     return mp_const_none;
 }
@@ -65,19 +71,19 @@ mp_obj_t picodisplay_is_pressed(mp_obj_t button_obj) {
     switch(buttonID)
     {
     case 0:
-        buttonPressed = display.is_pressed(PicoDisplay::A);
+        buttonPressed = display->is_pressed(PicoDisplay::A);
         break;
 
     case 1:
-        buttonPressed = display.is_pressed(PicoDisplay::B);
+        buttonPressed = display->is_pressed(PicoDisplay::B);
         break;
 
     case 2:
-        buttonPressed = display.is_pressed(PicoDisplay::X);
+        buttonPressed = display->is_pressed(PicoDisplay::X);
         break;
 
     case 3:
-        buttonPressed = display.is_pressed(PicoDisplay::Y);
+        buttonPressed = display->is_pressed(PicoDisplay::Y);
         break;
 
     default:
@@ -253,4 +259,4 @@ mp_obj_t picodisplay_text(mp_uint_t n_args, const mp_obj_t *args) {
 
     return mp_const_none;
 }
-}
+}

micropython/modules/pico_display/pico_display.h

@@ -3,7 +3,7 @@
 #include "py/objstr.h"
 
 // Declare the functions we'll make available in Python
-extern mp_obj_t picodisplay_init();
+extern mp_obj_t picodisplay_init(mp_obj_t buf);
 extern mp_obj_t picodisplay_get_width();
 extern mp_obj_t picodisplay_get_height();
 extern mp_obj_t picodisplay_set_backlight(mp_obj_t brightness_obj);