From 19db8866459dbad728318fca5eec1d7ff1cadf00 Mon Sep 17 00:00:00 2001 From: Scott Shawcroft Date: Wed, 9 Jan 2019 10:19:07 -0800 Subject: [PATCH 1/3] Support the display on the pyportal. Also fix #1390, reload during sleep broken. --- ports/atmel-samd/boards/pyportal/board.c | 79 +++++++++++++++++++ .../boards/pyportal/mpconfigboard.h | 2 + ports/atmel-samd/boards/pyportal/pins.c | 3 + .../common-hal/displayio/FourWire.c | 6 ++ .../common-hal/microcontroller/__init__.c | 12 +++ ports/atmel-samd/mphalport.c | 3 +- ports/nrf/mphalport.c | 3 +- 7 files changed, 106 insertions(+), 2 deletions(-) diff --git a/ports/atmel-samd/boards/pyportal/board.c b/ports/atmel-samd/boards/pyportal/board.c index 7599f02b8e..c361b56595 100644 --- a/ports/atmel-samd/boards/pyportal/board.c +++ b/ports/atmel-samd/boards/pyportal/board.c @@ -28,7 +28,85 @@ #include "mpconfigboard.h" #include "hal/include/hal_gpio.h" +#include "shared-bindings/displayio/FourWire.h" +#include "shared-module/displayio/mipi_constants.h" + +#include "tick.h" + +displayio_fourwire_obj_t board_display_obj; + +#define DELAY 0x80 + +uint8_t display_init_sequence[] = { + 0xEF, 3, 0x03, 0x80, 0x02, + 0xCF, 3, 0x00, 0xC1, 0x30, + 0xED, 4, 0x64, 0x03, 0x12, 0x81, + 0xE8, 3, 0x85, 0x00, 0x78, + 0xCB, 5, 0x39, 0x2C, 0x00, 0x34, 0x02, + 0xF7, 1, 0x20, + 0xEA, 2, 0x00, 0x00, + 0xc0, 1, 0x23, // Power control VRH[5:0] + 0xc1, 1, 0x10, // Power control SAP[2:0];BT[3:0] + 0xc5, 2, 0x3e, 0x28, // VCM control + 0xc7, 1, 0x86, // VCM control2 + 0x36, 1, 0x48, // Memory Access Control + 0x37, 1, 0x00, // Vertical scroll zero + 0x3a, 1, 0x55, // COLMOD: Pixel Format Set + 0xb1, 2, 0x00, 0x18, // Frame Rate Control (In Normal Mode/Full Colors) + 0xb6, 3, 0x08, 0x82, 0x27, // Display Function Control + 0xF2, 1, 0x00, // 3Gamma Function Disable + 0x26, 1, 0x01, // Gamma curve selected + 0xe0, 15, 0x0F, 0x31, 0x2B, 0x0C, 0x0E, 0x08, // Set Gamma + 0x4E, 0xF1, 0x37, 0x07, 0x10, 0x03, 0x0E, 0x09, 0x00, + 0xe1, 15, 0x00, 0x0E, 0x14, 0x03, 0x11, 0x07, // Set Gamma + 0x31, 0xC1, 0x48, 0x08, 0x0F, 0x0C, 0x31, 0x36, 0x0F, + 0x11, DELAY, 120, // Exit Sleep + 0x29, DELAY, 120, // Display on +}; + + void board_init(void) { + board_display_obj.base.type = &displayio_fourwire_type; + common_hal_displayio_fourwire_construct(&board_display_obj, + &pin_PA13, // Clock + &pin_PA12, // Data + &pin_PB09, // Command or data + &pin_PB06, // Chip select + &pin_PB05, // Reset + 240, // Width + 320, // Height + 0, // column start + 0, // row start + 16, // Color depth + MIPI_COMMAND_SET_COLUMN_ADDRESS, // Set column command + MIPI_COMMAND_SET_PAGE_ADDRESS, // Set row command + MIPI_COMMAND_WRITE_MEMORY_START); // Write memory command + + uint32_t i = 0; + common_hal_displayio_fourwire_begin_transaction(&board_display_obj); + while (i < sizeof(display_init_sequence)) { + uint8_t *cmd = display_init_sequence + i; + uint8_t data_size = *(cmd + 1); + bool delay = (data_size & DELAY) != 0; + data_size &= ~DELAY; + uint8_t *data = cmd + 2; + common_hal_displayio_fourwire_send(&board_display_obj, true, cmd, 1); + common_hal_displayio_fourwire_send(&board_display_obj, false, data, data_size); + if (delay) { + data_size++; + uint16_t delay_length_ms = *(cmd + 1 + data_size); + if (delay_length_ms == 255) { + delay_length_ms = 500; + } + uint64_t start = ticks_ms; + while (ticks_ms - start < delay_length_ms) {} + } else { + uint64_t start = ticks_ms; + while (ticks_ms - start < 10) {} + } + i += 2 + data_size; + } + common_hal_displayio_fourwire_end_transaction(&board_display_obj); } bool board_requests_safe_mode(void) { @@ -36,4 +114,5 @@ bool board_requests_safe_mode(void) { } void reset_board(void) { + common_hal_displayio_fourwire_show(&board_display_obj, NULL); } diff --git a/ports/atmel-samd/boards/pyportal/mpconfigboard.h b/ports/atmel-samd/boards/pyportal/mpconfigboard.h index 16b1042971..847e2ba764 100644 --- a/ports/atmel-samd/boards/pyportal/mpconfigboard.h +++ b/ports/atmel-samd/boards/pyportal/mpconfigboard.h @@ -38,3 +38,5 @@ // USB is always used internally so skip the pin objects for it. #define IGNORE_PIN_PA24 1 #define IGNORE_PIN_PA25 1 + +#define CIRCUITPY_DISPLAYIO (1) diff --git a/ports/atmel-samd/boards/pyportal/pins.c b/ports/atmel-samd/boards/pyportal/pins.c index 84ecbaffff..7d4bc2a46a 100644 --- a/ports/atmel-samd/boards/pyportal/pins.c +++ b/ports/atmel-samd/boards/pyportal/pins.c @@ -1,5 +1,6 @@ #include "shared-bindings/board/__init__.h" +#include "boards/board.h" #include "board_busses.h" // This mapping only includes functional names because pins broken @@ -51,5 +52,7 @@ STATIC const mp_map_elem_t board_global_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) }, { MP_ROM_QSTR(MP_QSTR_SPI), MP_ROM_PTR(&board_spi_obj) }, + + { MP_ROM_QSTR(MP_QSTR_DISPLAY), MP_ROM_PTR(&board_display_obj)} }; MP_DEFINE_CONST_DICT(board_module_globals, board_global_dict_table); diff --git a/ports/atmel-samd/common-hal/displayio/FourWire.c b/ports/atmel-samd/common-hal/displayio/FourWire.c index 6c3b75a85b..b550f1c907 100644 --- a/ports/atmel-samd/common-hal/displayio/FourWire.c +++ b/ports/atmel-samd/common-hal/displayio/FourWire.c @@ -40,6 +40,8 @@ void common_hal_displayio_fourwire_construct(displayio_fourwire_obj_t* self, uint8_t set_column_command, uint8_t set_row_command, uint8_t write_ram_command) { common_hal_busio_spi_construct(&self->bus, clock, data, mp_const_none); + common_hal_busio_spi_never_reset(&self->bus); + common_hal_digitalio_digitalinout_construct(&self->command, command); common_hal_digitalio_digitalinout_switch_to_output(&self->command, true, DRIVE_MODE_PUSH_PULL); common_hal_digitalio_digitalinout_construct(&self->chip_select, chip_select); @@ -48,6 +50,10 @@ void common_hal_displayio_fourwire_construct(displayio_fourwire_obj_t* self, common_hal_digitalio_digitalinout_construct(&self->reset, reset); common_hal_digitalio_digitalinout_switch_to_output(&self->reset, true, DRIVE_MODE_PUSH_PULL); + never_reset_pin_number(command->number); + never_reset_pin_number(chip_select->number); + never_reset_pin_number(reset->number); + self->width = width; self->height = height; self->color_depth = color_depth; diff --git a/ports/atmel-samd/common-hal/microcontroller/__init__.c b/ports/atmel-samd/common-hal/microcontroller/__init__.c index 0ca3a08355..d1d0eae8db 100644 --- a/ports/atmel-samd/common-hal/microcontroller/__init__.c +++ b/ports/atmel-samd/common-hal/microcontroller/__init__.c @@ -252,6 +252,18 @@ STATIC const mp_rom_map_elem_t mcu_pin_global_dict_table[] = { #if defined(PIN_PB17) && !defined(IGNORE_PIN_PB17) { MP_ROM_QSTR(MP_QSTR_PB17), MP_ROM_PTR(&pin_PB17) }, #endif +#if defined(PIN_PB18) && !defined(IGNORE_PIN_PB18) + { MP_ROM_QSTR(MP_QSTR_PB18), MP_ROM_PTR(&pin_PB18) }, +#endif +#if defined(PIN_PB19) && !defined(IGNORE_PIN_PB19) + { MP_ROM_QSTR(MP_QSTR_PB19), MP_ROM_PTR(&pin_PB19) }, +#endif +#if defined(PIN_PB20) && !defined(IGNORE_PIN_PB20) + { MP_ROM_QSTR(MP_QSTR_PB20), MP_ROM_PTR(&pin_PB20) }, +#endif +#if defined(PIN_PB21) && !defined(IGNORE_PIN_PB21) + { MP_ROM_QSTR(MP_QSTR_PB21), MP_ROM_PTR(&pin_PB21) }, +#endif #if defined(PIN_PB22) && !defined(IGNORE_PIN_PB22) { MP_ROM_QSTR(MP_QSTR_PB22), MP_ROM_PTR(&pin_PB22) }, #endif diff --git a/ports/atmel-samd/mphalport.c b/ports/atmel-samd/mphalport.c index ac5b0fbcab..5c34a576a8 100644 --- a/ports/atmel-samd/mphalport.c +++ b/ports/atmel-samd/mphalport.c @@ -57,7 +57,8 @@ void mp_hal_delay_ms(mp_uint_t delay) { MICROPY_VM_HOOK_LOOP #endif // Check to see if we've been CTRL-Ced by autoreload or the user. - if(MP_STATE_VM(mp_pending_exception) == MP_OBJ_FROM_PTR(&MP_STATE_VM(mp_kbd_exception))) { + if(MP_STATE_VM(mp_pending_exception) == MP_OBJ_FROM_PTR(&MP_STATE_VM(mp_kbd_exception)) || + MP_STATE_VM(mp_pending_exception) == MP_OBJ_FROM_PTR(&MP_STATE_VM(mp_reload_exception))) { break; } duration = (ticks_ms - start_tick); diff --git a/ports/nrf/mphalport.c b/ports/nrf/mphalport.c index 73f38bada8..ea864e7ceb 100644 --- a/ports/nrf/mphalport.c +++ b/ports/nrf/mphalport.c @@ -42,7 +42,8 @@ void mp_hal_delay_ms(mp_uint_t delay) { MICROPY_VM_HOOK_LOOP #endif // Check to see if we've been CTRL-Ced by autoreload or the user. - if(MP_STATE_VM(mp_pending_exception) == MP_OBJ_FROM_PTR(&MP_STATE_VM(mp_kbd_exception))) { + if(MP_STATE_VM(mp_pending_exception) == MP_OBJ_FROM_PTR(&MP_STATE_VM(mp_kbd_exception)) || + MP_STATE_VM(mp_pending_exception) == MP_OBJ_FROM_PTR(&MP_STATE_VM(mp_reload_exception))) { break; } duration = (ticks_ms - start_tick); From 6594937a6504727940903fe1080e7aab9e89145d Mon Sep 17 00:00:00 2001 From: Scott Shawcroft Date: Thu, 10 Jan 2019 17:22:08 -0800 Subject: [PATCH 2/3] Support rendering groups inside groups --- shared-module/displayio/Group.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/shared-module/displayio/Group.c b/shared-module/displayio/Group.c index 655376da0a..93ac359643 100644 --- a/shared-module/displayio/Group.c +++ b/shared-module/displayio/Group.c @@ -71,6 +71,10 @@ bool displayio_group_get_pixel(displayio_group_t *self, int16_t x, int16_t y, ui if (displayio_sprite_get_pixel(layer, x, y, pixel)) { return true; } + } else if (MP_OBJ_IS_TYPE(layer, &displayio_group_type)) { + if (displayio_group_get_pixel(layer, x, y, pixel)) { + return true; + } } // TODO: Tiled layer } From b2cec6275c66a4854e2386a5b65644a4a72ae57e Mon Sep 17 00:00:00 2001 From: Scott Shawcroft Date: Fri, 11 Jan 2019 00:10:41 -0800 Subject: [PATCH 3/3] Fix screen rotation and reset pin --- ports/atmel-samd/boards/pyportal/board.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ports/atmel-samd/boards/pyportal/board.c b/ports/atmel-samd/boards/pyportal/board.c index c361b56595..9cf3ee8c22 100644 --- a/ports/atmel-samd/boards/pyportal/board.c +++ b/ports/atmel-samd/boards/pyportal/board.c @@ -49,7 +49,7 @@ uint8_t display_init_sequence[] = { 0xc1, 1, 0x10, // Power control SAP[2:0];BT[3:0] 0xc5, 2, 0x3e, 0x28, // VCM control 0xc7, 1, 0x86, // VCM control2 - 0x36, 1, 0x48, // Memory Access Control + 0x36, 1, 0x38, // Memory Access Control 0x37, 1, 0x00, // Vertical scroll zero 0x3a, 1, 0x55, // COLMOD: Pixel Format Set 0xb1, 2, 0x00, 0x18, // Frame Rate Control (In Normal Mode/Full Colors) @@ -72,9 +72,9 @@ void board_init(void) { &pin_PA12, // Data &pin_PB09, // Command or data &pin_PB06, // Chip select - &pin_PB05, // Reset - 240, // Width - 320, // Height + &pin_PA00, // Reset + 320, // Width + 240, // Height 0, // column start 0, // row start 16, // Color depth