Skip to content

Commit 1f14824

Browse files
dhalbertdhalbert
authored
Merge pull request #2605 from maholli/master
New board: PyCubed + updates to SAM32 board
2 parents 6f06f92 + 2b79d8f commit 1f14824

File tree

10 files changed

+213
-19
lines changed

10 files changed

+213
-19
lines changed

‎.github/workflows/build.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -198,6 +198,7 @@ jobs:
198198
- "pybadge"
199199
- "pybadge_airlift"
200200
- "pyboard_v11"
201+
- "pycubed"
201202
- "pygamer"
202203
- "pygamer_advance"
203204
- "pyportal"

‎.gitmodules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,3 +111,6 @@
111111
[submodule "ports/mimxrt10xx/sdk"]
112112
path = ports/mimxrt10xx/sdk
113113
url = https://github.com/adafruit/MIMXRT10xx_SDK
114+
[submodule "frozen/Adafruit_CircuitPython_Register"]
115+
path = frozen/Adafruit_CircuitPython_Register
116+
url = https://github.com/adafruit/Adafruit_CircuitPython_Register.git

‎frozen/Adafruit_CircuitPython_Register

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

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
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+
28+
#include <string.h>
29+
30+
#include "boards/board.h"
31+
#include "py/mpconfig.h"
32+
#include "shared-bindings/nvm/ByteArray.h"
33+
#include "common-hal/microcontroller/Pin.h"
34+
#include "hal/include/hal_gpio.h"
35+
#include "shared-bindings/pulseio/PWMOut.h"
36+
37+
nvm_bytearray_obj_t bootcnt = {
38+
.base = {
39+
.type = &nvm_bytearray_type
40+
},
41+
.len = ( uint32_t) 8192,
42+
.start_address = (uint8_t*) (0x00080000 - 8192)
43+
};
44+
45+
46+
void board_init(void) {
47+
pulseio_pwmout_obj_t pwm;
48+
common_hal_pulseio_pwmout_construct(&pwm, &pin_PA23, 4096, 2, false);
49+
common_hal_pulseio_pwmout_never_reset(&pwm);
50+
}
51+
52+
bool board_requests_safe_mode(void) {
53+
return false;
54+
}
55+
56+
void reset_board(void) {
57+
uint8_t value_out = 0;
58+
common_hal_nvm_bytearray_get_bytes(&bootcnt,0,1,&value_out);
59+
++value_out;
60+
common_hal_nvm_bytearray_set_bytes(&bootcnt,0,&value_out,1);
61+
}

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

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
2+
#define MICROPY_HW_BOARD_NAME "PyCubedv04"
3+
#define MICROPY_HW_MCU_NAME "samd51j19"
4+
#define CIRCUITPY_MCU_FAMILY samd51
5+
6+
#define MICROPY_HW_NEOPIXEL (&pin_PA21)
7+
8+
#define MICROPY_PORT_A (PORT_PA08 | PORT_PA09 | PORT_PA10 | PORT_PA11)
9+
#define MICROPY_PORT_B ( PORT_PB10 | PORT_PB11)
10+
#define MICROPY_PORT_C (0)
11+
#define MICROPY_PORT_D (0)
12+
13+
#define AUTORESET_DELAY_MS 500
14+
15+
#define CIRCUITPY_INTERNAL_NVM_SIZE 8192
16+
17+
#define BOARD_FLASH_SIZE (FLASH_SIZE - 0x4000 - CIRCUITPY_INTERNAL_NVM_SIZE)
18+
19+
#define EXTERNAL_FLASH_QSPI_DUAL
20+
21+
#define BOARD_HAS_CRYSTAL 1
22+
23+
#define DEFAULT_I2C_BUS_SCL (&pin_PB13)
24+
#define DEFAULT_I2C_BUS_SDA (&pin_PB12)
25+
26+
#define DEFAULT_SPI_BUS_SCK (&pin_PA13)
27+
#define DEFAULT_SPI_BUS_MOSI (&pin_PA12)
28+
#define DEFAULT_SPI_BUS_MISO (&pin_PA14)
29+
30+
#define DEFAULT_UART_BUS_TX (&pin_PB02)
31+
#define DEFAULT_UART_BUS_RX (&pin_PB03)
32+
33+
#define IGNORE_PIN_PA24 1
34+
#define IGNORE_PIN_PA25 1

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

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
LD_FILE = boards/samd51x19-bootloader-external-flash.ld
2+
USB_VID = 0x04D8
3+
USB_PID = 0xEC44
4+
USB_PRODUCT = "PyCubed"
5+
USB_MANUFACTURER = "maholli"
6+
7+
CHIP_VARIANT = SAMD51J19A
8+
CHIP_FAMILY = samd51
9+
10+
QSPI_FLASH_FILESYSTEM = 1
11+
EXTERNAL_FLASH_DEVICE_COUNT = 1
12+
EXTERNAL_FLASH_DEVICES = W25Q80DV
13+
LONGINT_IMPL = MPZ
14+
15+
# Not needed.
16+
CIRCUITPY_AUDIOBUSIO = 0
17+
CIRCUITPY_DISPLAYIO = 0
18+
CIRCUITPY_GAMEPAD = 0
19+
CIRCUITPY_PS2IO = 0
20+
21+
FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_BusDevice
22+
FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel
23+
FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_Register
24+
FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_SD

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

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
#include "shared-bindings/board/__init__.h"
2+
#include "boards/board.h"
3+
4+
STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
5+
{ MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_PA13) },
6+
{ MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_PA12) },
7+
{ MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_PA14) },
8+
{ MP_ROM_QSTR(MP_QSTR_xSDCS), MP_ROM_PTR(&pin_PA27) },
9+
10+
{ MP_ROM_QSTR(MP_QSTR_RELAY_A), MP_ROM_PTR(&pin_PB15) },
11+
{ MP_ROM_QSTR(MP_QSTR_BURN1), MP_ROM_PTR(&pin_PB31) },
12+
{ MP_ROM_QSTR(MP_QSTR_BURN2), MP_ROM_PTR(&pin_PA15) },
13+
14+
{ MP_ROM_QSTR(MP_QSTR_BATTERY), MP_ROM_PTR(&pin_PA06) },
15+
{ MP_ROM_QSTR(MP_QSTR_L1PROG), MP_ROM_PTR(&pin_PA07) },
16+
{ MP_ROM_QSTR(MP_QSTR_AIN4), MP_ROM_PTR(&pin_PA04) },
17+
{ MP_ROM_QSTR(MP_QSTR_AIN5), MP_ROM_PTR(&pin_PA05) },
18+
{ MP_ROM_QSTR(MP_QSTR_CHRG), MP_ROM_PTR(&pin_PB08) },
19+
{ MP_ROM_QSTR(MP_QSTR_DAC0), MP_ROM_PTR(&pin_PA02) },
20+
{ MP_ROM_QSTR(MP_QSTR_PA17), MP_ROM_PTR(&pin_PA17) },
21+
{ MP_ROM_QSTR(MP_QSTR_PA18), MP_ROM_PTR(&pin_PA18) },
22+
{ MP_ROM_QSTR(MP_QSTR_PA19), MP_ROM_PTR(&pin_PA19) },
23+
{ MP_ROM_QSTR(MP_QSTR_PA20), MP_ROM_PTR(&pin_PA20) },
24+
{ MP_ROM_QSTR(MP_QSTR_PA22), MP_ROM_PTR(&pin_PA22) },
25+
{ MP_ROM_QSTR(MP_QSTR_PB16), MP_ROM_PTR(&pin_PB16) },
26+
{ MP_ROM_QSTR(MP_QSTR_PB17), MP_ROM_PTR(&pin_PB17) },
27+
{ MP_ROM_QSTR(MP_QSTR_PB22), MP_ROM_PTR(&pin_PB22) },
28+
{ MP_ROM_QSTR(MP_QSTR_PB23), MP_ROM_PTR(&pin_PB23) },
29+
30+
{ MP_ROM_QSTR(MP_QSTR_RF1_RST), MP_ROM_PTR(&pin_PB00) },
31+
{ MP_ROM_QSTR(MP_QSTR_RF1_CS), MP_ROM_PTR(&pin_PB30) },
32+
{ MP_ROM_QSTR(MP_QSTR_RF1_IO0), MP_ROM_PTR(&pin_PB05) },
33+
{ MP_ROM_QSTR(MP_QSTR_RF1_IO4), MP_ROM_PTR(&pin_PB04) },
34+
35+
{ MP_ROM_QSTR(MP_QSTR_RF2_RST), MP_ROM_PTR(&pin_PB14) },
36+
{ MP_ROM_QSTR(MP_QSTR_RF2_CS), MP_ROM_PTR(&pin_PB09) },
37+
{ MP_ROM_QSTR(MP_QSTR_RF2_IO1), MP_ROM_PTR(&pin_PB06) },
38+
{ MP_ROM_QSTR(MP_QSTR_RF2_BSY), MP_ROM_PTR(&pin_PB07) },
39+
40+
{ MP_ROM_QSTR(MP_QSTR_EN_GPS), MP_ROM_PTR(&pin_PB01) },
41+
{ MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_PB02) },
42+
{ MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_PB03) },
43+
44+
{ MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_PB12) },
45+
{ MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_PB13) },
46+
47+
{ MP_ROM_QSTR(MP_QSTR_WDT_WDI), MP_ROM_PTR(&pin_PA23) },
48+
{ MP_ROM_QSTR(MP_QSTR_NEOPIXEL), MP_ROM_PTR(&pin_PA21) },
49+
50+
{ MP_ROM_QSTR(MP_QSTR_UART), MP_ROM_PTR(&board_uart_obj) },
51+
{ MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) },
52+
{ MP_ROM_QSTR(MP_QSTR_SPI), MP_ROM_PTR(&board_spi_obj) },
53+
54+
};
55+
MP_DEFINE_CONST_DICT(board_module_globals, board_global_dict_table);

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

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,22 @@
1-
2-
#define MICROPY_HW_BOARD_NAME "SAM32v2a"
1+
#define MICROPY_HW_BOARD_NAME "SAM32v26"
32
#define MICROPY_HW_MCU_NAME "samd51j20"
43
#define CIRCUITPY_MCU_FAMILY samd51
54

