Skip to content

Commit de885e8

Browse files
author
Matt Land
committed
Merge branch 'feature-i2c-gemma' into feature-default-spi-circuit-playground
2 parents 3144654 + 8a35159 commit de885e8

File tree

18 files changed

+41
-25
lines changed

18 files changed

+41
-25
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313

1414
#define BOARD_FLASH_SIZE (0x00040000 - 0x2000 - 0x010000)
1515

16-
#define DEFAULT_I2C_BUS_SCL (&pin_PB03)
17-
#define DEFAULT_I2C_BUS_SDA (&pin_PB02)
16+
#define DEFAULT_I2C_BUS_SCL (&pin_PA22)
17+
#define DEFAULT_I2C_BUS_SDA (&pin_PA23)
1818

1919
#define DEFAULT_SPI_BUS_SCK (&pin_PB11)
2020
#define DEFAULT_SPI_BUS_MOSI (&pin_PB10)

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414

1515
#define BOARD_FLASH_SIZE (0x00040000 - 0x2000 - 0x010000)
1616

17-
#define DEFAULT_I2C_BUS_SCL (&pin_PB03)
18-
#define DEFAULT_I2C_BUS_SDA (&pin_PB02)
17+
#define DEFAULT_I2C_BUS_SCL (&pin_PA23)
18+
#define DEFAULT_I2C_BUS_SDA (&pin_PA22)
1919

2020
#define DEFAULT_SPI_BUS_SCK (&pin_PB11)
2121
#define DEFAULT_SPI_BUS_MOSI (&pin_PB10)

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@
4949

5050
#define BOARD_HAS_CRYSTAL 1
5151

52-
#define DEFAULT_I2C_BUS_SCL (&pin_PB03)
53-
#define DEFAULT_I2C_BUS_SDA (&pin_PB02)
52+
#define DEFAULT_I2C_BUS_SCL (&pin_PA23)
53+
#define DEFAULT_I2C_BUS_SDA (&pin_PA22)
5454

5555
#define DEFAULT_SPI_BUS_SCK (&pin_PB11)
5656
#define DEFAULT_SPI_BUS_MOSI (&pin_PB10)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,4 @@
2121

2222
#define DEFAULT_SPI_BUS_SCK (&pin_PB11)
2323
#define DEFAULT_SPI_BUS_MOSI (&pin_PB10)
24-
#define DEFAULT_SPI_BUS_MISO (&pin_PA12)
24+
#define DEFAULT_SPI_BUS_MISO (&pin_PA12)

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,9 @@
4848

4949
#include "external_flash/external_flash.h"
5050

51-
#define DEFAULT_I2C_BUS_SCL (&pin_PB03)
52-
#define DEFAULT_I2C_BUS_SDA (&pin_PB02)
51+
#define DEFAULT_I2C_BUS_SCL (&pin_PA23)
52+
#define DEFAULT_I2C_BUS_SDA (&pin_PA22)
5353

5454
#define DEFAULT_SPI_BUS_SCK (&pin_PB11)
5555
#define DEFAULT_SPI_BUS_MOSI (&pin_PB10)
56-
#define DEFAULT_SPI_BUS_MISO (&pin_PA12)
56+
#define DEFAULT_SPI_BUS_MISO (&pin_PA12)

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,9 @@
3232

3333
#include "external_flash/external_flash.h"
3434

35+
#define DEFAULT_I2C_BUS_SCL (&pin_PA13)
36+
#define DEFAULT_I2C_BUS_SDA (&pin_PA12)
37+
3538
#define DEFAULT_SPI_BUS_SCK (&pin_PA17)
3639
#define DEFAULT_SPI_BUS_MOSI (&pin_PA19)
37-
#define DEFAULT_SPI_BUS_MISO (&pin_PA18)
40+
#define DEFAULT_SPI_BUS_MISO (&pin_PA18)

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#include "samd21_pins.h"
2+
#include "board_busses.h"
23

34
STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
45
{ MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_PA02) },
@@ -26,6 +27,7 @@ STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
2627
{ MP_ROM_QSTR(MP_QSTR_D12), MP_ROM_PTR(&pin_PA22) },
2728
{ MP_ROM_QSTR(MP_QSTR_D13), MP_ROM_PTR(&pin_PA23) },
2829
{ MP_ROM_QSTR(MP_QSTR_NEOPIXEL), MP_ROM_PTR(&pin_PB23) },
30+
{ MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) },
2931
{ MP_ROM_QSTR(MP_QSTR_SPI), MP_ROM_PTR(&board_spi_obj) },
3032
};
3133
MP_DEFINE_CONST_DICT(board_module_globals, board_global_dict_table);

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,9 @@
4747

4848
#include "external_flash/external_flash.h"
4949

50+
#define DEFAULT_I2C_BUS_SCL (&pin_PA23)
51+
#define DEFAULT_I2C_BUS_SDA (&pin_PA22)
52+
5053
#define DEFAULT_SPI_BUS_SCK (&pin_PB11)
5154
#define DEFAULT_SPI_BUS_MOSI (&pin_PB10)
52-
#define DEFAULT_SPI_BUS_MISO (&pin_PA12)
55+
#define DEFAULT_SPI_BUS_MISO (&pin_PA12)

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#include "samd21_pins.h"
2+
#include "board_busses.h"
23

34
STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
45
{ MP_ROM_QSTR(MP_QSTR_D0), MP_ROM_PTR(&pin_PA11) },
@@ -38,7 +39,7 @@ STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
3839

3940
{ MP_ROM_QSTR(MP_QSTR_APA102_MOSI), MP_ROM_PTR(&pin_PA01) },
4041
{ MP_ROM_QSTR(MP_QSTR_APA102_SCK), MP_ROM_PTR(&pin_PA00) },
41-
42+
{ MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) },
4243
{ MP_ROM_QSTR(MP_QSTR_SPI), MP_ROM_PTR(&board_spi_obj) },
4344
};
4445
MP_DEFINE_CONST_DICT(board_module_globals, board_global_dict_table);

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,9 @@
3232

3333
#include "external_flash/external_flash.h"
3434

35+
#define DEFAULT_I2C_BUS_SCL (&pin_PA13)
36+
#define DEFAULT_I2C_BUS_SDA (&pin_PA12)
37+
3538
#define DEFAULT_SPI_BUS_SCK (&pin_PA01)
3639
#define DEFAULT_SPI_BUS_MOSI (&pin_PA00)
37-
#define DEFAULT_SPI_BUS_MISO (&pin_PB23)
40+
#define DEFAULT_SPI_BUS_MISO (&pin_PB23)

0 commit comments

Comments
 (0)