Skip to content

Commit 6f6a964

Browse files
dhalbertdhalbert
authored
Merge pull request #1832 from ladyada/master
pygamer definition & autobuild
2 parents 06db537 + 740c419 commit 6f6a964

File tree

5 files changed

+247
-2
lines changed

5 files changed

+247
-2
lines changed

‎ports/atmel-samd/boards/pybadge/mpconfigboard.mk

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@ EXTERNAL_FLASH_DEVICE_COUNT = 1
99
EXTERNAL_FLASH_DEVICES = GD25Q16C
1010
LONGINT_IMPL = MPZ
1111

12-
# No I2S on SAMD51G
13-
CIRCUITPY_AUDIOBUSIO = 0
1412
# No touch on SAMD51 yet
1513
CIRCUITPY_TOUCHIO = 0
1614

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

Lines changed: 114 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,114 @@
1+
/*
2+
* This file is part of the MicroPython project, http://micropython.org/
3+
*
4+
* The MIT License (MIT)
5+
*
6+
* Copyright (c) 2017 Scott Shawcroft for Adafruit Industries
7+
*
8+
* Permission is hereby granted, free of charge, to any person obtaining a copy
9+
* of this software and associated documentation files (the "Software"), to deal
10+
* in the Software without restriction, including without limitation the rights
11+
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
12+
* copies of the Software, and to permit persons to whom the Software is
13+
* furnished to do so, subject to the following conditions:
14+
*
15+
* The above copyright notice and this permission notice shall be included in
16+
* all copies or substantial portions of the Software.
17+
*
18+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
19+
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
20+
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
21+
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
22+
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
23+
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
24+
* THE SOFTWARE.
25+
*/
26+
27+
#include "boards/board.h"
28+
#include "mpconfigboard.h"
29+
#include "hal/include/hal_gpio.h"
30+
#include "shared-bindings/busio/SPI.h"
31+
#include "shared-bindings/displayio/FourWire.h"
32+
#include "shared-module/displayio/__init__.h"
33+
#include "shared-module/displayio/mipi_constants.h"
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+
0x01, 0 | DELAY, 150, // SWRESET
42+
0x11, 0 | DELAY, 255, // SLPOUT
43+
0xb1, 3, 0x01, 0x2C, 0x2D, // _FRMCTR1
44+
0xb2, 3, 0x01, 0x2C, 0x2D, //
45+
0xb3, 6, 0x01, 0x2C, 0x2D, 0x01, 0x2C, 0x2D,
46+
0xb4, 1, 0x07, // _INVCTR line inversion
47+
0xc0, 3, 0xa2, 0x02, 0x84, // _PWCTR1 GVDD = 4.7V, 1.0uA
48+
0xc1, 1, 0xc5, // _PWCTR2 VGH=14.7V, VGL=-7.35V
49+
0xc2, 2, 0x0a, 0x00, // _PWCTR3 Opamp current small, Boost frequency
50+
0xc3, 2, 0x8a, 0x2a,
51+
0xc4, 2, 0x8a, 0xee,
52+
0xc5, 1, 0x0e, // _VMCTR1 VCOMH = 4V, VOML = -1.1V
53+
0x2a, 0, // _INVOFF
54+
0x36, 1, 0x00, // _MADCTL top to bottom refresh in vsync aligned order.
55+
// 1 clk cycle nonoverlap, 2 cycle gate rise, 3 sycle osc equalie,
56+
// fix on VTL
57+
0x3a, 1, 0x05, // COLMOD - 16bit color
58+
0xe0, 16, 0x02, 0x1c, 0x07, 0x12, // _GMCTRP1 Gamma
59+
0x37, 0x32, 0x29, 0x2d,
60+
0x29, 0x25, 0x2B, 0x39,
61+
0x00, 0x01, 0x03, 0x10,
62+
0xe1, 16, 0x03, 0x1d, 0x07, 0x06, // _GMCTRN1
63+
0x2E, 0x2C, 0x29, 0x2D,
64+
0x2E, 0x2E, 0x37, 0x3F,
65+
0x00, 0x00, 0x02, 0x10,
66+
0x2a, 3, 0x02, 0x00, 0x81, // _CASET XSTART = 2, XEND = 129
67+
0x2b, 3, 0x02, 0x00, 0x81, // _RASET XSTART = 2, XEND = 129
68+
0x13, 0 | DELAY, 10, // _NORON
69+
0x29, 0 | DELAY, 100, // _DISPON
70+
};
71+
72+
void board_init(void) {
73+
busio_spi_obj_t* spi = &displays[0].fourwire_bus.inline_bus;
74+
common_hal_busio_spi_construct(spi, &pin_PB13, &pin_PB15, NULL);
75+
common_hal_busio_spi_never_reset(spi);
76+
common_hal_busio_spi_configure(spi, 24000000, 0, 0, 8);
77+
78+
displayio_fourwire_obj_t* bus = &displays[0].fourwire_bus;
79+
bus->base.type = &displayio_fourwire_type;
80+
common_hal_displayio_fourwire_construct(bus,
81+
spi,
82+
&pin_PB05, // TFT_DC Command or data
83+
&pin_PB12, // TFT_CS Chip select
84+
&pin_PA00); // TFT_RST Reset
85+
86+
displayio_display_obj_t* display = &displays[0].display;
87+
display->base.type = &displayio_display_type;
88+
common_hal_displayio_display_construct(display,
89+
bus,
90+
160, // Width
91+
128, // Height
92+
0, // column start
93+
0, // row start
94+
270, // rotation
95+
16, // Color depth
96+
MIPI_COMMAND_SET_COLUMN_ADDRESS, // Set column command
97+
MIPI_COMMAND_SET_PAGE_ADDRESS, // Set row command
98+
MIPI_COMMAND_WRITE_MEMORY_START, // Write memory command
99+
0x37, // set vertical scroll command
100+
display_init_sequence,
101+
sizeof(display_init_sequence),
102+
&pin_PA01, // backlight pin
103+
1.0f, // brightness (ignored)
104+
true, // auto_brightness
105+
false, // single_byte_bounds
106+
false); // data_as_commands
107+
}
108+
109+
bool board_requests_safe_mode(void) {
110+
return false;
111+
}
112+
113+
void reset_board(void) {
114+
}

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

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
#define MICROPY_HW_BOARD_NAME "Adafruit PyGamer"
2+
#define MICROPY_HW_MCU_NAME "samd51j19"
3+
4+
#define CIRCUITPY_MCU_FAMILY samd51
5+
6+
#define MICROPY_HW_LED_STATUS (&pin_PA23)
7+
8+
// These are pins not to reset.
9+
// QSPI Data pins
10+
#define MICROPY_PORT_A (PORT_PA08 | PORT_PA09 | PORT_PA10 | PORT_PA11)
11+
// DotStar pins, QSPI CS, and QSPI SCK
12+
#define MICROPY_PORT_B (PORT_PB10 | PORT_PB11)
13+
#define MICROPY_PORT_C (0)
14+
#define MICROPY_PORT_D (0)
15+
16+
#define AUTORESET_DELAY_MS 500
17+
18+
// If you change this, then make sure to update the linker scripts as well to
19+
// make sure you don't overwrite code
20+
#define CIRCUITPY_INTERNAL_NVM_SIZE 8192
21+
22+
#define BOARD_FLASH_SIZE (FLASH_SIZE - 0x4000 - CIRCUITPY_INTERNAL_NVM_SIZE)
23+
24+
#define DEFAULT_I2C_BUS_SCL (&pin_PA13)
25+
#define DEFAULT_I2C_BUS_SDA (&pin_PA12)
26+
27+
#define DEFAULT_SPI_BUS_SCK (&pin_PA17)
28+
#define DEFAULT_SPI_BUS_MOSI (&pin_PB23)
29+
#define DEFAULT_SPI_BUS_MISO (&pin_PB22)
30+
31+
#define DEFAULT_UART_BUS_RX (&pin_PB17)
32+
#define DEFAULT_UART_BUS_TX (&pin_PB16)
33+
34+
// USB is always used internally so skip the pin objects for it.
35+
#define IGNORE_PIN_PA24 1
36+
#define IGNORE_PIN_PA25 1