65
#define MICROPY_HW_LED_STATUS (&pin_PA27)
7-
#define MICROPY_HW_NEOPIXEL (&pin_PA15)
6+
#define MICROPY_HW_NEOPIXEL (&pin_PA15)
87

98
#define MICROPY_PORT_A (PORT_PA24 | PORT_PA25)
109
#define MICROPY_PORT_B (0)
1110
#define MICROPY_PORT_C (0)
12-
#define MICROPY_PORT_D (0)
11+
#define MICROPY_PORT_D (0)
1312

14-
// No microcontroller.nvm
1513
#define CIRCUITPY_INTERNAL_NVM_SIZE 0
14+
#define CIRCUITPY_INTERNAL_FLASH_FILESYSTEM_SIZE (128*1024)
1615

1716
#define BOARD_HAS_CRYSTAL 1
1817

19-
#define DEFAULT_I2C_BUS_SCL (&pin_PA04)
20-
#define DEFAULT_I2C_BUS_SDA (&pin_PA07)
18+
#define DEFAULT_I2C_BUS_SCL (&pin_PA09)
19+
#define DEFAULT_I2C_BUS_SDA (&pin_PA08)
2120

2221
#define DEFAULT_SPI_BUS_SCK (&pin_PB13)
2322
#define DEFAULT_SPI_BUS_MOSI (&pin_PB12)

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,10 @@ CHIP_FAMILY = samd51
88

