Skip to content

Commit 62a8cc2

Browse files
tannewttannewt
authored
Merge pull request #1453 from tannewt/text_on_pyportal
Enable the display on pyportal
2 parents 573c6d6 + b2cec62 commit 62a8cc2

File tree

8 files changed

+110
-2
lines changed

8 files changed

+110
-2
lines changed

‎ports/atmel-samd/boards/pyportal/board.c

Lines changed: 79 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,91 @@
2828
#include "mpconfigboard.h"
2929
#include "hal/include/hal_gpio.h"
3030

31+
#include "shared-bindings/displayio/FourWire.h"
32+
#include "shared-module/displayio/mipi_constants.h"
33+
34+
#include "tick.h"
35+
36+
displayio_fourwire_obj_t board_display_obj;
37+
38+
#define DELAY 0x80
39+
40+
uint8_t display_init_sequence[] = {
41+
0xEF, 3, 0x03, 0x80, 0x02,
42+
0xCF, 3, 0x00, 0xC1, 0x30,
43+
0xED, 4, 0x64, 0x03, 0x12, 0x81,
44+
0xE8, 3, 0x85, 0x00, 0x78,
45+
0xCB, 5, 0x39, 0x2C, 0x00, 0x34, 0x02,
46+
0xF7, 1, 0x20,
47+
0xEA, 2, 0x00, 0x00,
48+
0xc0, 1, 0x23, // Power control VRH[5:0]
49+
0xc1, 1, 0x10, // Power control SAP[2:0];BT[3:0]
50+
0xc5, 2, 0x3e, 0x28, // VCM control
51+
0xc7, 1, 0x86, // VCM control2
52+
0x36, 1, 0x38, // Memory Access Control
53+
0x37, 1, 0x00, // Vertical scroll zero
54+
0x3a, 1, 0x55, // COLMOD: Pixel Format Set
55+
0xb1, 2, 0x00, 0x18, // Frame Rate Control (In Normal Mode/Full Colors)
56+
0xb6, 3, 0x08, 0x82, 0x27, // Display Function Control
57+
0xF2, 1, 0x00, // 3Gamma Function Disable
58+
0x26, 1, 0x01, // Gamma curve selected
59+
0xe0, 15, 0x0F, 0x31, 0x2B, 0x0C, 0x0E, 0x08, // Set Gamma
60+
0x4E, 0xF1, 0x37, 0x07, 0x10, 0x03, 0x0E, 0x09, 0x00,
61+
0xe1, 15, 0x00, 0x0E, 0x14, 0x03, 0x11, 0x07, // Set Gamma
62+
0x31, 0xC1, 0x48, 0x08, 0x0F, 0x0C, 0x31, 0x36, 0x0F,
63+
0x11, DELAY, 120, // Exit Sleep
64+
0x29, DELAY, 120, // Display on
65+
};
66+
67+
3168
void board_init(void) {
69+
board_display_obj.base.type = &displayio_fourwire_type;
70+
common_hal_displayio_fourwire_construct(&board_display_obj,
71+
&pin_PA13, // Clock
72+
&pin_PA12, // Data
73+
&pin_PB09, // Command or data
74+
&pin_PB06, // Chip select
75+
&pin_PA00, // Reset
76+
320, // Width
77+
240, // Height
78+
0, // column start
79+
0, // row start
80+
16, // Color depth
81+
MIPI_COMMAND_SET_COLUMN_ADDRESS, // Set column command
82+
MIPI_COMMAND_SET_PAGE_ADDRESS, // Set row command
83+
MIPI_COMMAND_WRITE_MEMORY_START); // Write memory command
84+
85+
uint32_t i = 0;
86+
common_hal_displayio_fourwire_begin_transaction(&board_display_obj);
87+
while (i < sizeof(display_init_sequence)) {
88+
uint8_t *cmd = display_init_sequence + i;
89+
uint8_t data_size = *(cmd + 1);
90+
bool delay = (data_size & DELAY) != 0;
91+
data_size &= ~DELAY;
92+
uint8_t *data = cmd + 2;
93+
common_hal_displayio_fourwire_send(&board_display_obj, true, cmd, 1);
94+
common_hal_displayio_fourwire_send(&board_display_obj, false, data, data_size);
95+
if (delay) {
96+
data_size++;
97+
uint16_t delay_length_ms = *(cmd + 1 + data_size);
98+
if (delay_length_ms == 255) {
99+
delay_length_ms = 500;
100+
}
101+
uint64_t start = ticks_ms;
102+
while (ticks_ms - start < delay_length_ms) {}
103+
} else {
104+
uint64_t start = ticks_ms;
105+
while (ticks_ms - start < 10) {}
106+
}
107+
i += 2 + data_size;
108+
}
109+
common_hal_displayio_fourwire_end_transaction(&board_display_obj);
32110
}
33111

34112
bool board_requests_safe_mode(void) {
35113
return false;
36114
}
37115

38116
void reset_board(void) {
117+
common_hal_displayio_fourwire_show(&board_display_obj, NULL);
39118
}

‎ports/atmel-samd/boards/pyportal/mpconfigboard.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,3 +38,5 @@
3838
// USB is always used internally so skip the pin objects for it.
3939
#define IGNORE_PIN_PA24 1
4040
#define IGNORE_PIN_PA25 1
41+
42+
#define CIRCUITPY_DISPLAYIO (1)

‎ports/atmel-samd/boards/pyportal/pins.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
#include "shared-bindings/board/__init__.h"
22

3+
#include "boards/board.h"
34
#include "board_busses.h"
45

