Skip to content

Commit dab4d0e

Browse files
jeplerjepler
authored
Merge pull request adafruit#3476 from jepler/qtpy-haxpress
Add QT Py Haxpress
2 parents 2c8ee08 + 791d20f commit dab4d0e

File tree

7 files changed

+190
-6
lines changed

7 files changed

+190
-6
lines changed

‎.github/workflows/build.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -279,6 +279,7 @@ jobs:
279279
- "pyportal_titano"
280280
- "pyruler"
281281
- "qtpy_m0"
282+
- "qtpy_m0_haxpress"
282283
- "raytac_mdbt50q-db-40"
283284
- "robohatmm1_m4"
284285
- "sam32"

‎locale/circuitpython.pot

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ msgid ""
88
msgstr ""
99
"Project-Id-Version: PACKAGE VERSION\n"
1010
"Report-Msgid-Bugs-To: \n"
11-
"POT-Creation-Date: 2020-09-21 16:45-0500\n"
11+
"POT-Creation-Date: 2020-09-24 16:55-0500\n"
1212
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1313
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1414
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1167,14 +1167,10 @@ msgstr ""
11671167
msgid "Must be a %q subclass."
11681168
msgstr ""
11691169

1170-
#: ports/mimxrt10xx/common-hal/busio/SPI.c ports/stm/common-hal/busio/SPI.c
1170+
#: ports/mimxrt10xx/common-hal/busio/SPI.c shared-bindings/busio/SPI.c
11711171
msgid "Must provide MISO or MOSI pin"
11721172
msgstr ""
11731173

