Skip to content

Commit b06fa48

Browse files
wallarugwallarug
committed
updated a few files
1 parent 9c57f52 commit b06fa48

File tree

4 files changed

+44
-45
lines changed

4 files changed

+44
-45
lines changed

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,12 @@
2929
#define DEFAULT_I2C_BUS_SCL (&pin_PA23)
3030
#define DEFAULT_I2C_BUS_SDA (&pin_PA22)
3131

32-
#define DEFAULT_SPI_BUS_SCK (&pin_PB11)
33-
#define DEFAULT_SPI_BUS_MOSI (&pin_PB10)
34-
#define DEFAULT_SPI_BUS_MISO (&pin_PB08)
32+
#define DEFAULT_SPI_BUS_SCK (&pin_PB10)
33+
#define DEFAULT_SPI_BUS_MOSI (&pin_PB08)
34+
#define DEFAULT_SPI_BUS_MISO (&pin_PB11)
3535

36-
#define DEFAULT_UART_BUS_RX (&pin_PB23)
37-
#define DEFAULT_UART_BUS_TX (&pin_PB22)
36+
#define DEFAULT_UART_BUS_RX (&pin_PB03)
37+
#define DEFAULT_UART_BUS_TX (&pin_PB02)
3838

3939
// USB is always used internally so skip the pin objects for it.
4040
#define IGNORE_PIN_PA24 1

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
#define CIRCUITPY_MCU_FAMILY samd51
55

6-
#define MICROPY_HW_LED_STATUS (&pin_PA21)
6+
#define MICROPY_HW_LED_STATUS (&pin_PB22)
77

88
// Salae reads 12mhz which is the limit even though we set it to the safer 8mhz.
99
#define SPI_FLASH_BAUDRATE (8000000)
@@ -32,9 +32,9 @@
3232
#define DEFAULT_I2C_BUS_SCL (&pin_PA23)
3333
#define DEFAULT_I2C_BUS_SDA (&pin_PA22)
3434

35-
#define DEFAULT_SPI_BUS_SCK (&pin_PB11)
36-
#define DEFAULT_SPI_BUS_MOSI (&pin_PB10)
37-
#define DEFAULT_SPI_BUS_MISO (&pin_PB08)
35+
#define DEFAULT_SPI_BUS_SCK (&pin_PB10)
36+
#define DEFAULT_SPI_BUS_MOSI (&pin_PB08)
37+
#define DEFAULT_SPI_BUS_MISO (&pin_PB11)
3838

3939
#define DEFAULT_UART_BUS_RX (&pin_PB03)
4040
#define DEFAULT_UART_BUS_TX (&pin_PB02)

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ EXTERNAL_FLASH_DEVICE_COUNT = 1
1414
EXTERNAL_FLASH_DEVICES = "W25Q64JV_IQ"
1515
LONGINT_IMPL = MPZ
1616

17-
1817
CIRCUITPY_PS2IO = 1
1918
# No I2S on SAMD51G
2019
CIRCUITPY_AUDIOBUSIO = 0

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

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

3-
// This mapping only includes functional names because pins broken
4-
// out on connectors are labeled with their MCU name available from
5-
// microcontroller.pin.
6-
STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
7-
// SERVO Pins
8-
{ MP_ROM_QSTR(MP_QSTR_SERVO1), MP_ROM_PTR(&pin_PA16) },
9-
{ MP_ROM_QSTR(MP_QSTR_SERVO2), MP_ROM_PTR(&pin_PA17) },
10-
{ MP_ROM_QSTR(MP_QSTR_SERVO3), MP_ROM_PTR(&pin_PA18) },
11-
{ MP_ROM_QSTR(MP_QSTR_SERVO4), MP_ROM_PTR(&pin_PA19) },
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) },
129
{ MP_ROM_QSTR(MP_QSTR_SERVO5), MP_ROM_PTR(&pin_PA11) },
1310
{ MP_ROM_QSTR(MP_QSTR_SERVO6), MP_ROM_PTR(&pin_PA10) },
1411
{ MP_ROM_QSTR(MP_QSTR_SERVO7), MP_ROM_PTR(&pin_PA09) },
1512
{ MP_ROM_QSTR(MP_QSTR_SERVO8), MP_ROM_PTR(&pin_PA08) },
1613

