8000 Merge pull request #2415 from dhalbert/4.x-robohatmm1_m4 · adafruit/circuitpython@48a19c7 · GitHub
[go: up one dir, main page]
Skip to content

Commit 48a19c7

Browse files
tannewttannewt
authored
Merge pull request #2415 from dhalbert/4.x-robohatmm1_m4
replace robohatmm1 with robohatmm1_m4
2 parents 483a6a9 + 4d7d92e commit 48a19c7

File tree

8 files changed

+167
-170
lines changed

8 files changed

+167
-170
lines changed

‎.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ env:
2424
- TRAVIS_TESTS="unix docs translations website" TRAVIS_BOARDS="circuitplayground_express mini_sam_m4 grandcentral_m4_express capablerobot_usbhub pygamer pca10056 pca10059 feather_nrf52840_express makerdiary_nrf52840_mdk makerdiary_nrf52840_mdk_usb_dongle particle_boron particle_argon particle_xenon sparkfun_nrf52840_mini electronut_labs_papyr electronut_labs_blip" TRAVIS_SDK=arm:nrf
2525
- TRAVIS_BOARDS="metro_m0_express metro_m4_express metro_m4_airlift_lite pirkey_m0 trellis_m4_express trinket_m0 sparkfun_lumidrive sparkfun_redboard_turbo bast_pro_mini_m0 datum_distance pyruler" TRAVIS_SDK=arm
2626
- TRAVIS_BOARDS="feather_radiofruit_zigbee gemma_m0 hallowing_m0_express itsybitsy_m0_express itsybitsy_m4_express meowmeow sam32 uchip escornabot_makech pygamer_advance datum_imu" TRAVIS_SDK=arm
27-
- TRAVIS_BOARDS="feather_m0_express_crickit feather_m0_rfm69 feather_m0_rfm9x feather_m4_express arduino_zero arduino_mkr1300 arduino_mkrzero pewpew10 kicksat-sprite ugame10 robohatmm1 datum_light hallowing_m4_express" TRAVIS_SDK=arm
27+
- TRAVIS_BOARDS="feather_m0_express_crickit feather_m0_rfm69 feather_m0_rfm9x feather_m4_express arduino_zero arduino_mkr1300 arduino_mkrzero pewpew10 kicksat-sprite ugame10 robohatmm1_m4 datum_light hallowing_m4_express" TRAVIS_SDK=arm
2828
- TRAVIS_BOARDS="circuitplayground_express_crickit feather_m0_adalogger feather_m0_basic feather_m0_express catwan_usbstick pyportal sparkfun_samd21_mini sparkfun_samd21_dev pybadge pybadge_airlift datum_weather" TRAVIS_SDK=arm
2929

3030
addons:

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

Lines changed: 0 additions & 46 deletions
This file was deleted.

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

Lines changed: 0 additions & 33 deletions
This file was deleted.

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

Lines changed: 0 additions & 88 deletions
This file was deleted.

‎ports/atmel-samd/boards/robohatmm1/board.c renamed to ‎ports/atmel-samd/boards/robohatmm1_m4/board.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,10 @@
2525
*/
2626

2727
#include "boards/board.h"
28+
#include "mpconfigboard.h"
29+
#include "hal/include/hal_gpio.h"
2830

