djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix neopixel macro issue, set default neopixel color

Browse Source
This commit is contained in:
Lucian Copeland 2020-08-10 13:16:20 -04:00
parent 78d049d0f1
commit d47bd5529c
6 changed files with 18 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/esp32s2/boards/espressif_saola_1_wroom/mpconfigboard.h
View File

@ -29,4 +29,6 @@
#define MICROPY_HW_BOARD_NAME "Saola 1 w/Wroom" #define MICROPY_HW_BOARD_NAME "Saola 1 w/Wroom"
#define MICROPY_HW_MCU_NAME "ESP32S2" #define MICROPY_HW_MCU_NAME "ESP32S2"
#define MICROPY_HW_NEOPIXEL (&pin_GPIO18)
#define AUTORESET_DELAY_MS 500 #define AUTORESET_DELAY_MS 500

2
ports/esp32s2/boards/espressif_saola_1_wroom/mpconfigboard.mk
View File

@ -10,8 +10,6 @@ LONGINT_IMPL = MPZ
# so increase it to 32. # so increase it to 32.
CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32 CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
CIRCUITPY_NEOPIXEL_WRITE = 0
CIRCUITPY_ESP_FLASH_MODE=dio CIRCUITPY_ESP_FLASH_MODE=dio
CIRCUITPY_ESP_FLASH_FREQ=40m CIRCUITPY_ESP_FLASH_FREQ=40m
CIRCUITPY_ESP_FLASH_SIZE=4MB CIRCUITPY_ESP_FLASH_SIZE=4MB

2
ports/esp32s2/boards/espressif_saola_1_wrover/mpconfigboard.mk
View File

@ -10,8 +10,6 @@ LONGINT_IMPL = MPZ
# so increase it to 32. # so increase it to 32.
CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32 CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
CIRCUITPY_NEOPIXEL_WRITE = 0
CIRCUITPY_ESP_FLASH_MODE=dio CIRCUITPY_ESP_FLASH_MODE=dio
CIRCUITPY_ESP_FLASH_FREQ=40m CIRCUITPY_ESP_FLASH_FREQ=40m
CIRCUITPY_ESP_FLASH_SIZE=4MB CIRCUITPY_ESP_FLASH_SIZE=4MB

3
ports/esp32s2/boards/unexpectedmaker_feathers2/mpconfigboard.mk
View File

@ -4,7 +4,6 @@ USB_PRODUCT = "FeatherS2"
USB_MANUFACTURER = "UnexpectedMaker" USB_MANUFACTURER = "UnexpectedMaker"
USB_DEVICES = "CDC,MSC,HID" USB_DEVICES = "CDC,MSC,HID"
INTERNAL_FLASH_FILESYSTEM = 1 INTERNAL_FLASH_FILESYSTEM = 1
LONGINT_IMPL = MPZ LONGINT_IMPL = MPZ
@ -12,8 +11,6 @@ LONGINT_IMPL = MPZ
# so increase it to 32. # so increase it to 32.
CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32 CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
CIRCUITPY_NEOPIXEL_WRITE = 0
CIRCUITPY_ESP_FLASH_MODE=qio CIRCUITPY_ESP_FLASH_MODE=qio
CIRCUITPY_ESP_FLASH_FREQ=40m CIRCUITPY_ESP_FLASH_FREQ=40m
CIRCUITPY_ESP_FLASH_SIZE=16MB CIRCUITPY_ESP_FLASH_SIZE=16MB

2
ports/esp32s2/mpconfigport.mk
View File

@ -12,8 +12,6 @@ USB_SERIAL_NUMBER_LENGTH = 12
# Longints can be implemented as mpz, as longlong, or not # Longints can be implemented as mpz, as longlong, or not
LONGINT_IMPL = MPZ LONGINT_IMPL = MPZ
CIRCUITPY_NEOPIXEL_WRITE = 1
# These modules are implemented in ports/<port>/common-hal: # These modules are implemented in ports/<port>/common-hal:
CIRCUITPY_ANALOGIO = 0 CIRCUITPY_ANALOGIO = 0
CIRCUITPY_NVM = 0 CIRCUITPY_NVM = 0

32
supervisor/shared/rgb_led_status.c
View File

@ -387,22 +387,22 @@ void prep_rgb_status_animation(const pyexec_result_t* result,
if (!status->ok) { 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; 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 (!result->exception_type) {
if (mp_obj_is_subclass_fast(result->exception_type, &mp_type_IndentationError)) { status->exception_color = OTHER_ERROR;
status->exception_color = INDENTATION_ERROR; } else if (mp_obj_is_subclass_fast(result->exception_type, &mp_type_IndentationError)) {
} else if (mp_obj_is_subclass_fast(result->exception_type, &mp_type_SyntaxError)) { status->exception_color = INDENTATION_ERROR;
status->exception_color = SYNTAX_ERROR; } else if (mp_obj_is_subclass_fast(result->exception_type, &mp_type_SyntaxError)) {
} else if (mp_obj_is_subclass_fast(result->exception_type, &mp_type_NameError)) { status->exception_color = SYNTAX_ERROR;
status->exception_color = NAME_ERROR; } else if (mp_obj_is_subclass_fast(result->exception_type, &mp_type_NameError)) {
} else if (mp_obj_is_subclass_fast(result->exception_type, &mp_type_OSError)) { status->exception_color = NAME_ERROR;
status->exception_color = OS_ERROR; } else if (mp_obj_is_subclass_fast(result->exception_type, &mp_type_OSError)) {
} else if (mp_obj_is_subclass_fast(result->exception_type, &mp_type_ValueError)) { status->exception_color = OS_ERROR;
status->exception_color = VALUE_ERROR; } else if (mp_obj_is_subclass_fast(result->exception_type, &mp_type_ValueError)) {
} else if (mp_obj_is_subclass_fast(result->exception_type, &mp_type_MpyError)) { status->exception_color = VALUE_ERROR;
status->exception_color = MPY_ERROR; } else if (mp_obj_is_subclass_fast(result->exception_type, &mp_type_MpyError)) {
} else { status->exception_color = MPY_ERROR;
status->exception_color = OTHER_ERROR; } else {
} status->exception_color = OTHER_ERROR;
} }
#endif #endif
} }