‎ports/atmel-samd/boards/pygamer/mpconfigboard.mk

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
LD_FILE = boards/samd51x19-bootloader-external-flash.ld
2+
USB_VID = 0x239A
3+
USB_PID = 0x802E
4+
USB_PRODUCT = "PyGamer"
5+
USB_MANUFACTURER = "Adafruit Industries LLC"
6+
7+
QSPI_FLASH_FILESYSTEM = 1
8+
EXTERNAL_FLASH_DEVICE_COUNT = 1
9+
EXTERNAL_FLASH_DEVICES = GD25Q64C
10+
LONGINT_IMPL = MPZ
11+
12+
# No touch on SAMD51 yet
13+
CIRCUITPY_TOUCHIO = 0
14+
15+
CIRCUITPY_GAMEPADSHIFT = 1
16+
17+
CHIP_VARIANT = SAMD51J19A
18+
CHIP_FAMILY = samd51
19+
20+
CIRCUITPY_STAGE = 1
21+
CIRCUITPY_GAMEPAD = 1
22+
CIRCUITPY_DISPLAYIO = 1
23+
CIRCUITPY_AUDIOIO = 1
24+
25+
FROZEN_MPY_DIRS += $(TOP)/frozen/circuitpython-stage/pybadge

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

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
#include "shared-bindings/board/__init__.h"
2+
3+
#include "boards/board.h"
4+
#include "shared-module/displayio/__init__.h"
5+
6+
STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
7+
{ MP_OBJ_NEW_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_PA02) },
8+
{ MP_OBJ_NEW_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_PA05) },
9+
{ MP_OBJ_NEW_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_PB08) },
10+
{ MP_OBJ_NEW_QSTR(MP_QSTR_A3), MP_ROM_PTR(&pin_PB09) },
11+
{ MP_OBJ_NEW_QSTR(MP_QSTR_A4), MP_ROM_PTR(&pin_PA04) },
12+
{ MP_OBJ_NEW_QSTR(MP_QSTR_A5), MP_ROM_PTR(&pin_PA06) },
13+
{ MP_OBJ_NEW_QSTR(MP_QSTR_A6), MP_ROM_PTR(&pin_PB01) },
14+
{ MP_OBJ_NEW_QSTR(MP_QSTR_A7), MP_ROM_PTR(&pin_PB04) },
15+
{ MP_OBJ_NEW_QSTR(MP_QSTR_A8), MP_ROM_PTR(&pin_PB03) },
16+
{ MP_OBJ_NEW_QSTR(MP_QSTR_A9), MP_ROM_PTR(&pin_PB02) },
17+
18+
{ MP_OBJ_NEW_QSTR(MP_QSTR_D0), MP_ROM_PTR(&pin_PB17) },
19+
{ MP_OBJ_NEW_QSTR(MP_QSTR_D1), MP_ROM_PTR(&pin_PB16) },
20+
{ MP_OBJ_NEW_QSTR(MP_QSTR_D2), MP_ROM_PTR(&pin_PB03) },
21+
{ MP_OBJ_NEW_QSTR(MP_QSTR_D3), MP_ROM_PTR(&pin_PB02) },
22+
{ MP_OBJ_NEW_QSTR(MP_QSTR_D4), MP_ROM_PTR(&pin_PA14) },
23+
{ MP_OBJ_NEW_QSTR(MP_QSTR_D5), MP_ROM_PTR(&pin_PA16) },
24+
{ MP_OBJ_NEW_QSTR(MP_QSTR_D6), MP_ROM_PTR(&pin_PA18) },
25+
{ MP_OBJ_NEW_QSTR(MP_QSTR_D7), MP_ROM_PTR(&pin_PB14) },
26+
{ MP_OBJ_NEW_QSTR(MP_QSTR_D8), MP_ROM_PTR(&pin_PA15) },
27+
{ MP_OBJ_NEW_QSTR(MP_QSTR_D9), MP_ROM_PTR(&pin_PA19) },
28+
{ MP_OBJ_NEW_QSTR(MP_QSTR_D10), MP_ROM_PTR(&pin_PA20) },
29+
{ MP_OBJ_NEW_QSTR(MP_QSTR_D11), MP_ROM_PTR(&pin_PA21) },
30+
{ MP_OBJ_NEW_QSTR(MP_QSTR_D12), MP_ROM_PTR(&pin_PA22) },
31+
{ MP_OBJ_NEW_QSTR(MP_QSTR_D13), MP_ROM_PTR(&pin_PA23) },
32+
33+
// UART
34+
{ MP_OBJ_NEW_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_PB17) },
35+
{ MP_OBJ_NEW_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_PB16) },
36+
37+
// I2C
38+
{ MP_OBJ_NEW_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_PA12) },
39+
{ MP_OBJ_NEW_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_PA13) },
40+
41+
// SPI
42+
{ MP_OBJ_NEW_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_PA17) },
43+
{ MP_OBJ_NEW_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_PB22) },
44+
{ MP_OBJ_NEW_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_PB23) },
45+
46+
// Special named pins
47+
{ MP_OBJ_NEW_QSTR(MP_QSTR_NEOPIXEL), MP_ROM_PTR(&pin_PA15) },
48+
{ MP_OBJ_NEW_QSTR(MP_QSTR_LIGHT), MP_ROM_PTR(&pin_PB04) },
49+
{ MP_OBJ_NEW_QSTR(MP_QSTR_ACCELEROMETER_INTERRUPT), MP_ROM_PTR(&pin_PB14) },
50+
{ MP_OBJ_NEW_QSTR(MP_QSTR_SPEAKER), MP_ROM_PTR(&pin_PA02) },
51+
{ MP_OBJ_NEW_QSTR(MP_QSTR_SPEAKER_ENABLE), MP_ROM_PTR(&pin_PA27) },
52+
{ MP_OBJ_NEW_QSTR(MP_QSTR_BUTTON_LATCH), MP_ROM_PTR(&pin_PB00) },
53+
{ MP_OBJ_NEW_QSTR(MP_QSTR_BUTTON_OUT), MP_ROM_PTR(&pin_PB30) },
54+
{ MP_OBJ_NEW_QSTR(MP_QSTR_BUTTON_CLOCK), MP_ROM_PTR(&pin_PB31) },
55+
56+
// TFT control pins
57+
{ MP_OBJ_NEW_QSTR(MP_QSTR_TFT_LITE), MP_ROM_PTR(&pin_PA01) },
58+
{ MP_OBJ_NEW_QSTR(MP_QSTR_TFT_MOSI), MP_ROM_PTR(&pin_PB15) },
59+
{ MP_OBJ_NEW_QSTR(MP_QSTR_TFT_SCK), MP_ROM_PTR(&pin_PB13) },
60+
{ MP_OBJ_NEW_QSTR(MP_QSTR_TFT_RST), MP_ROM_PTR(&pin_PA00) },
61+
{ MP_ROM_QSTR(MP_QSTR_TFT_CS), MP_ROM_PTR(&pin_PB12) },
62+
{ MP_ROM_QSTR(MP_QSTR_TFT_DC), MP_ROM_PTR(&pin_PB05) },
63+
{ MP_OBJ_NEW_QSTR(MP_QSTR_JOYSTICK_X), MP_ROM_PTR(&pin_PB06) },
64+
{ MP_OBJ_NEW_QSTR(MP_QSTR_JOYSTICK_Y), MP_ROM_PTR(&pin_PB07) },
65+
66+
{ MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) },
67+
{ MP_ROM_QSTR(MP_QSTR_SPI), MP_ROM_PTR(&board_spi_obj) },
68+
{ MP_ROM_QSTR(MP_QSTR_UART), MP_ROM_PTR(&board_uart_obj) },
69+
70+
{ MP_ROM_QSTR(MP_QSTR_DISPLAY), MP_ROM_PTR(&displays[0].display)}
71+
};
72+
MP_DEFINE_CONST_DICT(board_module_globals, board_global_dict_table);

0 commit comments

Comments
 (0)