8000 Add board support for HEIA-FR Picomo V3 with configuration files · supcik/circuitpython@2d4c010 · GitHub
[go: up one dir, main page]

Skip to content

Commit 2d4c010

Browse files
committed
Add board support for HEIA-FR Picomo V3 with configuration files
1 parent 57cf054 commit 2d4c010

File tree

7 files changed

+254
-3
lines changed
8000

7 files changed

+254
-3
lines changed

ports/espressif/boards/oxocard_connect/pins.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ CIRCUITPY_BOARD_BUS_SINGLETON(stemma_i2c, i2c, 1)
1212
static const mp_rom_map_elem_t board_module_globals_table[] = {
1313
CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS
1414

15-
{ MP_ROM_QSTR(MP_QSTR_BTN5), MP_ROM_PTR(&pin_GPIO0) },
16-
{ MP_ROM_QSTR(MP_QSTR_BUTTON), MP_ROM_PTR(&pin_GPIO0) },
15+
{ MP_ROM_QSTR(MP_QSTR_BTN5), MP_ROM_PTR(&pin_GPIO2) },
16+
{ MP_ROM_QSTR(MP_QSTR_BUTTON), MP_ROM_PTR(&pin_GPIO2) },
1717
{ MP_ROM_QSTR(MP_QSTR_BOOT0), MP_ROM_PTR(&pin_GPIO0) },
1818

1919
{ MP_ROM_QSTR(MP_QSTR_LCD_LED), MP_ROM_PTR(&pin_GPIO19) },
@@ -39,7 +39,6 @@ static const mp_rom_map_elem_t board_module_globals_table[] = {
3939
{ MP_ROM_QSTR(MP_QSTR_IN06), MP_ROM_PTR(&pin_GPIO34) },
4040
{ MP_ROM_QSTR(MP_QSTR_IN07), MP_ROM_PTR(&pin_GPIO35) },
4141

42-
4342
{ MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) },
4443
{ MP_ROM_QSTR(MP_QSTR_SPI), MP_ROM_PTR(&board_spi_obj) },
4544
{ MP_ROM_QSTR(MP_QSTR_UART), MP_ROM_PTR(&board_uart_obj) },
Lines changed: 93 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,93 @@
1+
// This file is part of the CircuitPython project: https://circuitpython.org
2+
//
3+
// SPDX-FileCopyrightText: Copyright (c) 2021 Scott Shawcroft for Adafruit Industries
4+
//
5+
// SPDX-License-Identifier: MIT
6+
7+
#include "supervisor/board.h"
8+
#include "mpconfigboard.h"
9+
#include "shared-bindings/busio/SPI.h"
10+
#include "shared-bindings/fourwire/FourWire.h"
11+
#include "shared-module/displayio/__init__.h"
12+
#include "shared-module/displayio/mipi_constants.h"
13+
#include "supervisor/shared/board.h"
14+
15+
16+
#define DELAY 0x80
17+
18+
uint8_t display_init_sequence[] = {
19+
0x01, 0 | DELAY, 150, // SWRESET
20+
21+
0x36, 1, 0x04, // MADCTL
22+
0x35, 1, 0x00, // TEON
23+
0xB2, 5, 0x0c, 0x0c, 0x00, 0x33, 0x33, // FRMCTR2
24+
0x3A, 1, 0x05, // COLMOD
25+
0xB7, 1, 0x14, // GCTRL
26+
0xBB, 1, 0x37, // VCOMS
27+
0xC0, 1, 0x2c, // LCMCTRL
28+
0xC2, 1, 0x01, // VDVVRHEN
29+
0xC3, 1, 0x12, // VRHS
30+
0xC4, 1, 0x20, // VDVS
31+
0xD0, 2, 0xa4, 0xa1, // PWRCTRL1
32+
0xC6, 1, 0x0f, // FRCTRL2
33+
0xE0, 14, 0xd0, 0x04, 0x0d, 0x11, 0x13, 0x2b, 0x3f, 0x54, 0x4c, 0x18, 0x0d, 0x0b, 0x1f, 0x23, // GMCTRP1
34+
0xE1, 14, 0xd0, 0x04, 0x0c, 0x11, 0x13, 0x2c, 0x3f, 0x44, 0x51, 0x2f, 0x1f, 0x1f, 0x20, 0x23, // GMCTRN1
35+
0x21, 0, // INVON
36+
37+
0x11, 0 | DELAY, 255, // SLPOUT
38+
0x29, 0 | DELAY, 100, // DISPON
39+
40+
0x2a, 4, 0x00, 0, 0x00, 0xfe, // CASET
41+
0x2b, 4, 0x00, 0, 0x00, 0xfe, // RASET
42+
0x2c, 0, // RAMWR
43+
};
44+
45+
void board_init(void) {
46+
fourwire_fourwire_obj_t *bus = &allocate_display_bus()->fourwire_bus;
47+
busio_spi_obj_t *spi = &bus->inline_bus;
48+
common_hal_busio_spi_construct(spi, &pin_GPIO18, &pin_GPIO19, NULL, false);
49+
common_hal_busio_spi_never_reset(spi);
50+
51+
bus->base.type = &fourwire_fourwire_type;
52+
common_hal_fourwire_fourwire_construct(bus,
53+
spi,
54+
&pin_GPIO16, // TFT_DC Command or data
55+
&pin_GPIO17, // TFT_CS Chip select
56+
NULL, // TFT_RST Reset
57+
62500000, // Baudrate
58+
0, // Polarity
59+
0); // Phase
60+
61+
busdisplay_busdisplay_obj_t *display = &allocate_display()->display;
62+
display->base.type = &busdisplay_busdisplay_type;
63+
common_hal_busdisplay_busdisplay_construct(display,
64+
bus,
65+
240, // Width
66+
280, // Height
67+
0, // column start
68+
20, // row start
69+
0, // rotation
70+
16, // Color depth
71+
false, // Grayscale
72+
false, // pixels in a byte share a row. Only valid for depths < 8
73+
1, // bytes per cell. Only valid for depths < 8
74+
false, // reverse_pixels_in_byte. Only valid for depths < 8
75+
true, // reverse_bytes_in_word
76+
MIPI_COMMAND_SET_COLUMN_ADDRESS, // Set column command
77+
MIPI_COMMAND_SET_PAGE_ADDRESS, // Set row command
78+
MIPI_COMMAND_WRITE_MEMORY_START, // Write memory command
79+
display_init_sequence,
80+
sizeof(display_init_sequence),
81+
NULL, // no backlight pin
82+
NO_BRIGHTNESS_COMMAND,
83+
1.0f, // brightness
84+
false, // single_byte_bounds
85+
false, // data_as_commands
86+
true, // auto_refresh
87+
60, // native_frames_per_second
88+
true, // backlight_on_high
89+
false, // SH1107_addressing
90+
0); // backlight pwm frequency
91+
}
92+
93+
// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
// This file is part of the CircuitPython project: https://circuitpython.org
2+
//
3+
// SPDX-FileCopyrightText: Copyright (c) 2021 Scott Shawcroft for Adafruit Industries
4+
//
5+
// SPDX-License-Identifier: MIT
6+
7+
#pragma once
8+
9+
#define MICROPY_HW_BOARD_NAME "HEIA-FR Picomo V3"
10+
#define MICROPY_HW_MCU_NAME "rp2040"
11+
12+
#define CIRCUITPY_RGB_STATUS_R (&pin_GPIO10)
13+
#define CIRCUITPY_RGB_STATUS_G (&pin_GPIO9)
14+
#define CIRCUITPY_RGB_STATUS_B (&pin_GPIO8)
15+
16+
#define DEFAULT_I2C_BUS_SCL (&pin_GPIO21)
17+
#define DEFAULT_I2C_BUS_SDA (&pin_GPIO20)
18+
19+
#define DEFAULT_SPI_BUS_SCK (&pin_GPIO18)
20+
#define DEFAULT_SPI_BUS_MOSI (&pin_GPIO19)
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
USB_VID = 0x2E8A
2+
USB_PID = 0x10C4
3+
4+
USB_PRODUCT = "Picomo V3"
5+
USB_MANUFACTURER = "HEIA-FR"
6+
7+
CHIP_VARIANT = RP2040
8+
CHIP_FAMILY = rp2
9+
10+
EXTERNAL_FLASH_DEVICES = "W25Q16JVxQ"
11+
12+
CIRCUITPY__EVE = 1
13+
14+
FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_Register
15+
FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_ST7789
16+
FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_Display_Shapes
17+
FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_Display_Text
18+
FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_ProgressBar
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
// This file is part of the CircuitPython project: https://circuitpython.org
2+
//
3+
// SPDX-FileCopyrightText: Copyright (c) 2021 Scott Shawcroft for Adafruit Industries
4+
//
5+
// SPDX-License-Identifier: MIT
6+
7+
#pragma once
8+
9+
// Put board-specific pico-sdk definitions here. This file must exist.
Lines changed: 110 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,110 @@
1+
// This file is part of the CircuitPython project: https://circuitpython.org
2+
//
3+
// SPDX-FileCopyrightText: Copyright (c) 2021 Scott Shawcroft for Adafruit Industries
4+
//
5+
// SPDX-License-Identifier: MIT
6+
7+
#include "shared-bindings/board/__init__.h"
8+
#include "shared-module/displayio/__init__.h"
9+
10+
static const mp_rom_map_elem_t board_module_globals_table[] = {
11+
CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS
12+
13+
{MP_ROM_QSTR(MP_QSTR_GP0), MP_ROM_PTR(&pin_GPIO0)},
14+
{MP_ROM_QSTR(MP_QSTR_GP1), MP_ROM_PTR(&pin_GPIO1)},
15+
{MP_ROM_QSTR(MP_QSTR_GP2), MP_ROM_PTR(&pin_GPIO2)},
16+
17+
{MP_ROM_QSTR(MP_QSTR_SW_UP), MP_ROM_PTR(&pin_GPIO3)},
18+
{MP_ROM_QSTR(MP_QSTR_S1), MP_ROM_PTR(&pin_GPIO3)},
19+
{MP_ROM_QSTR(MP_QSTR_GP3), MP_ROM_PTR(&pin_GPIO3)},
20+
21+
{MP_ROM_QSTR(MP_QSTR_SW_MID), MP_ROM_PTR(&pin_GPIO4)},
22+
{MP_ROM_QSTR(MP_QSTR_S5), MP_ROM_PTR(&pin_GPIO4)},
23+
{MP_ROM_QSTR(MP_QSTR_GP4), MP_ROM_PTR(&pin_GPIO4)},
24+
25+
{MP_ROM_QSTR(MP_QSTR_SW_DOWN), MP_ROM_PTR(&pin_GPIO5)},
26+
{MP_ROM_QSTR(MP_QSTR_S2), MP_ROM_PTR(&pin_GPIO5)},
27+
{MP_ROM_QSTR(MP_QSTR_GP5), MP_ROM_PTR(&pin_GPIO5)},
28+
29+
{MP_ROM_QSTR(MP_QSTR_SW_TOPR), MP_ROM_PTR(&pin_GPIO6)},
30+
{MP_ROM_QSTR(MP_QSTR_BOOTSEL), MP_ROM_PTR(&pin_GPIO6)},
31+
{MP_ROM_QSTR(MP_QSTR_S7), MP_ROM_PTR(&pin_GPIO6)},
32+
{MP_ROM_QSTR(MP_QSTR_GP6), MP_ROM_PTR(&pin_GPIO6)},
33+
34+
{MP_ROM_QSTR(MP_QSTR_SW_RIGHT), MP_ROM_PTR(&pin_GPIO7)},
35+
{MP_ROM_QSTR(MP_QSTR_S4), MP_ROM_PTR(&pin_GPIO7)},
36+
{MP_ROM_QSTR(MP_QSTR_GP7), MP_ROM_PTR(&pin_GPIO7)},
37+
38+
{MP_ROM_QSTR(MP_QSTR_LED_B), MP_ROM_PTR(&pin_GPIO8)},
39+
{MP_ROM_QSTR(MP_QSTR_GP8), MP_ROM_PTR(&pin_GPIO8)},
40+
41+
{MP_ROM_QSTR(MP_QSTR_LED_G), MP_ROM_PTR(&pin_GPIO9)},
42+
{MP_ROM_QSTR(MP_QSTR_GP9), MP_ROM_PTR(&pin_GPIO9)},
43+
44+
{MP_ROM_QSTR(MP_QSTR_LED_R), MP_ROM_PTR(&pin_GPIO10)},
45+
{MP_ROM_QSTR(MP_QSTR_GP10), MP_ROM_PTR(&pin_GPIO10)},
46+
47+
{MP_ROM_QSTR(MP_QSTR_GP11), MP_ROM_PTR(&pin_GPIO11)},
48+
49+
{MP_ROM_QSTR(MP_QSTR_GP12), MP_ROM_PTR(&pin_GPIO12)},
50+
{MP_ROM_QSTR(MP_QSTR_BUZZER), MP_ROM_PTR(&pin_GPIO12)},
51+
52+
{MP_ROM_QSTR(MP_QSTR_GP13), MP_ROM_PTR(&pin_GPIO13)},
53+
{MP_ROM_QSTR(MP_QSTR_VER_MSB), MP_ROM_PTR(&pin_GPIO13)},
54+
55+
{MP_ROM_QSTR(MP_QSTR_GP14), MP_ROM_PTR(&pin_GPIO14)},
56+
{MP_ROM_QSTR(MP_QSTR_VER_LSB), MP_ROM_PTR(&pin_GPIO14)},
57+
58+
{MP_ROM_QSTR(MP_QSTR_GP15), MP_ROM_PTR(&pin_GPIO15)},
59+
60+
{MP_ROM_QSTR(MP_QSTR_DISP_DC), MP_ROM_PTR(&pin_GPIO16)},
61+
{MP_ROM_QSTR(MP_QSTR_GP16), MP_ROM_PTR(&pin_GPIO16)},
62+
63+
{MP_ROM_QSTR(MP_QSTR_DISP_CS), MP_ROM_PTR(&pin_GPIO17)},
64+
{MP_ROM_QSTR(MP_QSTR_GP17), MP_ROM_PTR(&pin_GPIO17)},
65+
66+
{MP_ROM_QSTR(MP_QSTR_DISP_SCL), MP_ROM_PTR(&pin_GPIO18)},
67+
{MP_ROM_QSTR(MP_QSTR_GP18), MP_ROM_PTR(&pin_GPIO18)},
68+
69+
{MP_ROM_QSTR(MP_QSTR_DISP_SDA), MP_ROM_PTR(&pin_GPIO19)},
70+
{MP_ROM_QSTR(MP_QSTR_GP19), MP_ROM_PTR(&pin_GPIO19)},
71+
72+
{MP_ROM_QSTR(MP_QSTR_TEMP_SDA), MP_ROM_PTR(&pin_GPIO20)},
73+
{MP_ROM_QSTR(MP_QSTR_GP20), MP_ROM_PTR(&pin_GPIO20)},
74+
75+
{MP_ROM_QSTR(MP_QSTR_TEMP_SCL), MP_ROM_PTR(&pin_GPIO21)},
76+
{MP_ROM_QSTR(MP_QSTR_GP21), MP_ROM_PTR(&pin_GPIO21)},
77+
78+
{MP_ROM_QSTR(MP_QSTR_SW_LEFT), MP_ROM_PTR(&pin_GPIO22)},
79+
{MP_ROM_QSTR(MP_QSTR_S3), MP_ROM_PTR(&pin_GPIO22)},
80+
{MP_ROM_QSTR(MP_QSTR_GP22), MP_ROM_PTR(&pin_GPIO22)},
81+
82+
{MP_ROM_QSTR(MP_QSTR_SW_TOPL), MP_ROM_PTR(&pin_GPIO23)},
83+
{MP_ROM_QSTR(MP_QSTR_S6), MP_ROM_PTR(&pin_GPIO23)},
84+
{MP_ROM_QSTR(MP_QSTR_GP23), MP_ROM_PTR(&pin_GPIO23)},
85+
86+
{MP_ROM_QSTR(MP_QSTR_USB_OVCUR), MP_ROM_PTR(&pin_GPIO24)},
87+
{MP_ROM_QSTR(MP_QSTR_GP24), MP_ROM_PTR(&pin_GPIO24)},
88+
89+
{MP_ROM_QSTR(MP_QSTR_GP25), MP_ROM_PTR(&pin_GPIO25)},
90+
91+
{MP_ROM_QSTR(MP_QSTR_GP26_A0), MP_ROM_PTR(&pin_GPIO26)},
92+
{MP_ROM_QSTR(MP_QSTR_GP26), MP_ROM_PTR(&pin_GPIO26)},
93+
{MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_GPIO26)},
94+
95+
{MP_ROM_QSTR(MP_QSTR_GP27_A1), MP_ROM_PTR(&pin_GPIO27)},
96+
{MP_ROM_QSTR(MP_QSTR_GP27), MP_ROM_PTR(&pin_GPIO27)},
97+
{MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_GPIO27)},
98+
99+
{MP_ROM_QSTR(MP_QSTR_GP28_A2), MP_ROM_PTR(&pin_GPIO28)},
100+
{MP_ROM_QSTR(MP_QSTR_GP28), MP_ROM_PTR(&pin_GPIO28)},
101+
{MP_ROM_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_GPIO28)},
102+
103+
{MP_ROM_QSTR(MP_QSTR_A3), MP_ROM_PTR(&pin_GPIO29)},
104+
{MP_ROM_QSTR(MP_QSTR_VOLTAGE_MONITOR), MP_ROM_PTR(&pin_GPIO29)},
105+
106+
{MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj)},
107+
{MP_ROM_QSTR(MP_QSTR_SPI), MP_ROM_PTR(&board_spi_obj)},
108+
{MP_ROM_QSTR(MP_QSTR_DISPLAY), MP_ROM_PTR(&displays[0].display)},
109+
};
110+
MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);

supervisor/shared/web_workflow/static/serial.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,8 @@ ws.onmessage = function(e) {
4343
} else if (e.data == "\x1b[K") { // Clear line
4444
log.textContent = log.textContent.slice(0, -left_count);
4545
left_count = 0;
46+
} else if (e.data == "\x1b[2K\x1b[0G") {
47+
// ignore
4648
} else {
4749
log.textContent += e.data;
4850
}

0 commit comments

Comments
 (0)
0