99
INTERNAL_FLASH_FILESYSTEM = 1
1010
LONGINT_IMPL = MPZ
11+
12+
# No I2S on SAMD51
13+
CIRCUITPY_AUDIOBUSIO = 0
14+
CIRCUITPY_USTACK = 1
15+
16+
FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_BusDevice
17+
FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel

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

Lines changed: 21 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
#include "shared-bindings/board/__init__.h"
22

33
STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
4-
{ MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_PB08) },
5-
{ MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_PB09) },
6-
{ MP_ROM_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_PA08) },
7-
{ MP_ROM_QSTR(MP_QSTR_A3), MP_ROM_PTR(&pin_PA09) },
4+
{ MP_ROM_QSTR(MP_QSTR_IO39), MP_ROM_PTR(&pin_PB08) },
5+
{ MP_ROM_QSTR(MP_QSTR_IO36), MP_ROM_PTR(&pin_PB09) },
86
{ MP_ROM_QSTR(MP_QSTR_A6), MP_ROM_PTR(&pin_PB04) },
97
{ MP_ROM_QSTR(MP_QSTR_A7), MP_ROM_PTR(&pin_PB05) },
108
{ MP_ROM_QSTR(MP_QSTR_A8), MP_ROM_PTR(&pin_PB06) },
@@ -13,15 +11,14 @@ STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
1311
{ MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_PB13) },
1412
{ MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_PB12) },
1513
{ MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_PB14) },
16-
{ MP_ROM_QSTR(MP_QSTR_xSDCS),MP_ROM_PTR(&pin_PB15) },
14+
{ MP_ROM_QSTR(MP_QSTR_xSDCS),MP_ROM_PTR(&pin_PA04) },
1715