17-
// RCC (Radio Control Channel) Pins
14+
// RCC Pins
1815
{ MP_ROM_QSTR(MP_QSTR_RCC1), MP_ROM_PTR(&pin_PA07) },
1916
{ MP_ROM_QSTR(MP_QSTR_RCC2), MP_ROM_PTR(&pin_PA06) },
2017
{ MP_ROM_QSTR(MP_QSTR_RCC3), MP_ROM_PTR(&pin_PA05) },
2118
{ MP_ROM_QSTR(MP_QSTR_RCC4), MP_ROM_PTR(&pin_PA04) },
2219

2320
// Special Function
21+
{ MP_ROM_QSTR(MP_QSTR_VOLTAGE_MONITOR), MP_ROM_PTR(&pin_PA02) },
2422
{ MP_ROM_QSTR(MP_QSTR_BATTERY), MP_ROM_PTR(&pin_PA02) },
2523
{ 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) },
2625
{ 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) },
2727

28-
{ MP_ROM_QSTR(MP_QSTR_NEOPIXEL), MP_ROM_PTR(&pin_PA20) },
29-
{ MP_ROM_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_PA21) },
28+
{ MP_ROM_QSTR(MP_QSTR_NEOPIXEL), MP_ROM_PTR(&pin_PB23) },
29+
{ MP_ROM_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_PB22) },
3030
{ MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_PA22) },
3131
{ MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_PA23) },
3232
{ MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_PB02) },
3333
{ MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_PB03) },
3434

35-
// GROVE on SERCOM0
36-
{ MP_ROM_QSTR(MP_QSTR_GROVE_SCL), MP_ROM_PTR(&pin_PA09) },
37-
{ MP_ROM_QSTR(MP_QSTR_GROVE_SDA), MP_ROM_PTR(&pin_PA08) },
38-
{ MP_ROM_QSTR(MP_QSTR_GROVE_RX), MP_ROM_PTR(&pin_PA09) },
39-
{ MP_ROM_QSTR(MP_QSTR_GROVE_TX), MP_ROM_PTR(&pin_PA08) },
40-
{ MP_ROM_QSTR(MP_QSTR_GROVE_D1), MP_ROM_PTR(&pin_PA09) },
41-
{ MP_ROM_QSTR(MP_QSTR_GROVE_D0), MP_ROM_PTR(&pin_PA08) },
42-
{ MP_ROM_QSTR(MP_QSTR_GROVE_A1), MP_ROM_PTR(&pin_PA09) },
43-
{ MP_ROM_QSTR(MP_QSTR_GROVE_A0), MP_ROM_PTR(&pin_PA08) },
44-
45-
// I2C on SERCOM1
46-
{ MP_ROM_QSTR(MP_QSTR_I2C_SDA), MP_ROM_PTR(&pin_PA00) },
47-
{ MP_ROM_QSTR(MP_QSTR_I2C_SCL), MP_ROM_PTR(&pin_PA01) },
35+
// UART on SERCOM0
36+
{ MP_ROM_QSTR(MP_QSTR_UART_TX), MP_ROM_PTR(&pin_PA04) },
37+
{ MP_ROM_QSTR(MP_QSTR_UART_RX), MP_ROM_PTR(&pin_PA05) },
38+
{ MP_ROM_QSTR(MP_QSTR_UART_CTS), MP_ROM_PTR(&pin_PA06) },
39+
{ MP_ROM_QSTR(MP_QSTR_UART_RTS), MP_ROM_PTR(&pin_PA07) },
4840

4941
// SPI Flash on SERCOM2
5042
{ MP_ROM_QSTR(MP_QSTR_FLASH_SCK), MP_ROM_PTR(&pin_PA13) },
5143
{ MP_ROM_QSTR(MP_QSTR_FLASH_MISO), MP_ROM_PTR(&pin_PA14) },
5244
{ MP_ROM_QSTR(MP_QSTR_FLASH_MOSI), MP_ROM_PTR(&pin_PA12) },
5345
{ MP_ROM_QSTR(MP_QSTR_FLASH_CS), MP_ROM_PTR(&pin_PA15) },
5446