1174-
#: ports/stm/common-hal/busio/SPI.c
1175-
msgid "Must provide SCK pin"
1176-
msgstr ""
1177-
11781174
#: shared-bindings/rgbmatrix/RGBMatrix.c
11791175
#, c-format
11801176
msgid "Must use a multiple of 6 rgb pins, not %d"

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

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
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 "common-hal/microcontroller/Pin.h"
29+
#include "supervisor/shared/board.h"
30+
#include "hal/include/hal_gpio.h"
31+
32+
void board_init(void) {
33+
gpio_set_pin_function(PIN_PA15, GPIO_PIN_FUNCTION_OFF);
34+
gpio_set_pin_direction(PIN_PA15, GPIO_DIRECTION_OUT);
35+
gpio_set_pin_level(PIN_PA15, true); // Turn on neopixel by default
36+
never_reset_pin_number(PIN_PA15);
37+
}
38+
39+
bool board_requests_safe_mode(void) {
40+
return false;
41+
}
42+
43+
void reset_board(void) {
44+
}

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

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
#define MICROPY_HW_BOARD_NAME "Adafruit QT Py M0 Haxpress"
2+
#define MICROPY_HW_MCU_NAME "samd21e18"
3+
4+
#define MICROPY_HW_NEOPIXEL (&pin_PA18)
5+
6+
#define MICROPY_PORT_A (0)
7+
#define MICROPY_PORT_B (0)
8+
#define MICROPY_PORT_C (0)
9+
10+
#define SPI_FLASH_MOSI_PIN &pin_PA22
11+
#define SPI_FLASH_MISO_PIN &pin_PA19
12+
#define SPI_FLASH_SCK_PIN &pin_PA23
13+
#define SPI_FLASH_CS_PIN &pin_PA08
14+
15+
#define IGNORE_PIN_PA00 1
16+
#define IGNORE_PIN_PA01 1
17+
#define IGNORE_PIN_PA12 1
18+
#define IGNORE_PIN_PA13 1
19+
#define IGNORE_PIN_PA14 1
20+
#define IGNORE_PIN_PA20 1
21+
#define IGNORE_PIN_PA21 1
22+
// USB is always used internally so skip the pin objects for it.
23+
#define IGNORE_PIN_PA24 1
24+
#define IGNORE_PIN_PA25 1
25+
#define IGNORE_PIN_PA27 1
26+
#define IGNORE_PIN_PA28 1
27+
#define IGNORE_PIN_PA30 1
28+
#define IGNORE_PIN_PA31 1
29+
#define IGNORE_PIN_PB01 1
30+
#define IGNORE_PIN_PB02 1
31+
#define IGNORE_PIN_PB03 1
32+
#define IGNORE_PIN_PB04 1
33+
#define IGNORE_PIN_PB05 1
34+
#define IGNORE_PIN_PB06 1
35+
#define IGNORE_PIN_PB07 1
36+
#define IGNORE_PIN_PB08 1
37+
#define IGNORE_PIN_PB09 1
38+
#define IGNORE_PIN_PB10 1
39+
#define IGNORE_PIN_PB11 1
40+
#define IGNORE_PIN_PB12 1
41+
#define IGNORE_PIN_PB13 1
42+
#define IGNORE_PIN_PB14 1
43+
#define IGNORE_PIN_PB15 1
44+
#define IGNORE_PIN_PB16 1
45+
#define IGNORE_PIN_PB17 1
46+
#define IGNORE_PIN_PB22 1
47+
#define IGNORE_PIN_PB23 1
48+
#define IGNORE_PIN_PB30 1
49+
#define IGNORE_PIN_PB31 1
50+
#define IGNORE_PIN_PB00 1
51+
52+
#define DEFAULT_I2C_BUS_SCL (&pin_PA17)
53+
#define DEFAULT_I2C_BUS_SDA (&pin_PA16)
54+
55+
#define DEFAULT_SPI_BUS_SCK (&pin_PA11)
56+
#define DEFAULT_SPI_BUS_MOSI (&pin_PA10)
57+
#define DEFAULT_SPI_BUS_MISO (&pin_PA09)
58+
59+
#define DEFAULT_UART_BUS_RX (&pin_PA07)
60+
#define DEFAULT_UART_BUS_TX (&pin_PA06)

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

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
USB_VID = 0x239A
2+
USB_PID = 0x00CC
3+
USB_PRODUCT = "QT Py M0 Haxpress"
4+
USB_MANUFACTURER = "Adafruit Industries LLC"
5+
6+
CHIP_VARIANT = SAMD21E18A
7+
CHIP_FAMILY = samd21
8+
9+
INTERNAL_FLASH_FILESYSTEM = 0
10+
LONGINT_IMPL = MPZ
11+
SPI_FLASH_FILESYSTEM = 1
12+
EXTERNAL_FLASH_DEVICE_COUNT = 1
13+
EXTERNAL_FLASH_DEVICES = GD25Q16C
14+
15+
CIRCUITPY_AUDIOBUSIO = 0
16+
CIRCUITPY_BITBANGIO = 0
17+
CIRCUITPY_COUNTIO = 0
18+
CIRCUITPY_FREQUENCYIO = 0
19+
CIRCUITPY_I2CPERIPHERAL = 0
20+
21+
SUPEROPT_GC = 0
22+
23+
CFLAGS_BOARD = --param max-inline-insns-auto=15
24+
ifeq ($(TRANSLATION), zh_Latn_pinyin)
25+
RELEASE_NEEDS_CLEAN_BUILD = 1
26+
CFLAGS_INLINE_LIMIT = 35
27+
endif
28+
ifeq ($(TRANSLATION), de_DE)
29+
RELEASE_NEEDS_CLEAN_BUILD = 1
30+
CFLAGS_INLINE_LIMIT = 35
31+
SUPEROPT_VM = 0
32+
endif

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

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
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_D0), MP_ROM_PTR(&pin_PA02) },
5+
{ MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_PA02) },
6+
7+
{ MP_ROM_QSTR(MP_QSTR_D1), MP_ROM_PTR(&pin_PA03) },
8+
{ MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_PA03) },
9+
10+
{ MP_ROM_QSTR(MP_QSTR_D2), MP_ROM_PTR(&pin_PA04) },
11+
{ MP_ROM_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_PA04) },
12+
13+
{ MP_ROM_QSTR(MP_QSTR_D3), MP_ROM_PTR(&pin_PA05) },
14+
{ MP_ROM_QSTR(MP_QSTR_A3), MP_ROM_PTR(&pin_PA05) },
15+
16+
{ MP_ROM_QSTR(MP_QSTR_D4), MP_ROM_PTR(&pin_PA16) },
17+
{ MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_PA16) },
18+
19+
{ MP_ROM_QSTR(MP_QSTR_D5), MP_ROM_PTR(&pin_PA17) },
20+
{ MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_PA17) },
21+
22+
{ MP_ROM_QSTR(MP_QSTR_D6), MP_ROM_PTR(&pin_PA06) },
23+
{ MP_ROM_QSTR(MP_QSTR_A6), MP_ROM_PTR(&pin_PA06) },
24+
{ MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_PA06) },
25+
26+
{ MP_ROM_QSTR(MP_QSTR_D7), MP_ROM_PTR(&pin_PA07) },
27+
{ MP_ROM_QSTR(MP_QSTR_A7), MP_ROM_PTR(&pin_PA07) },
28+
{ MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_PA07) },
29+
30+
{ MP_ROM_QSTR(MP_QSTR_D8), MP_ROM_PTR(&pin_PA11) },
31+
{ MP_ROM_QSTR(MP_QSTR_A8), MP_ROM_PTR(&pin_PA11) },
32+
{ MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_PA11) },
33+
34+
{ MP_ROM_QSTR(MP_QSTR_D9), MP_ROM_PTR(&pin_PA09) },
35+
{ MP_ROM_QSTR(MP_QSTR_A9), MP_ROM_PTR(&pin_PA09) },
36+
{ MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_PA09) },
37+
38+
{ MP_ROM_QSTR(MP_QSTR_D10), MP_ROM_PTR(&pin_PA10) },
39+
{ MP_ROM_QSTR(MP_QSTR_A10), MP_ROM_PTR(&pin_PA10) },
40+
{ MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_PA10) },
41+
42+
{ MP_ROM_QSTR(MP_QSTR_NEOPIXEL), MP_ROM_PTR(&pin_PA18) },
43+
{ MP_ROM_QSTR(MP_QSTR_NEOPIXEL_POWER), MP_ROM_PTR(&pin_PA15) },
44+
45+
{ MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) },
46+
{ MP_ROM_QSTR(MP_QSTR_SPI), MP_ROM_PTR(&board_spi_obj) },
47+
{ MP_ROM_QSTR(MP_QSTR_UART), MP_ROM_PTR(&board_uart_obj) },
48+
};
49+
MP_DEFINE_CONST_DICT(board_module_globals, board_global_dict_table);

‎supervisor/stub/safe_mode.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ safe_mode_t wait_for_safe_mode_reset(void) {
3232

3333
void reset_into_safe_mode(safe_mode_t reason) {
3434
(void) reason;
35+
for (;;) {
36+
}
3537
}
3638

3739
void print_safe_mode_message(safe_mode_t reason) {

0 commit comments

Comments
 (0)