Fix neopixel macro issue, set default neopixel color

6 files changed, 18 insertions, 25 deletions

diff --git a/ports/esp32s2/boards/espressif_saola_1_wroom/mpconfigboard.h b/ports/esp32s2/boards/espressif_saola_1_wroom/mpconfigboard.h
index 78652e215..a94f10ea4 100644
--- a/ports/esp32s2/boards/espressif_saola_1_wroom/mpconfigboard.h
+++ b/ports/esp32s2/boards/espressif_saola_1_wroom/mpconfigboard.h
@@ -29,4 +29,6 @@
 #define MICROPY_HW_BOARD_NAME       "Saola 1 w/Wroom"
 #define MICROPY_HW_MCU_NAME         "ESP32S2"
 
+#define MICROPY_HW_NEOPIXEL (&pin_GPIO18)
+
 #define AUTORESET_DELAY_MS 500
diff --git a/ports/esp32s2/boards/espressif_saola_1_wroom/mpconfigboard.mk b/ports/esp32s2/boards/espressif_saola_1_wroom/mpconfigboard.mk
index 6e7627265..9c9ca6169 100644
--- a/ports/esp32s2/boards/espressif_saola_1_wroom/mpconfigboard.mk
+++ b/ports/esp32s2/boards/espressif_saola_1_wroom/mpconfigboard.mk
@@ -10,8 +10,6 @@ LONGINT_IMPL = MPZ
 # so increase it to 32.
 CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
 
-CIRCUITPY_NEOPIXEL_WRITE = 0
-
 CIRCUITPY_ESP_FLASH_MODE=dio
 CIRCUITPY_ESP_FLASH_FREQ=40m
 CIRCUITPY_ESP_FLASH_SIZE=4MB
diff --git a/ports/esp32s2/boards/espressif_saola_1_wrover/mpconfigboard.mk b/ports/esp32s2/boards/espressif_saola_1_wrover/mpconfigboard.mk
index 1437df7f4..d5ff1c5ac 100644
--- a/ports/esp32s2/boards/espressif_saola_1_wrover/mpconfigboard.mk
+++ b/ports/esp32s2/boards/espressif_saola_1_wrover/mpconfigboard.mk
@@ -10,8 +10,6 @@ LONGINT_IMPL = MPZ
 # so increase it to 32.
 CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
 
-CIRCUITPY_NEOPIXEL_WRITE = 0
-
 CIRCUITPY_ESP_FLASH_MODE=dio
 CIRCUITPY_ESP_FLASH_FREQ=40m
 CIRCUITPY_ESP_FLASH_SIZE=4MB
diff --git a/ports/esp32s2/boards/unexpectedmaker_feathers2/mpconfigboard.mk b/ports/esp32s2/boards/unexpectedmaker_feathers2/mpconfigboard.mk
index ea3484d2f..294736d17 100644
--- a/ports/esp32s2/boards/unexpectedmaker_feathers2/mpconfigboard.mk
+++ b/ports/esp32s2/boards/unexpectedmaker_feathers2/mpconfigboard.mk
@@ -4,7 +4,6 @@ USB_PRODUCT = "FeatherS2"
 USB_MANUFACTURER = "UnexpectedMaker"
 USB_DEVICES = "CDC,MSC,HID"
 
-
 INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = MPZ
 
@@ -12,8 +11,6 @@ LONGINT_IMPL = MPZ
 # so increase it to 32.
 CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
 
-CIRCUITPY_NEOPIXEL_WRITE = 0
-
 CIRCUITPY_ESP_FLASH_MODE=qio
 CIRCUITPY_ESP_FLASH_FREQ=40m
 CIRCUITPY_ESP_FLASH_SIZE=16MB
diff --git a/ports/esp32s2/mpconfigport.mk b/ports/esp32s2/mpconfigport.mk
index 20a30c82e..a7873aa46 100644
--- a/ports/esp32s2/mpconfigport.mk
+++ b/ports/esp32s2/mpconfigport.mk
@@ -12,8 +12,6 @@ USB_SERIAL_NUMBER_LENGTH = 12
 # Longints can be implemented as mpz, as longlong, or not
 LONGINT_IMPL = MPZ
 
-CIRCUITPY_NEOPIXEL_WRITE = 1
-
 # These modules are implemented in ports/<port>/common-hal:
 CIRCUITPY_ANALOGIO = 0
 CIRCUITPY_NVM = 0
diff --git a/supervisor/shared/rgb_led_status.c b/supervisor/shared/rgb_led_status.c
index b66bbd9d5..fe99129f8 100644
--- a/supervisor/shared/rgb_led_status.c
+++ b/supervisor/shared/rgb_led_status.c
@@ -387,22 +387,22 @@ void prep_rgb_status_animation(const pyexec_result_t* result,
     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 (result->exception_type) {
-        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;
-        } else if (mp_obj_is_subclass_fast(result->exception_type, &mp_type_NameError)) {
-            status->exception_color = NAME_ERROR;
-        } else if (mp_obj_is_subclass_fast(result->exception_type, &mp_type_OSError)) {
-            status->exception_color = OS_ERROR;
-        } else if (mp_obj_is_subclass_fast(result->exception_type, &mp_type_ValueError)) {
-            status->exception_color = VALUE_ERROR;
-        } else if (mp_obj_is_subclass_fast(result->exception_type, &mp_type_MpyError)) {
-            status->exception_color = MPY_ERROR;
-        } else {
-            status->exception_color = OTHER_ERROR;
-        }
+    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;
+    } else if (mp_obj_is_subclass_fast(result->exception_type, &mp_type_NameError)) {
+        status->exception_color = NAME_ERROR;
+    } else if (mp_obj_is_subclass_fast(result->exception_type, &mp_type_OSError)) {
+        status->exception_color = OS_ERROR;
+    } else if (mp_obj_is_subclass_fast(result->exception_type, &mp_type_ValueError)) {
+        status->exception_color = VALUE_ERROR;
+    } else if (mp_obj_is_subclass_fast(result->exception_type, &mp_type_MpyError)) {
+        status->exception_color = MPY_ERROR;
+    } else {
+        status->exception_color = OTHER_ERROR;
     }
     #endif
 }