47+
// I2C on SERCOM3
48+
{ MP_ROM_QSTR(MP_QSTR_SDA1), MP_ROM_PTR(&pin_PA00) },
49+
{ MP_ROM_QSTR(MP_QSTR_SCL1), MP_ROM_PTR(&pin_PA01) },
50+
5551
// SPI on SERCOM4
56-
{ MP_ROM_QSTR(MP_QSTR_SPI_SCK), MP_ROM_PTR(&pin_PB11) },
57-
{ MP_ROM_QSTR(MP_QSTR_SPI_MISO), MP_ROM_PTR(&pin_PB08) },
58-
{ MP_ROM_QSTR(MP_QSTR_SPI_MOSI), MP_ROM_PTR(&pin_PB10) },
59-
{ MP_ROM_QSTR(MP_QSTR_SPI_SS), MP_ROM_PTR(&pin_PB09) },
52+
{ MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_PB08) },
53+
{ MP_ROM_QSTR(MP_QSTR_SS), MP_ROM_PTR(&pin_PB09) },
54+
{ MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_PB10) },
55+
{ MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_PB11) },
6056

6157
// GPS on SERCOM5
6258
{ MP_ROM_QSTR(MP_QSTR_GPS_TX), MP_ROM_PTR(&pin_PB02) },
6359
{ MP_ROM_QSTR(MP_QSTR_GPS_RX), MP_ROM_PTR(&pin_PB03) },
64-
// GPS on SERCOM1
6560
{ MP_ROM_QSTR(MP_QSTR_GPS_SDA), MP_ROM_PTR(&pin_PA00) },
6661
{ MP_ROM_QSTR(MP_QSTR_GPS_SCL), MP_ROM_PTR(&pin_PA01) },
6762

6863
// Raspberry Pi
6964
{ MP_ROM_QSTR(MP_QSTR_PI_GP25), MP_ROM_PTR(&pin_PA30) },
65+
{ MP_ROM_QSTR(MP_QSTR_SWCLK), MP_ROM_PTR(&pin_PA30) },
7066
{ MP_ROM_QSTR(MP_QSTR_PI_GP24), MP_ROM_PTR(&pin_PA31) },
71-
{ MP_ROM_QSTR(MP_QSTR_PI_RX), MP_ROM_PTR(&pin_PB22) },
72-
{ MP_ROM_QSTR(MP_QSTR_PI_TX), MP_ROM_PTR(&pin_PB23) },
67+
{ MP_ROM_QSTR(MP_QSTR_SWDIO), MP_ROM_PTR(&pin_PA31) },
68+
{ MP_ROM_QSTR(MP_QSTR_TX1), MP_ROM_PTR(&pin_PA16) },
69+
{ MP_ROM_QSTR(MP_QSTR_PI_TX), MP_ROM_PTR(&pin_PA16) },
70+
{ MP_ROM_QSTR(MP_QSTR_RX1), MP_ROM_PTR(&pin_PA17) },
71+
{ MP_ROM_QSTR(MP_QSTR_PI_RX), MP_ROM_PTR(&pin_PA17) },
72+
7373

74-
{ MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) },
75-
{ MP_ROM_QSTR(MP_QSTR_SPI), MP_ROM_PTR(&board_spi_obj) },
76-
{ MP_ROM_QSTR(MP_QSTR_UART), MP_ROM_PTR(&board_uart_obj) },
74+
{ MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) },
75+
{ MP_ROM_QSTR(MP_QSTR_SPI), MP_ROM_PTR(&board_spi_obj) },
76+
{ MP_ROM_QSTR(MP_QSTR_UART), MP_ROM_PTR(&board_uart_obj) },
7777
};
7878
MP_DEFINE_CONST_DICT(board_module_globals, board_global_dict_table);

0 commit comments

Comments
 (0)