merge from upstream; working; includes debug_out code for debugging via Saleae for posterity

6 files changed, 81 insertions, 28 deletions

diff --git a/supervisor/shared/display.c b/supervisor/shared/display.c
index 9c074209b..634720d0a 100644
--- a/supervisor/shared/display.c
+++ b/supervisor/shared/display.c
@@ -29,6 +29,7 @@
 #include <string.h>
 
 #include "py/mpstate.h"
+#include "shared-bindings/displayio/Bitmap.h"
 #include "shared-bindings/displayio/Group.h"
 #include "shared-bindings/displayio/Palette.h"
 #include "shared-bindings/displayio/TileGrid.h"
@@ -38,19 +39,31 @@
 #include "shared-module/displayio/__init__.h"
 #endif
 
+#if CIRCUITPY_SHARPDISPLAY
+#include "shared-module/displayio/__init__.h"
+#include "shared-bindings/sharpdisplay/SharpMemoryFramebuffer.h"
+#include "shared-module/sharpdisplay/SharpMemoryFramebuffer.h"
+#endif
+
 extern size_t blinka_bitmap_data[];
 extern displayio_bitmap_t blinka_bitmap;
 extern displayio_group_t circuitpython_splash;
 
+#if CIRCUITPY_TERMINALIO
 static supervisor_allocation* tilegrid_tiles = NULL;
