Skip to content

Commit e39fbf1

Browse files
authored
Merge pull request #8401 from jepler/i2c-expander-init
Fast(ish) special purpose bitbang spi over i2c
2 parents 86990e9 + faa6887 commit e39fbf1

File tree

9 files changed

+393
-30
lines changed

9 files changed

+393
-30
lines changed

ports/espressif/boards/espressif_esp32s3_lcd_ev/board.c

Lines changed: 125 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,134 @@
2626

2727
#include "supervisor/board.h"
2828
#include "mpconfigboard.h"
29+
#include "shared-bindings/board/__init__.h"
30+
#include "shared-bindings/busio/I2C.h"
31+
#include "shared-bindings/dotclockframebuffer/DotClockFramebuffer.h"
32+
#include "shared-bindings/dotclockframebuffer/__init__.h"
33+
#include "shared-bindings/framebufferio/FramebufferDisplay.h"
2934
#include "shared-bindings/microcontroller/Pin.h"
35+
#include "shared-module/displayio/__init__.h"
3036

37+
static const uint8_t display_init_sequence[] = {
38+
0xf0, 5, 0x55, 0xaa, 0x52, 0x08, 0x00,
39+
0xf6, 2, 0x5a, 0x87,
40+
0xc1, 1, 0x3f,
41+
0xc2, 1, 0x0e,
42+
0xc6, 1, 0xf8,
43+
0xc9, 1, 0x10,
44+
0xcd, 1, 0x25,
45+
0xf8, 1, 0x8a,
46+
0xac, 1, 0x45,
47+
0xa0, 1, 0xdd,
48+
0xa7, 1, 0x47,
49+
0xfa, 4, 0x00, 0x00, 0x00, 0x04,
50+
0x86, 4, 0x99, 0xa3, 0xa3, 0x51,
51+
0xa3, 1, 0xee,
52+
0xfd, 3, 0x3c, 0x3c, 0x00,
53+
0x71, 1, 0x48,
54+
0x72, 1, 0x48,
55+
0x73, 2, 0x00, 0x44,
56+
0x97, 1, 0xee,
57+
0x83, 1, 0x93,
58+
0x9a, 1, 0x72,
59+
0x9b, 1, 0x5a,
60+
0x82, 2, 0x2c, 0x2c,
61+
0xb1, 1, 0x10,
62+
0x6d, 32, 0x00, 0x1f, 0x19, 0x1a, 0x10, 0x0e, 0x0c, 0x0a, 0x02, 0x07, 0x1e, 0x1e, 0x1e, 0x1e, 0x1e, 0x1e, 0x1e, 0x1e, 0x1e, 0x1e, 0x1e, 0x1e, 0x08, 0x01, 0x09, 0x0b, 0x0d, 0x0f, 0x1a, 0x19, 0x1f, 0x00,
63+
0x64, 16, 0x38, 0x05, 0x01, 0xdb, 0x03, 0x03, 0x38, 0x04, 0x01, 0xdc, 0x03, 0x03, 0x7a, 0x7a, 0x7a, 0x7a,
64+
0x65, 16, 0x38, 0x03, 0x01, 0xdd, 0x03, 0x03, 0x38, 0x02, 0x01, 0xde, 0x03, 0x03, 0x7a, 0x7a, 0x7a, 0x7a,
65+
0x66, 16, 0x38, 0x01, 0x01, 0xdf, 0x03, 0x03, 0x38, 0x00, 0x01, 0xe0, 0x03, 0x03, 0x7a, 0x7a, 0x7a, 0x7a,
66+
0x67, 16, 0x30, 0x01, 0x01, 0xe1, 0x03, 0x03, 0x30, 0x02, 0x01, 0xe2, 0x03, 0x03, 0x7a, 0x7a, 0x7a, 0x7a,
67+
0x68, 13, 0x00, 0x08, 0x15, 0x08, 0x15, 0x7a, 0x7a, 0x08, 0x15, 0x08, 0x15, 0x7a, 0x7a,
68+
0x60, 8, 0x38, 0x08, 0x7a, 0x7a, 0x38, 0x09, 0x7a, 0x7a,
69+
0x63, 8, 0x31, 0xe4, 0x7a, 0x7a, 0x31, 0xe5, 0x7a, 0x7a,
70+
0x69, 7, 0x04, 0x22, 0x14, 0x22, 0x14, 0x22, 0x08,
71+
0x6b, 1, 0x07,
72+
0x7a, 2, 0x08, 0x13,
73+
0x7b, 2, 0x08, 0x13,
74+
0xd1, 52, 0x00, 0x00, 0x00, 0x04, 0x00, 0x12, 0x00, 0x18, 0x00, 0x21, 0x00, 0x2a, 0x00, 0x35, 0x00, 0x47, 0x00, 0x56, 0x00, 0x90, 0x00, 0xe5, 0x01, 0x68, 0x01, 0xd5, 0x01, 0xd7, 0x02, 0x36, 0x02, 0xa6, 0x02, 0xee, 0x03, 0x48, 0x03, 0xa0, 0x03, 0xba, 0x03, 0xc5, 0x03, 0xd0, 0x03, 0xe0, 0x03, 0xea, 0x03, 0xfa, 0x03, 0xff,
75+
0xd2, 52, 0x00, 0x00, 0x00, 0x04, 0x00, 0x12, 0x00, 0x18, 0x00, 0x21, 0x00, 0x2a, 0x00, 0x35, 0x00, 0x47, 0x00, 0x56, 0x00, 0x90, 0x00, 0xe5, 0x01, 0x68, 0x01, 0xd5, 0x01, 0xd7, 0x02, 0x36, 0x02, 0xa6, 0x02, 0xee, 0x03, 0x48, 0x03, 0xa0, 0x03, 0xba, 0x03, 0xc5, 0x03, 0xd0, 0x03, 0xe0, 0x03, 0xea, 0x03, 0xfa, 0x03, 0xff,
76+
0xd3, 52, 0x00, 0x00, 0x00, 0x04, 0x00, 0x12, 0x00, 0x18, 0x00, 0x21, 0x00, 0x2a, 0x00, 0x35, 0x00, 0x47, 0x00, 0x56, 0x00, 0x90, 0x00, 0xe5, 0x01, 0x68, 0x01, 0xd5, 0x01, 0xd7, 0x02, 0x36, 0x02, 0xa6, 0x02, 0xee, 0x03, 0x48, 0x03, 0xa0, 0x03, 0xba, 0x03, 0xc5, 0x03, 0xd0, 0x03, 0xe0, 0x03, 0xea, 0x03, 0xfa, 0x03, 0xff,
77+
0xd4, 52, 0x00, 0x00, 0x00, 0x04, 0x00, 0x12, 0x00, 0x18, 0x00, 0x21, 0x00, 0x2a, 0x00, 0x35, 0x00, 0x47, 0x00, 0x56, 0x00, 0x90, 0x00, 0xe5, 0x01, 0x68, 0x01, 0xd5, 0x01, 0xd7, 0x02, 0x36, 0x02, 0xa6, 0x02, 0xee, 0x03, 0x48, 0x03, 0xa0, 0x03, 0xba, 0x03, 0xc5, 0x03, 0xd0, 0x03, 0xe0, 0x03, 0xea, 0x03, 0xfa, 0x03, 0xff,
78+
0xd5, 52, 0x00, 0x00, 0x00, 0x04, 0x00, 0x12, 0x00, 0x18, 0x00, 0x21, 0x00, 0x2a, 0x00, 0x35, 0x00, 0x47, 0x00, 0x56, 0x00, 0x90, 0x00, 0xe5, 0x01, 0x68, 0x01, 0xd5, 0x01, 0xd7, 0x02, 0x36, 0x02, 0xa6, 0x02, 0xee, 0x03, 0x48, 0x03, 0xa0, 0x03, 0xba, 0x03, 0xc5, 0x03, 0xd0, 0x03, 0xe0, 0x03, 0xea, 0x03, 0xfa, 0x03, 0xff,
79+
0xd6, 52, 0x00, 0x00, 0x00, 0x04, 0x00, 0x12, 0x00, 0x18, 0x00, 0x21, 0x00, 0x2a, 0x00, 0x35, 0x00, 0x47, 0x00, 0x56, 0x00, 0x90, 0x00, 0xe5, 0x01, 0x68, 0x01, 0xd5, 0x01, 0xd7, 0x02, 0x36, 0x02, 0xa6, 0x02, 0xee, 0x03, 0x48, 0x03, 0xa0, 0x03, 0xba, 0x03, 0xc5, 0x03, 0xd0, 0x03, 0xe0, 0x03, 0xea, 0x03, 0xfa, 0x03, 0xff,
80+
0x3a, 1, 0x66,
81+
0x3a, 1, 0x66,
82+
0x11, 0x80, 120,
83+
0x29, 0x0
84+
};
85+
86+
static const mcu_pin_obj_t *red_pins[] = {
87+
&pin_GPIO1, &pin_GPIO2, &pin_GPIO42, &pin_GPIO41, &pin_GPIO40
88+
};
89+
static const mcu_pin_obj_t *green_pins[] = {
90+
&pin_GPIO21, &pin_GPIO47, &pin_GPIO48, &pin_GPIO45, &pin_GPIO38, &pin_GPIO39
91+
};
92+
static const mcu_pin_obj_t *blue_pins[] = {
93+
&pin_GPIO10, &pin_GPIO11, &pin_GPIO12, &pin_GPIO13, &pin_GPIO14
94+
};
3195
void board_init(void) {
96+
dotclockframebuffer_framebuffer_obj_t *framebuffer = &allocate_display_bus_or_raise()->dotclock;
97+
framebuffer->base.type = &dotclockframebuffer_framebuffer_type;
98+
99+
common_hal_dotclockframebuffer_framebuffer_construct(
100+
framebuffer,
101+
/* de */ &pin_GPIO17,
102+
/* vsync */ &pin_GPIO3,
103+
/* hsync */ &pin_GPIO46,
104+
/* dclk */ &pin_GPIO9,
105+
/* data */ red_pins, MP_ARRAY_SIZE(red_pins), green_pins, MP_ARRAY_SIZE(green_pins), blue_pins, MP_ARRAY_SIZE(blue_pins),
106+
/* frequency */ 6500000,
107+
/* width x height */ 480, 480,
108+
/* horizontal: pulse, back & front porch, idle */ 13, 20, 40, false,
109+
/* vertical: pulse, back & front porch, idle */ 15, 20, 40, false,
110+
/* de_idle_high */ false,
111+
/* pclk_active_high */ true,
112+
/* pclk_idle_high */ false,
113+
/* overscan_left */ 0
114+
);
115+
116+
framebufferio_framebufferdisplay_obj_t *disp = &allocate_display_or_raise()->framebuffer_display;
117+
disp->base.type = &framebufferio_framebufferdisplay_type;
118+
common_hal_framebufferio_framebufferdisplay_construct(
119+
disp,
120+
framebuffer,
121+
0,
122+
true
123+
);
124+
125+
busio_i2c_obj_t i2c;
126+
i2c.base.type = &busio_i2c_type;
127+
common_hal_busio_i2c_construct(&i2c, DEFAULT_I2C_BUS_SCL, DEFAULT_I2C_BUS_SDA, 400000, 255);
128+
const int i2c_device_address = 32;
129+
130+
common_hal_busio_i2c_try_lock(&i2c);
131+
132+
{
133+
uint8_t buf[2] = {3, 0xf1}; // set GPIO direction
134+
common_hal_busio_i2c_write(&i2c, i2c_device_address, buf, sizeof(buf));
135+
}
136+
137+
{
138+
uint8_t buf[2] = {2, 0}; // set all output pins low initially
139+
common_hal_busio_i2c_write(&i2c, i2c_device_address, buf, sizeof(buf));
140+
}
141+
142+
common_hal_busio_i2c_unlock(&i2c);
143+
144+
dotclockframebuffer_ioexpander_spi_bus spibus = {
145+
.bus = &i2c,
146+
.i2c_device_address = i2c_device_address,
147+
.i2c_write_size = 2,
148+
.addr_reg_shadow = { .u32 = 1 }, // GPIO data at register 1
149+
.cs_mask = 0x100 << 1, // data payload is at byte 2
150+
.mosi_mask = 0x100 << 3,
151+
.clk_mask = 0x100 << 2,
152+
};
153+
154+
dotclockframebuffer_ioexpander_send_init_sequence(&spibus, display_init_sequence, sizeof(display_init_sequence));
155+
156+
common_hal_busio_i2c_deinit(&i2c);
32157
}
33158