1816
{ MP_ROM_QSTR(MP_QSTR_DAC0), MP_ROM_PTR(&pin_PA02) },
1917
{ MP_ROM_QSTR(MP_QSTR_DAC1), MP_ROM_PTR(&pin_PA05) },
2018

19+
{ MP_ROM_QSTR(MP_QSTR_D16), MP_ROM_PTR(&pin_PA07) },
2120
{ MP_ROM_QSTR(MP_QSTR_D19), MP_ROM_PTR(&pin_PA10) },
2221
{ MP_ROM_QSTR(MP_QSTR_D20), MP_ROM_PTR(&pin_PA11) },
23-
{ MP_ROM_QSTR(MP_QSTR_D29), MP_ROM_PTR(&pin_PA12) },
24-
{ MP_ROM_QSTR(MP_QSTR_D30), MP_ROM_PTR(&pin_PA13) },
2522
{ MP_ROM_QSTR(MP_QSTR_D31), MP_ROM_PTR(&pin_PA14) },
2623
{ MP_ROM_QSTR(MP_QSTR_D35), MP_ROM_PTR(&pin_PA16) },
2724
{ MP_ROM_QSTR(MP_QSTR_D36), MP_ROM_PTR(&pin_PA17) },
@@ -35,12 +32,24 @@ STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
3532
{ MP_ROM_QSTR(MP_QSTR_D50), MP_ROM_PTR(&pin_PB23) },
3633
{ MP_ROM_QSTR(MP_QSTR_D59), MP_ROM_PTR(&pin_PB30) },
3734
{ MP_ROM_QSTR(MP_QSTR_D60), MP_ROM_PTR(&pin_PB31) },
38-
{ MP_ROM_QSTR(MP_QSTR_D64), MP_ROM_PTR(&pin_PB03) },
35+
{ MP_ROM_QSTR(MP_QSTR_D61), MP_ROM_PTR(&pin_PB00) },
36+
37+
{ MP_ROM_QSTR(MP_QSTR_IO13), MP_ROM_PTR(&pin_PB01) },
38+
{ MP_ROM_QSTR(MP_QSTR_IO12), MP_ROM_PTR(&pin_PB02) },
39+
{ MP_ROM_QSTR(MP_QSTR_IO14), MP_ROM_PTR(&pin_PB03) },
40+
41+
{ MP_ROM_QSTR(MP_QSTR_TCK), MP_ROM_PTR(&pin_PB01) },
42+
{ MP_ROM_QSTR(MP_QSTR_TDI), MP_ROM_PTR(&pin_PB02) },
43+
{ MP_ROM_QSTR(MP_QSTR_TMS), MP_ROM_PTR(&pin_PB03) },
44+
{ MP_ROM_QSTR(MP_QSTR_ESP_CS),MP_ROM_PTR(&pin_PB15) },
45+
46+
{ MP_ROM_QSTR(MP_QSTR_TX1), MP_ROM_PTR(&pin_PA12) },
47+
{ MP_ROM_QSTR(MP_QSTR_RX1), MP_ROM_PTR(&pin_PA13) },
48+
{ MP_ROM_QSTR(MP_QSTR_TX2), MP_ROM_PTR(&pin_PB16) },
49+
{ MP_ROM_QSTR(MP_QSTR_RX2), MP_ROM_PTR(&pin_PB17) },
3950

40-
{ MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_PB16) },
41-
{ MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_PB17) },
42-
{ MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_PA07) },
43-
{ MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_PA04) },
51+
{ MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_PA08) },
52+
{ MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_PA09) },
4453

4554
{ MP_ROM_QSTR(MP_QSTR_RTS), MP_ROM_PTR(&pin_PB11) },
4655
{ MP_ROM_QSTR(MP_QSTR_DTR), MP_ROM_PTR(&pin_PB10) },

0 commit comments

Comments
 (0)