Skip to content

Commit fc90c94

Browse files
tannewttannewt
committed
Add custom CPX build for display support
1 parent aa9b57f commit fc90c94

5 files changed

Lines changed: 208 additions & 0 deletions

File tree

‎.github/workflows/build.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ jobs:
8282
- "circuitplayground_bluefruit"
8383
- "circuitplayground_express"
8484
- "circuitplayground_express_crickit"
85+
- "circuitplayground_express_displayio"
8586
- "cp32-m4"
8687
- "datalore_ip_m4"
8788
- "datum_distance"

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

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
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 <string.h>
28+
29+
#include "boards/board.h"
30+
#include "common-hal/microcontroller/Pin.h"
31+
#include "hal/include/hal_gpio.h"
32+
#include "shared-bindings/digitalio/DigitalInOut.h"
33+
#include "shared-bindings/neopixel_write/__init__.h"
34+
35+
void board_init(void)
36+
{
37+
}
38+
39+
// Check the status of the two buttons on CircuitPlayground Express. If both are
40+
// pressed, then boot into user safe mode.
41+
bool board_requests_safe_mode(void) {
42+
gpio_set_pin_function(PIN_PA14, GPIO_PIN_FUNCTION_OFF);
43+
gpio_set_pin_direction(PIN_PA14, GPIO_DIRECTION_IN);
44+
gpio_set_pin_pull_mode(PIN_PA14, GPIO_PULL_DOWN);
45+
46+
gpio_set_pin_function(PIN_PA28, GPIO_PIN_FUNCTION_OFF);
47+
gpio_set_pin_direction(PIN_PA28, GPIO_DIRECTION_IN);
48+
gpio_set_pin_pull_mode(PIN_PA28, GPIO_PULL_DOWN);
49+
bool safe_mode = gpio_get_pin_level(PIN_PA14) &&
50+
gpio_get_pin_level(PIN_PA28);
51+
reset_pin_number(PIN_PA14);
52+
reset_pin_number(PIN_PA28);
53+
return safe_mode;
54+
}
55+
56+
void reset_board(void) {
57+
uint8_t empty[30];
58+
memset(empty, 0, 30);
59+
digitalio_digitalinout_obj_t neopixel_pin;
60+
common_hal_digitalio_digitalinout_construct(&neopixel_pin, &pin_PB23);
61+
common_hal_digitalio_digitalinout_switch_to_output(&neopixel_pin, false,
62+
DRIVE_MODE_PUSH_PULL);
63+
common_hal_neopixel_write(&neopixel_pin, empty, 30);
64+
common_hal_digitalio_digitalinout_deinit(&neopixel_pin);
65+
}

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

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
#define MICROPY_HW_BOARD_NAME "Adafruit CircuitPlayground Express with displayio"
2+
#define MICROPY_HW_MCU_NAME "samd21g18"
3+
4+
#define MICROPY_HW_LED_STATUS (&pin_PA17)
5+
6+
// Don't allow touch on A0 (PA02), because it's connected to the speaker.
7+
#define PA02_NO_TOUCH (true)
8+
9+
// Salae reads 12mhz which is the limit even though we set it to the safer 8mhz.
10+
#define SPI_FLASH_BAUDRATE (8000000)
11+
12+
// On-board flash
13+
#define SPI_FLASH_MOSI_PIN &pin_PA20
14+
#define SPI_FLASH_MISO_PIN &pin_PA16
15+
#define SPI_FLASH_SCK_PIN &pin_PA21
16+
#define SPI_FLASH_CS_PIN &pin_PB22
17+
18+
// These are pins not to reset.
19+
#define MICROPY_PORT_A (0)
20+
#define MICROPY_PORT_B (0)
21+
#define MICROPY_PORT_C (0)
22+
23+
#define SPEAKER_ENABLE_PIN (&pin_PA30)
24+
25+
// If you change this, then make sure to update the linker scripts as well to
26+
// make sure you don't overwrite code.
27+
#define CIRCUITPY_INTERNAL_NVM_SIZE 256
28+
29+
#define BOARD_FLASH_SIZE (0x00040000 - 0x2000 - CIRCUITPY_INTERNAL_NVM_SIZE)
30+
31+
#define CALIBRATE_CRYSTALLESS 1
32+
33+
// Explanation of how a user got into safe mode.
34+
#define BOARD_USER_SAFE_MODE_ACTION "pressing both buttons at start up"
35+
36+
#define DEFAULT_I2C_BUS_SCL (&pin_PB03)
37+
#define DEFAULT_I2C_BUS_SDA (&pin_PB02)
38+
39+
#define DEFAULT_SPI_BUS_SCK (&pin_PA05)
40+
#define DEFAULT_SPI_BUS_MOSI (&pin_PA07)
41+
#define DEFAULT_SPI_BUS_MISO (&pin_PA06)
42+
43+
#define DEFAULT_UART_BUS_RX (&pin_PB09)
44+
#define DEFAULT_UART_BUS_TX (&pin_PB08)
45+
46+
// USB is always used internally so skip the pin objects for it.
47+
#define IGNORE_PIN_PA24 1
48+
#define IGNORE_PIN_PA25 1

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

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
LD_FILE = boards/samd21x18-bootloader-external-flash-crystalless.ld
2+
USB_VID = 0x239A
3+
USB_PID = 0x8019
4+
USB_PRODUCT = "CircuitPlayground Express with displayio"
5+
USB_MANUFACTURER = "Adafruit Industries LLC"
6+
7+
CHIP_VARIANT = SAMD21G18A
8+
CHIP_FAMILY = samd21
9+
10+
SPI_FLASH_FILESYSTEM = 1
11+
EXTERNAL_FLASH_DEVICE_COUNT = 2
12+
EXTERNAL_FLASH_DEVICES = "S25FL216K, GD25Q16C"
13+
14+
# Turn off features and optimizations for Crickit build to make room for additional frozen libs.
15+
LONGINT_IMPL = NONE
16+
CIRCUITPY_BITBANGIO = 0
17+
CIRCUITPY_FREQUENCYIO = 0
18+
CIRCUITPY_I2CSLAVE = 0
19+
CIRCUITPY_PIXELBUF = 0
20+
CIRCUITPY_GAMEPAD = 0
21+
CIRCUITPY_RTC = 0
22+
23+
SUPEROPT_GC = 0
24+
CFLAGS_INLINE_LIMIT = 55
25+
26+
# Include these Python libraries in firmware.
27+
FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_BusDevice
28+
FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_CircuitPlayground
29+
FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_LIS3DH
30+
FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel
31+
FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_Thermistor

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

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
#include "shared-bindings/board/__init__.h"
2+
3+
STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
4+
{ MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_PA02) },
5+
{ MP_ROM_QSTR(MP_QSTR_D12), MP_ROM_PTR(&pin_PA02) },
6+
{ MP_ROM_QSTR(MP_QSTR_SPEAKER), MP_ROM_PTR(&pin_PA02) },
7+
{ MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_PA05) },
8+
{ MP_ROM_QSTR(MP_QSTR_D6), MP_ROM_PTR(&pin_PA05) },
9+
{ MP_ROM_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_PA06) },
10+
{ MP_ROM_QSTR(MP_QSTR_D9), MP_ROM_PTR(&pin_PA06) },
11+
{ MP_ROM_QSTR(MP_QSTR_A3), MP_ROM_PTR(&pin_PA07) },
12+
{ MP_ROM_QSTR(MP_QSTR_D10), MP_ROM_PTR(&pin_PA07) },
13+
{ MP_ROM_QSTR(MP_QSTR_A4), MP_ROM_PTR(&pin_PB03) },
14+
{ MP_ROM_QSTR(MP_QSTR_D3), MP_ROM_PTR(&pin_PB03) },
15+
{ MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_PB03) },
16+
{ MP_ROM_QSTR(MP_QSTR_A5), MP_ROM_PTR(&pin_PB02) },
17+
{ MP_ROM_QSTR(MP_QSTR_D2), MP_ROM_PTR(&pin_PB02) },
18+
{ MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_PB02) },
19+
{ MP_ROM_QSTR(MP_QSTR_A6), MP_ROM_PTR(&pin_PB09) },
20+
{ MP_ROM_QSTR(MP_QSTR_D0), MP_ROM_PTR(&pin_PB09) },
21+
{ MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_PB09) },
22+
{ MP_ROM_QSTR(MP_QSTR_A7), MP_ROM_PTR(&pin_PB08) },
23+
{ MP_ROM_QSTR(MP_QSTR_D1), MP_ROM_PTR(&pin_PB08) },
24+
{ MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_PB08) },
25+
{ MP_ROM_QSTR(MP_QSTR_LIGHT), MP_ROM_PTR(&pin_PA11) },
26+
{ MP_ROM_QSTR(MP_QSTR_A8), MP_ROM_PTR(&pin_PA11) },
27+
{ MP_ROM_QSTR(MP_QSTR_TEMPERATURE), MP_ROM_PTR(&pin_PA09) },
28+
{ MP_ROM_QSTR(MP_QSTR_A9), MP_ROM_PTR(&pin_PA09) },
29+
30+
{ MP_ROM_QSTR(MP_QSTR_BUTTON_A), MP_ROM_PTR(&pin_PA28) },
31+
{ MP_ROM_QSTR(MP_QSTR_D4), MP_ROM_PTR(&pin_PA28) },
32+
{ MP_ROM_QSTR(MP_QSTR_BUTTON_B), MP_ROM_PTR(&pin_PA14) },
33+
{ MP_ROM_QSTR(MP_QSTR_D5), MP_ROM_PTR(&pin_PA14) },
34+
{ MP_ROM_QSTR(MP_QSTR_SLIDE_SWITCH), MP_ROM_PTR(&pin_PA15) },
35+
{ MP_ROM_QSTR(MP_QSTR_D7), MP_ROM_PTR(&pin_PA15) },
36+
{ MP_ROM_QSTR(MP_QSTR_NEOPIXEL), MP_ROM_PTR(&pin_PB23) },
37+
{ MP_ROM_QSTR(MP_QSTR_D8), MP_ROM_PTR(&pin_PB23) },
38+
39+
{ MP_ROM_QSTR(MP_QSTR_D13), MP_ROM_PTR(&pin_PA17) },
40+
41+
{ MP_ROM_QSTR(MP_QSTR_REMOTEIN), MP_ROM_PTR(&pin_PA12) },
42+
{ MP_ROM_QSTR(MP_QSTR_IR_RX), MP_ROM_PTR(&pin_PA12) },
43+
{ MP_ROM_QSTR(MP_QSTR_REMOTEOUT), MP_ROM_PTR(&pin_PA23) },
44+
{ MP_ROM_QSTR(MP_QSTR_IR_TX), MP_ROM_PTR(&pin_PA23) },
45+
{ MP_ROM_QSTR(MP_QSTR_IR_PROXIMITY), MP_ROM_PTR(&pin_PA04) },
46+
47+
{ MP_ROM_QSTR(MP_QSTR_MICROPHONE_CLOCK), MP_ROM_PTR(&pin_PA10) },
48+
{ MP_ROM_QSTR(MP_QSTR_MICROPHONE_DATA), MP_ROM_PTR(&pin_PA08) },
49+
50+
{ MP_ROM_QSTR(MP_QSTR_ACCELEROMETER_INTERRUPT), MP_ROM_PTR(&pin_PA13) },
51+
{ MP_ROM_QSTR(MP_QSTR_ACCELEROMETER_SDA), MP_ROM_PTR(&pin_PA00) },
52+
{ MP_ROM_QSTR(MP_QSTR_ACCELEROMETER_SCL), MP_ROM_PTR(&pin_PA01) },
53+
54+
{ MP_ROM_QSTR(MP_QSTR_SPEAKER_ENABLE), MP_ROM_PTR(&pin_PA30) },
55+
56+
{ MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_PA05) },
57+
{ MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_PA07) },
58+
{ MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_PA06) },
59+
{ MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) },
60+
{ MP_ROM_QSTR(MP_QSTR_SPI), MP_ROM_PTR(&board_spi_obj) },
61+
{ MP_ROM_QSTR(MP_QSTR_UART), MP_ROM_PTR(&board_uart_obj) },
62+
};
63+
MP_DEFINE_CONST_DICT(board_module_globals, board_global_dict_table);

0 commit comments

Comments
 (0)