56
// This mapping only includes functional names because pins broken
@@ -51,5 +52,7 @@ STATIC const mp_map_elem_t board_global_dict_table[] = {
5152

5253
{ MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) },
5354
{ MP_ROM_QSTR(MP_QSTR_SPI), MP_ROM_PTR(&board_spi_obj) },
55+
56+
{ MP_ROM_QSTR(MP_QSTR_DISPLAY), MP_ROM_PTR(&board_display_obj)}
5457
};
5558
MP_DEFINE_CONST_DICT(board_module_globals, board_global_dict_table);

‎ports/atmel-samd/common-hal/displayio/FourWire.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@ void common_hal_displayio_fourwire_construct(displayio_fourwire_obj_t* self,
4040
uint8_t set_column_command, uint8_t set_row_command, uint8_t write_ram_command) {
4141

4242
common_hal_busio_spi_construct(&self->bus, clock, data, mp_const_none);
43+
common_hal_busio_spi_never_reset(&self->bus);
44+
4345
common_hal_digitalio_digitalinout_construct(&self->command, command);
4446
common_hal_digitalio_digitalinout_switch_to_output(&self->command, true, DRIVE_MODE_PUSH_PULL);
4547
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,
4850
common_hal_digitalio_digitalinout_construct(&self->reset, reset);
4951
common_hal_digitalio_digitalinout_switch_to_output(&self->reset, true, DRIVE_MODE_PUSH_PULL);
5052

53+
never_reset_pin_number(command->number);
54+
never_reset_pin_number(chip_select->number);
55+
never_reset_pin_number(reset->number);
56+
5157
self->width = width;
5258
self->height = height;
5359
self->color_depth = color_depth;

‎ports/atmel-samd/common-hal/microcontroller/__init__.c

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -252,6 +252,18 @@ STATIC const mp_rom_map_elem_t mcu_pin_global_dict_table[] = {
252252
#if defined(PIN_PB17) && !defined(IGNORE_PIN_PB17)
253253
{ MP_ROM_QSTR(MP_QSTR_PB17), MP_ROM_PTR(&pin_PB17) },
254254
#endif
255+
#if defined(PIN_PB18) && !defined(IGNORE_PIN_PB18)
256+
{ MP_ROM_QSTR(MP_QSTR_PB18), MP_ROM_PTR(&pin_PB18) },
257+
#endif
258+
#if defined(PIN_PB19) && !defined(IGNORE_PIN_PB19)
259+
{ MP_ROM_QSTR(MP_QSTR_PB19), MP_ROM_PTR(&pin_PB19) },
260+
#endif
261+
#if defined(PIN_PB20) && !defined(IGNORE_PIN_PB20)
262+
{ MP_ROM_QSTR(MP_QSTR_PB20), MP_ROM_PTR(&pin_PB20) },
263+
#endif
264+
#if defined(PIN_PB21) && !defined(IGNORE_PIN_PB21)
265+
{ MP_ROM_QSTR(MP_QSTR_PB21), MP_ROM_PTR(&pin_PB21) },
266+
#endif
255267
#if defined(PIN_PB22) && !defined(IGNORE_PIN_PB22)
256268
{ MP_ROM_QSTR(MP_QSTR_PB22), MP_ROM_PTR(&pin_PB22) },
257269
#endif

‎ports/atmel-samd/mphalport.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,8 @@ void mp_hal_delay_ms(mp_uint_t delay) {
5757
MICROPY_VM_HOOK_LOOP
5858
#endif
5959
// Check to see if we've been CTRL-Ced by autoreload or the user.
60-
if(MP_STATE_VM(mp_pending_exception) == MP_OBJ_FROM_PTR(&MP_STATE_VM(mp_kbd_exception))) {
60+
if(MP_STATE_VM(mp_pending_exception) == MP_OBJ_FROM_PTR(&MP_STATE_VM(mp_kbd_exception)) ||
61+
MP_STATE_VM(mp_pending_exception) == MP_OBJ_FROM_PTR(&MP_STATE_VM(mp_reload_exception))) {
6162
break;
6263
}
6364
duration = (ticks_ms - start_tick);

‎ports/nrf/mphalport.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,8 @@ void mp_hal_delay_ms(mp_uint_t delay) {
4242
MICROPY_VM_HOOK_LOOP
4343
#endif
4444
// Check to see if we've been CTRL-Ced by autoreload or the user.
45-
if(MP_STATE_VM(mp_pending_exception) == MP_OBJ_FROM_PTR(&MP_STATE_VM(mp_kbd_exception))) {
45+
if(MP_STATE_VM(mp_pending_exception) == MP_OBJ_FROM_PTR(&MP_STATE_VM(mp_kbd_exception)) ||
46+
MP_STATE_VM(mp_pending_exception) == MP_OBJ_FROM_PTR(&MP_STATE_VM(mp_reload_exception))) {
4647
break;
4748
}
4849
duration = (ticks_ms - start_tick);

‎shared-module/displayio/Group.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,10 @@ bool displayio_group_get_pixel(displayio_group_t *self, int16_t x, int16_t y, ui
7171
if (displayio_sprite_get_pixel(layer, x, y, pixel)) {
7272
return true;
7373
}
74+
} else if (MP_OBJ_IS_TYPE(layer, &displayio_group_type)) {
75+
if (displayio_group_get_pixel(layer, x, y, pixel)) {
76+
return true;
77+
}
7478
}
7579
// TODO: Tiled layer
7680
}

0 commit comments

Comments
 (0)