34159
// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
Lines changed: 39 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
#include "py/objtuple.h"
22
#include "shared-bindings/board/__init__.h"
3+
#include "shared-module/displayio/__init__.h"
34

45
STATIC const mp_rom_obj_tuple_t tft_r_pins = {
56
{&mp_type_tuple},
67
5,
78
{
8-
MP_ROM_PTR(&pin_GPIO10),
9-
MP_ROM_PTR(&pin_GPIO11),
10-
MP_ROM_PTR(&pin_GPIO12),
11-
MP_ROM_PTR(&pin_GPIO13),
12-
MP_ROM_PTR(&pin_GPIO14),
9+
MP_ROM_PTR(&pin_GPIO1),
10+
MP_ROM_PTR(&pin_GPIO2),
11+
MP_ROM_PTR(&pin_GPIO42),
12+
MP_ROM_PTR(&pin_GPIO41),
13+
MP_ROM_PTR(&pin_GPIO40),
1314
}
1415
};
1516

@@ -30,50 +31,65 @@ STATIC const mp_rom_obj_tuple_t tft_b_pins = {
3031
{&mp_type_tuple},
3132
5,
3233
{
33-
MP_ROM_PTR(&pin_GPIO40),
34-
MP_ROM_PTR(&pin_GPIO41),
35-
MP_ROM_PTR(&pin_GPIO42),
36-
MP_ROM_PTR(&pin_GPIO2),
37-
MP_ROM_PTR(&pin_GPIO1),
34+
MP_ROM_PTR(&pin_GPIO10),
35+
MP_ROM_PTR(&pin_GPIO11),
36+
MP_ROM_PTR(&pin_GPIO12),
37+
MP_ROM_PTR(&pin_GPIO13),
38+
MP_ROM_PTR(&pin_GPIO14),
3839
}
3940
};
4041