+#endif
 
 void supervisor_start_terminal(uint16_t width_px, uint16_t height_px) {
+    // Default the scale to 2 because we may show blinka without the terminal for
+    // languages that don't have font support.
+    uint8_t scale = 2;
+
+    #if CIRCUITPY_TERMINALIO
     displayio_tilegrid_t* grid = &supervisor_terminal_text_grid;
     uint16_t width_in_tiles = (width_px - blinka_bitmap.width) / grid->tile_width;
     // determine scale based on h
-    uint8_t scale = 1;
-    if (width_in_tiles > 80) {
-        scale = 2;
+    if (width_in_tiles < 80) {
+        scale = 1;
     }
     width_in_tiles = (width_px - blinka_bitmap.width * scale) / (grid->tile_width * scale);
     uint16_t height_in_tiles = height_px / (grid->tile_height * scale);
@@ -58,7 +71,6 @@ void supervisor_start_terminal(uint16_t width_px, uint16_t height_px) {
     if (remaining_pixels > 0) {
         height_in_tiles += 1;
     }
-    circuitpython_splash.scale = scale;
 
     uint16_t total_tiles = width_in_tiles * height_in_tiles;
 
@@ -88,43 +100,57 @@ void supervisor_start_terminal(uint16_t width_px, uint16_t height_px) {
     grid->full_change = true;
 
     common_hal_terminalio_terminal_construct(&supervisor_terminal, grid, &supervisor_terminal_font);
+    #endif
+
+    circuitpython_splash.scale = scale;
 }
 
 void supervisor_stop_terminal(void) {
+    #if CIRCUITPY_TERMINALIO
     if (tilegrid_tiles != NULL) {
         free_memory(tilegrid_tiles);
         tilegrid_tiles = NULL;
         supervisor_terminal_text_grid.inline_tiles = false;
         supervisor_terminal_text_grid.tiles = NULL;
     }
+    #endif
 }
 
 void supervisor_display_move_memory(void) {
-    #if CIRCUITPY_DISPLAYIO
+    #if CIRCUITPY_TERMINALIO
     displayio_tilegrid_t* grid = &supervisor_terminal_text_grid;
-    if (MP_STATE_VM(terminal_tilegrid_tiles) == NULL || grid->tiles != MP_STATE_VM(terminal_tilegrid_tiles)) {
-        return;
-    }
-    uint16_t total_tiles = grid->width_in_tiles * grid->height_in_tiles;
+    if (MP_STATE_VM(terminal_tilegrid_tiles) != NULL &&
+        grid->tiles == MP_STATE_VM(terminal_tilegrid_tiles)) {
+        uint16_t total_tiles = grid->width_in_tiles * grid->height_in_tiles;
 
-    tilegrid_tiles = allocate_memory(align32_size(total_tiles), false);
-    if (tilegrid_tiles != NULL) {
-        memcpy(tilegrid_tiles->ptr, grid->tiles, total_tiles);
-        grid->tiles = (uint8_t*) tilegrid_tiles->ptr;
-    } else {
-        grid->tiles = NULL;
-        grid->inline_tiles = false;
+        tilegrid_tiles = allocate_memory(align32_size(total_tiles), false);
+        if (tilegrid_tiles != NULL) {
+            memcpy(tilegrid_tiles->ptr, grid->tiles, total_tiles);
+            grid->tiles = (uint8_t*) tilegrid_tiles->ptr;
+        } else {
+            grid->tiles = NULL;
+            grid->inline_tiles = false;
+        }
+        MP_STATE_VM(terminal_tilegrid_tiles) = NULL;
     }
-    MP_STATE_VM(terminal_tilegrid_tiles) = NULL;
-    #if CIRCUITPY_RGBMATRIX
+    #endif
+
+    #if CIRCUITPY_DISPLAYIO
     for (uint8_t i = 0; i < CIRCUITPY_DISPLAY_LIMIT; i++) {
-        if (displays[i].rgbmatrix.base.type == &rgbmatrix_RGBMatrix_type) {
-            rgbmatrix_rgbmatrix_obj_t * pm = &displays[i].rgbmatrix;
+        #if CIRCUITPY_RGBMATRIX
+            if (displays[i].rgbmatrix.base.type == &rgbmatrix_RGBMatrix_type) {
+                rgbmatrix_rgbmatrix_obj_t * pm = &displays[i].rgbmatrix;
                 common_hal_rgbmatrix_rgbmatrix_reconstruct(pm, NULL);
-        }
+            }
+        #endif
+        #if CIRCUITPY_SHARPDISPLAY
+            if (displays[i].bus_base.type == &sharpdisplay_framebuffer_type) {
+                sharpdisplay_framebuffer_obj_t * sharp = &displays[i].sharpdisplay;
+                common_hal_sharpdisplay_framebuffer_reconstruct(sharp);
+            }
+        #endif
     }
     #endif
-    #endif
 }
 
 size_t blinka_bitmap_data[32] = {
@@ -242,18 +268,26 @@ displayio_tilegrid_t blinka_sprite = {
     .in_group = true
 };
 
+#if CIRCUITPY_TERMINALIO
+#define CHILD_COUNT 2
 displayio_group_child_t splash_children[2] = {
     {&blinka_sprite, &blinka_sprite},
     {&supervisor_terminal_text_grid, &supervisor_terminal_text_grid}
 };
+#else
+#define CHILD_COUNT 1
+displayio_group_child_t splash_children[1] = {
+    {&blinka_sprite, &blinka_sprite},
+};
+#endif
 
 displayio_group_t circuitpython_splash = {
     .base = {.type = &displayio_group_type },
     .x = 0,
     .y = 0,
     .scale = 2,
-    .size = 2,
-    .max_size = 2,
+    .size = CHILD_COUNT,
+    .max_size = CHILD_COUNT,
     .children = splash_children,
     .item_removed = false,
     .in_group = false,
diff --git a/supervisor/shared/display.h b/supervisor/shared/display.h
index 2a2ccf46d..4110cfe8e 100644
--- a/supervisor/shared/display.h
+++ b/supervisor/shared/display.h
@@ -27,6 +27,10 @@
 #ifndef MICROPY_INCLUDED_SUPERVISOR_SHARED_DISPLAY_H
 #define MICROPY_INCLUDED_SUPERVISOR_SHARED_DISPLAY_H
 
+#include <stdint.h>
+
+#if CIRCUITPY_TERMINALIO
+
 #include "shared-bindings/displayio/Bitmap.h"
 #include "shared-bindings/displayio/TileGrid.h"
 #include "shared-bindings/fontio/BuiltinFont.h"
@@ -42,6 +46,8 @@ extern displayio_bitmap_t supervisor_terminal_font_bitmap;
 extern displayio_tilegrid_t supervisor_terminal_text_grid;
 extern terminalio_terminal_obj_t supervisor_terminal;
 
+#endif
+
 void supervisor_start_terminal(uint16_t width_px, uint16_t height_px);
 void supervisor_stop_terminal(void);
 
diff --git a/supervisor/shared/rgb_led_status.c b/supervisor/shared/rgb_led_status.c
index f3c210647..2f23e3125 100644
--- a/supervisor/shared/rgb_led_status.c
+++ b/supervisor/shared/rgb_led_status.c
@@ -28,6 +28,7 @@
 #include "shared-bindings/microcontroller/Pin.h"
 #include "rgb_led_status.h"
 #include "supervisor/shared/tick.h"
+#include "py/obj.h"
 
 #ifdef MICROPY_HW_NEOPIXEL
 uint8_t rgb_status_brightness = 63;
@@ -365,6 +366,11 @@ void prep_rgb_status_animation(const pyexec_result_t* result,
     status->safe_mode = safe_mode;
     status->found_main = found_main;
     status->total_exception_cycle = 0;
+    status->ok = result->return_code != PYEXEC_EXCEPTION;
+    if (status->ok) {
+        // If this isn't an exception, skip exception sorting and handling
+        return;
+    }
     status->ones = result->exception_line % 10;
     status->ones += status->ones > 0 ? 1 : 0;
     status->tens = (result->exception_line / 10) % 10;
@@ -382,11 +388,12 @@ void prep_rgb_status_animation(const pyexec_result_t* result,
         }
         line /= 10;
     }
-    status->ok = result->return_code != PYEXEC_EXCEPTION;
     if (!status->ok) {
         status->total_exception_cycle = EXCEPTION_TYPE_LENGTH_MS * 3 + LINE_NUMBER_TOGGLE_LENGTH * status->digit_sum + LINE_NUMBER_TOGGLE_LENGTH * num_places;
     }
-    if (mp_obj_is_subclass_fast(result->exception_type, &mp_type_IndentationError)) {
+    if (!result->exception_type) {
+        status->exception_color = OTHER_ERROR;
+    } else if (mp_obj_is_subclass_fast(result->exception_type, &mp_type_IndentationError)) {
         status->exception_color = INDENTATION_ERROR;
     } else if (mp_obj_is_subclass_fast(result->exception_type, &mp_type_SyntaxError)) {
         status->exception_color = SYNTAX_ERROR;
diff --git a/supervisor/shared/safe_mode.c b/supervisor/shared/safe_mode.c
index a167ab392..3275cc66f 100644
--- a/supervisor/shared/safe_mode.c
+++ b/supervisor/shared/safe_mode.c
@@ -151,9 +151,13 @@ void print_safe_mode_message(safe_mode_t reason) {
             case GC_ALLOC_OUTSIDE_VM:
                 serial_write_compressed(translate("Attempted heap allocation when MicroPython VM not running."));
                 break;
+#ifdef SOFTDEVICE_PRESENT
+            // defined in ports/nrf/bluetooth/bluetooth_common.mk
+            // will print "Unknown reason" if somehow encountered on other ports
             case NORDIC_SOFT_DEVICE_ASSERT:
                 serial_write_compressed(translate("Nordic Soft Device failure assertion."));
                 break;
+#endif
             case FLASH_WRITE_FAIL:
                 serial_write_compressed(translate("Failed to write internal flash."));
                 break;
diff --git a/supervisor/shared/serial.c b/supervisor/shared/serial.c
index 8eb78a90e..303f89e75 100644
--- a/supervisor/shared/serial.c
+++ b/supervisor/shared/serial.c
@@ -99,7 +99,7 @@ void serial_write_substring(const char* text, uint32_t length) {
     if (length == 0) {
         return;
     }
-#if CIRCUITPY_DISPLAYIO
+#if CIRCUITPY_TERMINALIO
     int errcode;
     common_hal_terminalio_terminal_write(&supervisor_terminal, (const uint8_t*) text, length, &errcode);
 #endif
diff --git a/supervisor/supervisor.mk b/supervisor/supervisor.mk
index 940e3de4b..fdfaa1bf8 100644
--- a/supervisor/supervisor.mk
+++ b/supervisor/supervisor.mk
@@ -110,7 +110,9 @@ ifeq ($(CIRCUITPY_DISPLAYIO), 1)
 	SRC_SUPERVISOR += \
 		supervisor/shared/display.c
 
-	SUPERVISOR_O += $(BUILD)/autogen_display_resources.o
+	ifeq ($(CIRCUITPY_TERMINALIO), 1)
+		SUPERVISOR_O += $(BUILD)/autogen_display_resources.o
+	endif
 endif
 ifndef USB_INTERFACE_NAME
 USB_INTERFACE_NAME = "CircuitPython"