29-
void board_init(void)
30-
{
31+
void board_init(void) {
3132
}
3233

3334
bool board_requests_safe_mode(void) {

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

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
#define MICROPY_HW_BOARD_NAME "Robo HAT MM1 M4"
2+
#define MICROPY_HW_MCU_NAME "samd51g19"
3+
4+
#define CIRCUITPY_MCU_FAMILY samd51
5+
6+
#define MICROPY_HW_LED_STATUS (&pin_PB22)
7+
8+
// Salae reads 12mhz which is the limit even though we set it to the safer 8mhz.
9+
#define SPI_FLASH_BAUDRATE (8000000)
10+
11+
// On-board flash
12+
#define SPI_FLASH_MOSI_PIN &pin_PA12
13+
#define SPI_FLASH_MISO_PIN &pin_PA14
14+
#define SPI_FLASH_SCK_PIN &pin_PA13
15+
#define SPI_FLASH_CS_PIN &pin_PA15
16+
17+
// These are pins not to reset.
18+
// SPI Data pins
19+
#define MICROPY_PORT_A (0)
20+
#define MICROPY_PORT_B (0)
21+
#define MICROPY_PORT_C (0)
22+
#define MICROPY_PORT_D (0)
23+
24+
#define AUTORESET_DELAY_MS 500
25+
26+
// If you change this, then make sure to update the linker scripts as well to
27+
// make sure you don't overwrite code
28+
#define CIRCUITPY_INTERNAL_NVM_SIZE 8192
29+
30+
#define BOARD_FLASH_SIZE (FLASH_SIZE - 0x4000 - CIRCUITPY_INTERNAL_NVM_SIZE)
31+
32+
#define DEFAULT_I2C_BUS_SCL (&pin_PA23)
33+
#define DEFAULT_I2C_BUS_SDA (&pin_PA22)
34+
35+
#define DEFAULT_SPI_BUS_SCK (&pin_PB09)
36+
#define DEFAULT_SPI_BUS_MOSI (&pin_PB08)
37+
#define DEFAULT_SPI_BUS_MISO (&pin_PB11)
38+
39+
//#define DEFAULT_UART_BUS_RX (&pin_PB03)
40+
//#define DEFAULT_UART_BUS_TX (&pin_PB02)
41+
42+
// USB is always used internally so skip the pin objects for it.
43+
#define IGNORE_PIN_PA24 1
44+
#define IGNORE_PIN_PA25 1

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

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
LD_FILE = boards/samd51x19-bootloader-external-flash.ld
2+
USB_VID = 0x1209
3+
USB_PID = 0x4D43
4+
USB_PRODUCT = "Robo HAT MM1 M4"
5+
USB_MANUFACTURER = "Robotics Masters"
6+
7+
CHIP_VARIANT = SAMD51G19A
8+
CHIP_FAMILY = samd51
9+
10+
#QSPI_FLASH_FILESYSTEM = 0
11+
12+
SPI_FLASH_FILESYSTEM = 1
13+
EXTERNAL_FLASH_DEVICE_COUNT = 1
14+
EXTERNAL_FLASH_DEVICES = "W25Q64JV_IQ"
15+
LONGINT_IMPL = MPZ
16+
17+
CIRCUITPY_PS2IO = 1
18+
# No I2S on SAMD51G
19+
CIRCUITPY_AUDIOBUSIO = 0
20+
# Make room for more stuff
21+
CIRCUITPY_DISPLAYIO = 0
22+
CIRCUITPY_FREQUENCYIO = 0
23+
24+
# Include these Python libraries in firmware.
25+
#FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_BusDevice
26+
FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel
27+
#FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_INA219
28+
#FROZEN_MPY_DIRS += $(TOP)/frozen/RoboticsMasters_CircuitPython_MPU9250

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

Lines changed: 91 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,91 @@
1+
#include "shared-bindings/board/__init__.h"
2+
// Version 2.4
3+
STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
4+
// SERVO Pins
5+
{ MP_ROM_QSTR(MP_QSTR_SERVO1), MP_ROM_PTR(&pin_PA18) },
6+
{ MP_ROM_QSTR(MP_QSTR_SERVO2), MP_ROM_PTR(&pin_PA19) },
7+
{ MP_ROM_QSTR(MP_QSTR_SERVO3), MP_ROM_PTR(&pin_PA20) },
8+
{ MP_ROM_QSTR(MP_QSTR_SERVO4), MP_ROM_PTR(&pin_PA21) },
9+
{ MP_ROM_QSTR(MP_QSTR_SERVO5), MP_ROM_PTR(&pin_PA11) },
10+
{ MP_ROM_QSTR(MP_QSTR_SERVO6), MP_ROM_PTR(&pin_PA10) },
11+
{ MP_ROM_QSTR(MP_QSTR_SERVO7), MP_ROM_PTR(&pin_PA09) },
12+
{ MP_ROM_QSTR(MP_QSTR_SERVO8), MP_ROM_PTR(&pin_PA08) },
13+
14+
// RCC Pins
15+
{ MP_ROM_QSTR(MP_QSTR_RCC1), MP_ROM_PTR(&pin_PA07) },
16+
{ MP_ROM_QSTR(MP_QSTR_RCC2), MP_ROM_PTR(&pin_PA06) },
17+
{ MP_ROM_QSTR(MP_QSTR_RCC3), MP_ROM_PTR(&pin_PA05) },
18+
{ MP_ROM_QSTR(MP_QSTR_RCC4), MP_ROM_PTR(&pin_PA04) },
19+
20+
// Special Function
21+
{ MP_ROM_QSTR(MP_QSTR_VOLTAGE_MONITOR), MP_ROM_PTR(&pin_PA02) },
22+
{ MP_ROM_QSTR(MP_QSTR_BATTERY), MP_ROM_PTR(&pin_PA02) },
23+
{ MP_ROM_QSTR(MP_QSTR_POWER_OFF), MP_ROM_PTR(&pin_PA03) },
24+
{ MP_ROM_QSTR(MP_QSTR_POWER_DISABLE), MP_ROM_PTR(&pin_PA03) },
25+
{ MP_ROM_QSTR(MP_QSTR_POWER_ON), MP_ROM_PTR(&pin_PA27) },
26+
{ MP_ROM_QSTR(MP_QSTR_POWER_ENABLE), MP_ROM_PTR(&pin_PA27) },
27+
{ MP_ROM_QSTR(MP_QSTR_BUTTON), MP_ROM_PTR(&pin_PA27) },
28+
29+
{ MP_ROM_QSTR(MP_QSTR_NEOPIXEL), MP_ROM_PTR(&pin_PB23) },
30+
{ MP_ROM_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_PB22) },
31+
32+
33+
// GROVE on SERCOM0
34+
{ MP_ROM_QSTR(MP_QSTR_GROVE_SCL), MP_ROM_PTR(&pin_PA09) },
35+
{ MP_ROM_QSTR(MP_QSTR_GROVE_SDA), MP_ROM_PTR(&pin_PA08) },
36+
{ MP_ROM_QSTR(MP_QSTR_GROVE_RX), MP_ROM_PTR(&pin_PA09) },
37+
{ MP_ROM_QSTR(MP_QSTR_GROVE_TX), MP_ROM_PTR(&pin_PA08) },
38+
{ MP_ROM_QSTR(MP_QSTR_GROVE_D1), MP_ROM_PTR(&pin_PA09) },
39+
{ MP_ROM_QSTR(MP_QSTR_GROVE_D0), MP_ROM_PTR(&pin_PA08) },
40+
{ MP_ROM_QSTR(MP_QSTR_GROVE_A1), MP_ROM_PTR(&pin_PA09) },
41+
{ MP_ROM_QSTR(MP_QSTR_GROVE_A0), MP_ROM_PTR(&pin_PA08) },
42+
43+
// UART on SERCOM0
44+
{ MP_ROM_QSTR(MP_QSTR_UART_TX), MP_ROM_ 10000 PTR(&pin_PA04) },
45+
{ MP_ROM_QSTR(MP_QSTR_UART_RX), MP_ROM_PTR(&pin_PA05) },
46+
{ MP_ROM_QSTR(MP_QSTR_UART_CTS), MP_ROM_PTR(&pin_PA06) },
47+
{ MP_ROM_QSTR(MP_QSTR_UART_RTS), MP_ROM_PTR(&pin_PA07) },
48+
49+
// UART on SERCOM1 (Raspberry Pi)
50+
{ MP_ROM_QSTR(MP_QSTR_TX1), MP_ROM_PTR(&pin_PA16) },
51+
{ MP_ROM_QSTR(MP_QSTR_RX1), MP_ROM_PTR(&pin_PA17) },
52+
{ MP_ROM_QSTR(MP_QSTR_PI_TX), MP_ROM_PTR(&pin_PA16) },
53+
{ MP_ROM_QSTR(MP_QSTR_PI_RX), MP_ROM_PTR(&pin_PA17) },
54+
55+
// I2C on SERCOM1 (External Connector)
56+
{ MP_ROM_QSTR(MP_QSTR_SDA1), MP_ROM_PTR(&pin_PA00) },
57+
{ MP_ROM_QSTR(MP_QSTR_SCL1), MP_ROM_PTR(&pin_PA01) },
58+
59+
// SPI Flash on SERCOM2
60+
{ MP_ROM_QSTR(MP_QSTR_FLASH_SCK), MP_ROM_PTR(&pin_PA13) },
61+
{ MP_ROM_QSTR(MP_QSTR_FLASH_MISO), MP_ROM_PTR(&pin_PA14) },
62+
{ MP_ROM_QSTR(MP_QSTR_FLASH_MOSI), MP_ROM_PTR(&pin_PA12) },
63+
{ MP_ROM_QSTR(MP_QSTR_FLASH_CS), MP_ROM_PTR(&pin_PA15) },
64+
65+
// I2C on SERCOM3 (RPi & Internal)
66+
{ MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_PA22) },
67+
{ MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_PA23) },
68+
{ MP_ROM_QSTR(MP_QSTR_PI_SDA), MP_ROM_PTR(&pin_PA22) },
69+
{ MP_ROM_QSTR(MP_QSTR_PI_SCL), MP_ROM_PTR(&pin_PA23) },
70+
71+
// SPI on SERCOM4
72+
{ MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_PB08) },
73+
{ MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_PB09) },
74+
{ MP_ROM_QSTR(MP_QSTR_SS), MP_ROM_PTR(&pin_PB10) },
75+
{ MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_PB11) },
76+
77+
// GPS on SERCOM5
78+
{ MP_ROM_QSTR(MP_QSTR_GPS_TX), MP_ROM_PTR(&pin_PB02) },
79+
{ MP_ROM_QSTR(MP_QSTR_GPS_RX), MP_ROM_PTR(&pin_PB03) },
80+
81+
// Raspberry Pi
82+
{ MP_ROM_QSTR(MP_QSTR_PI_GP25), MP_ROM_PTR(&pin_PA30) },
83+
{ MP_ROM_QSTR(MP_QSTR_SWCLK), MP_ROM_PTR(&pin_PA30) },
84+
{ MP_ROM_QSTR(MP_QSTR_PI_GP24), MP_ROM_PTR(&pin_PA31) },
85+
{ MP_ROM_QSTR(MP_QSTR_SWDIO), MP_ROM_PTR(&pin_PA31) },
86+
87+
{ MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) },
88+
{ MP_ROM_QSTR(MP_QSTR_SPI), MP_ROM_PTR(&board_spi_obj) },
89+
//{ MP_ROM_QSTR(MP_QSTR_UART), MP_ROM_PTR(&board_uart_obj) },
90+
};
91+
MP_DEFINE_CONST_DICT(board_module_globals, board_global_dict_table);

0 commit comments

Comments
 (0)
0