41-
STATIC const mp_rom_map_elem_t tft_table[] = {
42+
STATIC const mp_rom_map_elem_t tft_pins_table[] = {
4243
{ MP_ROM_QSTR(MP_QSTR_de), MP_ROM_PTR(&pin_GPIO17) },
43-
{ MP_ROM_QSTR(MP_QSTR_vsync), MP_ROM_PTR(&pin_GPIO46) },
44-
{ MP_ROM_QSTR(MP_QSTR_hsync), MP_ROM_PTR(&pin_GPIO3) },
44+
{ MP_ROM_QSTR(MP_QSTR_vsync), MP_ROM_PTR(&pin_GPIO3) },
45+
{ MP_ROM_QSTR(MP_QSTR_hsync), MP_ROM_PTR(&pin_GPIO46) },
4546
{ MP_ROM_QSTR(MP_QSTR_dclk), MP_ROM_PTR(&pin_GPIO9) },
4647
{ MP_ROM_QSTR(MP_QSTR_red), MP_ROM_PTR(&tft_r_pins) },
4748
{ MP_ROM_QSTR(MP_QSTR_green), MP_ROM_PTR(&tft_g_pins) },
4849
{ MP_ROM_QSTR(MP_QSTR_blue), MP_ROM_PTR(&tft_b_pins) },
49-
{ MP_ROM_QSTR(MP_QSTR_frequency), MP_ROM_INT(9000000) },
5050
};
51-
MP_DEFINE_CONST_DICT(tft_dict, tft_table);
51+
MP_DEFINE_CONST_DICT(tft_pins_dict, tft_pins_table);
52+
53+
STATIC const mp_rom_map_elem_t tft_timings_table[] = {
54+
{ MP_ROM_QSTR(MP_QSTR_frequency), MP_ROM_INT(6500000) }, // nominal 16MHz, but display is unstable/tears at that frequency
55+
{ MP_ROM_QSTR(MP_QSTR_width), MP_ROM_INT(480) },
56+
{ MP_ROM_QSTR(MP_QSTR_height), MP_ROM_INT(480) },
57+
{ MP_ROM_QSTR(MP_QSTR_hsync_pulse_width), MP_ROM_INT(13) },
58+
{ MP_ROM_QSTR(MP_QSTR_hsync_front_porch), MP_ROM_INT(20) },
59+
{ MP_ROM_QSTR(MP_QSTR_hsync_back_porch), MP_ROM_INT(40) },
60+
{ MP_ROM_QSTR(MP_QSTR_hsync_idle_low), MP_ROM_FALSE },
61+
{ MP_ROM_QSTR(MP_QSTR_vsync_pulse_width), MP_ROM_INT(15) },
62+
{ MP_ROM_QSTR(MP_QSTR_vsync_front_porch), MP_ROM_INT(20) },
63+
{ MP_ROM_QSTR(MP_QSTR_vsync_back_porch), MP_ROM_INT(40) },
64+
{ MP_ROM_QSTR(MP_QSTR_vsync_idle_low), MP_ROM_FALSE },
65+
{ MP_ROM_QSTR(MP_QSTR_de_idle_high), MP_ROM_FALSE },
66+
{ MP_ROM_QSTR(MP_QSTR_pclk_active_high), MP_ROM_FALSE },
67+
{ MP_ROM_QSTR(MP_QSTR_pclk_idle_high), MP_ROM_FALSE },
68+
};
69+
MP_DEFINE_CONST_DICT(tft_timings_dict, tft_timings_table);
5270

5371
STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
5472
CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS
5573

56-
{ MP_ROM_QSTR(MP_QSTR_TFT), MP_ROM_PTR(&tft_dict) },
57-
{ MP_ROM_QSTR(MP_QSTR_BACKLIGHT), MP_ROM_PTR(&pin_GPIO10) },
74+
{ MP_ROM_QSTR(MP_QSTR_TFT_PINS), MP_ROM_PTR(&tft_pins_dict) },
75+
{ MP_ROM_QSTR(MP_QSTR_TFT_TIMINGS), MP_ROM_PTR(&tft_timings_dict) },
5876

59-
{ MP_ROM_QSTR(MP_QSTR_I2S_SCK), MP_ROM_PTR(&pin_GPIO9) },
77+
{ MP_ROM_QSTR(MP_QSTR_I2S_SCK), MP_ROM_PTR(&pin_GPIO16) },
78+
{ MP_ROM_QSTR(MP_QSTR_I2S_MCLK), MP_ROM_PTR(&pin_GPIO5) },
6079
{ MP_ROM_QSTR(MP_QSTR_I2S_WS), MP_ROM_PTR(&pin_GPIO7) },
61-
{ MP_ROM_QSTR(MP_QSTR_I2S_SDO), MP_ROM_PTR(&pin_GPIO15) },
80+
{ MP_ROM_QSTR(MP_QSTR_I2S_SDO), MP_ROM_PTR(&pin_GPIO6) },
6281

6382
{ MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO43) },
6483
{ MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_GPIO44) },
6584

