Skip to content

Commit 6f7a8c4

Browse files
committed
adjustments to pins
1 parent 7b80031 commit 6f7a8c4

File tree

4 files changed

+7
-31
lines changed

4 files changed

+7
-31
lines changed

ports/espressif/boards/tulip_cc_r11/mpconfigboard.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
//#define CONFIG_I2S_LRCLK 2
2121
//#define CONFIG_I2S_BCLK 8
2222

23-
#define TULIP_DISPLAY_FREQUENCY 10000000
23+
#define TULIP_DISPLAY_FREQUENCY 16000000
2424
#define TULIP_DISPLAY_WIDTH 1024
2525
#define TULIP_DISPLAY_HEIGHT 600
2626

ports/espressif/boards/tulip_cc_r11/mpconfigboard.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,4 @@ CIRCUITPY_ESPCAMERA = 0
2020
CIRCUITPY_DOTCLOCKFRAMEBUFFER = 1
2121
CIRCUITPY_TINYUSB = 1
2222
CIRCUITPY_TOUCHIO_USE_NATIVE = 1
23-
CIRCUITPY_USB_DEVICE = 1
23+
CIRCUITPY_USB_DEVICE = 1

ports/espressif/boards/tulip_cc_r11/pins.c

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
1 D+ ->
5656
2 D- ->
5757
3 GND
58-
4 DTR -> RESET
58+
4 DTR -> RESET IO0
5959
5 CTS
6060
6 RTS -> IO0
6161
7 VCC VBUS
@@ -220,6 +220,8 @@ MP_DEFINE_CONST_DICT(timings1024_dict, timings1024_table);
220220
static const mp_rom_map_elem_t board_module_globals_table[] = {
221221
CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS
222222

223+
{ MP_ROM_QSTR(MP_QSTR_BAT), MP_ROM_PTR(&pin_GPIO3) },
224+
223225
{ MP_ROM_QSTR(MP_QSTR_TFT_PINS), MP_ROM_PTR(&tft_pins_dict) },
224226
{ MP_ROM_QSTR(MP_QSTR_TFT_TIMINGS), MP_ROM_PTR(&timings1024_dict) },
225227
{ MP_ROM_QSTR(MP_QSTR_TFT_BACKLIGHT), MP_ROM_PTR(&pin_GPIO47) },
@@ -230,22 +232,14 @@ static const mp_rom_map_elem_t board_module_globals_table[] = {
230232
{ MP_ROM_QSTR(MP_QSTR_I2S_WORD_SELECT), MP_ROM_PTR(&pin_GPIO2) },
231233
{ MP_ROM_QSTR(MP_QSTR_I2S_DATA), MP_ROM_PTR(&pin_GPIO5) },
232234

233-
// { MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO43) },
234-
// { MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_GPIO44) },
235-
236-
// { MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_GPIO18) },
237-
// { MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO17) },
238-
239-
// USB = D- 19, D+ 20
240-
241235
{ MP_ROM_QSTR(MP_QSTR_DISPLAY), MP_ROM_PTR(&displays[0].display) },
242236

243237
{ MP_ROM_QSTR(MP_QSTR_MIDI_IN), MP_ROM_PTR(&pin_GPIO11) },
244238
{ MP_ROM_QSTR(MP_QSTR_MIDI_OUT), MP_ROM_PTR(&pin_GPIO12) },
245239

246240
// boot mode button can be used in SW as well
247-
// { MP_ROM_QSTR(MP_QSTR_BOOT0), MP_ROM_PTR(&pin_GPIO0) },
248-
// { MP_ROM_QSTR(MP_QSTR_BUTTON), MP_ROM_PTR(&pin_GPIO1) },
241+
{ MP_ROM_QSTR(MP_QSTR_BOOT0), MP_ROM_PTR(&pin_GPIO0) },
242+
{ MP_ROM_QSTR(MP_QSTR_BUTTON), MP_ROM_PTR(&pin_GPIO1) },
249243

250244
{ MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) },
251245
{ MP_ROM_QSTR(MP_QSTR_UART), MP_ROM_PTR(&board_uart_obj) },

ports/espressif/common-hal/dotclockframebuffer/DotClockFramebuffer.c

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -136,26 +136,8 @@ void common_hal_dotclockframebuffer_framebuffer_construct(dotclockframebuffer_fr
136136

137137
int gpio_num = 0;
138138
allocate_gpio_range(blue, num_blue, expected_blue, cfg, &gpio_num, MP_QSTR_blue);
139-
// cfg->data_gpio_nums[0] = valid_pin(blue[0], MP_QSTR_blue);
140-
// cfg->data_gpio_nums[1] = valid_pin(blue[1], MP_QSTR_blue);
141-
// cfg->data_gpio_nums[2] = valid_pin(blue[2], MP_QSTR_blue);
142-
// cfg->data_gpio_nums[3] = valid_pin(blue[3], MP_QSTR_blue);
143-
// cfg->data_gpio_nums[4] = valid_pin(blue[4], MP_QSTR_blue);
144-
145139
allocate_gpio_range(green, num_green, expected_green, cfg, &gpio_num, MP_QSTR_green);
146-
// cfg->data_gpio_nums[5] = valid_pin(green[0], MP_QSTR_green);
147-
// cfg->data_gpio_nums[6] = valid_pin(green[1], MP_QSTR_green);
148-
// cfg->data_gpio_nums[7] = valid_pin(green[2], MP_QSTR_green);
149-
// cfg->data_gpio_nums[8] = valid_pin(green[3], MP_QSTR_green);
150-
// cfg->data_gpio_nums[9] = valid_pin(green[4], MP_QSTR_green);
151-
// cfg->data_gpio_nums[10] = valid_pin(green[5], MP_QSTR_green);
152-
153140
allocate_gpio_range(red, num_red, expected_red, cfg, &gpio_num, MP_QSTR_red);
154-
// cfg->data_gpio_nums[11] = valid_pin(red[0], MP_QSTR_red);
155-
// cfg->data_gpio_nums[12] = valid_pin(red[1], MP_QSTR_red);
156-
// cfg->data_gpio_nums[13] = valid_pin(red[2], MP_QSTR_red);
157-
// cfg->data_gpio_nums[14] = valid_pin(red[3], MP_QSTR_red);
158-
// cfg->data_gpio_nums[15] = valid_pin(red[4], MP_QSTR_red);
159141

160142
cfg->disp_gpio_num = GPIO_NUM_NC;
161143

0 commit comments

Comments
 (0)