6685
{ MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(DEFAULT_I2C_BUS_SCL) },
6786
{ MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(DEFAULT_I2C_BUS_SDA) },
6887

69-
{ MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_GPIO11) },
70-
{ MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_GPIO13) },
71-
{ MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_GPIO12) },
88+
{ MP_ROM_QSTR(MP_QSTR_DISPLAY), MP_ROM_PTR(&displays[0].display) },
7289

7390
// boot mode button can be used in SW as well
7491
{ MP_ROM_QSTR(MP_QSTR_BUTTON), MP_ROM_PTR(&pin_GPIO0) },
7592

7693
{ MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) },
77-
{ MP_ROM_QSTR(MP_QSTR_SPI), MP_ROM_PTR(&board_spi_obj) },
7894
};
7995
MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);

ports/espressif/boards/makerfabs_tft7/pins.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ STATIC const mp_rom_obj_tuple_t tft_b_pins = {
3838
}
3939
};
4040

41-
STATIC const mp_rom_map_elem_t tft_table[] = {
41+
STATIC const mp_rom_map_elem_t tft_pins_table[] = {
4242
{ MP_ROM_QSTR(MP_QSTR_de), MP_ROM_PTR(&pin_GPIO40) },
4343
{ MP_ROM_QSTR(MP_QSTR_vsync), MP_ROM_PTR(&pin_GPIO41) },
4444
{ MP_ROM_QSTR(MP_QSTR_hsync), MP_ROM_PTR(&pin_GPIO39) },
@@ -47,7 +47,7 @@ STATIC const mp_rom_map_elem_t tft_table[] = {
4747
{ MP_ROM_QSTR(MP_QSTR_green), MP_ROM_PTR(&tft_g_pins) },
4848
{ MP_ROM_QSTR(MP_QSTR_blue), MP_ROM_PTR(&tft_b_pins) },
4949
};
50-
MP_DEFINE_CONST_DICT(tft_dict, tft_table);
50+
MP_DEFINE_CONST_DICT(tft_pins_dict, tft_pins_table);
5151

5252
STATIC const mp_rom_map_elem_t timings800_table[] = {
5353
{ MP_ROM_QSTR(MP_QSTR_frequency), MP_ROM_INT(6500000) }, // nominal 16MHz, but display is unstable/tears at that frequency
@@ -70,8 +70,8 @@ MP_DEFINE_CONST_DICT(timings800_dict, timings800_table);
7070
STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
7171
CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS
7272

73-
{ MP_ROM_QSTR(MP_QSTR_TFT), MP_ROM_PTR(&tft_dict) },
74-
{ MP_ROM_QSTR(MP_QSTR_TIMINGS800), MP_ROM_PTR(&timings800_dict) },
73+
{ MP_ROM_QSTR(MP_QSTR_TFT_PINS), MP_ROM_PTR(&tft_pins_dict) },
74+
{ MP_ROM_QSTR(MP_QSTR_TFT_TIMINGS_800x480), MP_ROM_PTR(&timings800_dict) },
7575
{ MP_ROM_QSTR(MP_QSTR_BACKLIGHT), MP_ROM_PTR(&pin_GPIO10) },
7676

7777
{ MP_ROM_QSTR(MP_QSTR_I2S_SCK), MP_ROM_PTR(&pin_GPIO20) },

py/argcheck.c

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,28 @@ void mp_arg_parse_all(size_t n_pos, const mp_obj_t *pos, mp_map_t *kws, size_t n
133133
#if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
134134
mp_arg_error_terse_mismatch();
135135
#else
136-
// TODO better error message
136+
#if CIRCUITPY_FULL_BUILD
137+
mp_map_elem_t *elem = kws->table;
138+
size_t alloc = kws->alloc;
139+
for (size_t i = 0; i < alloc; i++) {
140+
mp_obj_t key = elem[i].key;
141+
if (key == MP_OBJ_NULL) {
142+
continue;
143+
}
144+
bool seen = false;
145+
for (size_t j = n_pos; j < n_allowed; j++) {
146+
if (mp_obj_equal(MP_OBJ_NEW_QSTR(allowed[j].qst), key)) {
147+
seen = true;
148+
break;
149+
}
150+
}
151+
if (!seen) {
152+
mp_raise_msg_varg(&mp_type_TypeError,
153+
MP_ERROR_TEXT("unexpected keyword argument '%q'"), mp_obj_str_get_qstr(key));
154+
}
155+
}
156+
#endif
157+
// (for the !FULL_BUILD case, and as a fallthrough for the FULL_BUILD case, even though it SHOULD be unreachable in that case)
137158
mp_raise_TypeError(MP_ERROR_TEXT("extra keyword arguments given"));
138159
#endif
139160
}

py/circuitpy_defns.mk

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -603,6 +603,7 @@ SRC_SHARED_MODULE_ALL = \
603603
displayio/TileGrid.c \
604604
displayio/area.c \
605605
displayio/__init__.c \
606+
dotclockframebuffer/__init__.c \
606607
floppyio/__init__.c \
607608
fontio/BuiltinFont.c \
608609
fontio/__init__.c \

shared-bindings/dotclockframebuffer/DotClockFramebuffer.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -166,8 +166,6 @@ STATIC mp_obj_t dotclockframebuffer_framebuffer_make_new(const mp_obj_type_t *ty
166166
validate_list_is_free_pins(MP_QSTR_green, green_pins, (mp_int_t)MP_ARRAY_SIZE(green_pins), args[ARG_green].u_obj, &num_green);
167167
validate_list_is_free_pins(MP_QSTR_blue, blue_pins, (mp_int_t)MP_ARRAY_SIZE(blue_pins), args[ARG_blue].u_obj, &num_blue);
168168

169-
mp_printf(&mp_plat_print, "#red=%d #green=%d #blue=%d\n", num_red, num_green, num_blue);
170-
171169
dotclockframebuffer_framebuffer_obj_t *self = &allocate_display_bus_or_raise()->dotclock;
172170
self->base.type = &dotclockframebuffer_framebuffer_type;
173171

0 commit comments

Comments
 (0)