summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorScott Shawcroft <scott.shawcroft@gmail.com>2017-01-08 22:11:27 -0800
committerScott Shawcroft <scott.shawcroft@gmail.com>2017-01-08 22:11:27 -0800
commit24765929ea6babc9b24ae096c28e74bbf23da3ec (patch)
tree560e353905012044ae87a3eafbc2d46f5c6dc013
parent161ab018ba0d30d958d449de5a4ce2bcf1a9c426 (diff)
atmel-samd: Update pinouts for prototypes.
-rw-r--r--atmel-samd/boards/gemma_m0/pins.c8
-rw-r--r--atmel-samd/boards/metro_m0_flash/mpconfigboard.mk2
-rw-r--r--atmel-samd/boards/trinket_m0/mpconfigboard.h6
-rw-r--r--atmel-samd/boards/trinket_m0/pins.c12
4 files changed, 14 insertions, 14 deletions
diff --git a/atmel-samd/boards/gemma_m0/pins.c b/atmel-samd/boards/gemma_m0/pins.c
index de7c4abcd..ec78b9b1e 100644
--- a/atmel-samd/boards/gemma_m0/pins.c
+++ b/atmel-samd/boards/gemma_m0/pins.c
@@ -1,9 +1,9 @@
#include "samd21_pins.h"
STATIC const mp_map_elem_t board_global_dict_table[] = {
- { MP_OBJ_NEW_QSTR(MP_QSTR_A0), (mp_obj_t)&pin_PA02 },
- { MP_OBJ_NEW_QSTR(MP_QSTR_D3), (mp_obj_t)&pin_PA09 },
- { MP_OBJ_NEW_QSTR(MP_QSTR_D4), (mp_obj_t)&pin_PA08 },
- { MP_OBJ_NEW_QSTR(MP_QSTR_D13), (mp_obj_t)&pin_PA17 },
+ { MP_OBJ_NEW_QSTR(MP_QSTR_A0), (mp_obj_t)&pin_PA02 },
+ { MP_OBJ_NEW_QSTR(MP_QSTR_D1), (mp_obj_t)&pin_PA02 },
+ { MP_OBJ_NEW_QSTR(MP_QSTR_D2), (mp_obj_t)&pin_PA09 },
+ { MP_OBJ_NEW_QSTR(MP_QSTR_D0), (mp_obj_t)&pin_PA08 },
};
MP_DEFINE_CONST_DICT(board_module_globals, board_global_dict_table);
diff --git a/atmel-samd/boards/metro_m0_flash/mpconfigboard.mk b/atmel-samd/boards/metro_m0_flash/mpconfigboard.mk
index 4b508957d..8b6d61bbb 100644
--- a/atmel-samd/boards/metro_m0_flash/mpconfigboard.mk
+++ b/atmel-samd/boards/metro_m0_flash/mpconfigboard.mk
@@ -1,4 +1,4 @@
-LD_FILE = boards/samd21x18-external-flash.ld
+LD_FILE = boards/samd21x18-bootloader-external-flash.ld
USB_VID = 0x239A
USB_PID = 0x8015
diff --git a/atmel-samd/boards/trinket_m0/mpconfigboard.h b/atmel-samd/boards/trinket_m0/mpconfigboard.h
index f27044173..35c7cceeb 100644
--- a/atmel-samd/boards/trinket_m0/mpconfigboard.h
+++ b/atmel-samd/boards/trinket_m0/mpconfigboard.h
@@ -3,10 +3,10 @@
#define MICROPY_HW_BOARD_NAME "Adafruit Trinket M0 (Experimental)"
#define MICROPY_HW_MCU_NAME "samd21e18"
-#define MICROPY_HW_APA102_MOSI &pin_PA04
-#define MICROPY_HW_APA102_SCK &pin_PA05
+#define MICROPY_HW_APA102_MOSI &pin_PA01
+#define MICROPY_HW_APA102_SCK &pin_PA00
-#define MICROPY_PORT_A (PORT_PA04 | PORT_PA05 | PORT_PA24 | PORT_PA25)
+#define MICROPY_PORT_A (PORT_PA00 | PORT_PA01 | PORT_PA24 | PORT_PA25)
#define MICROPY_PORT_B (0)
#define AUTORESET_DELAY_MS 500
diff --git a/atmel-samd/boards/trinket_m0/pins.c b/atmel-samd/boards/trinket_m0/pins.c
index 41f1dd0e3..348c8cb95 100644
--- a/atmel-samd/boards/trinket_m0/pins.c
+++ b/atmel-samd/boards/trinket_m0/pins.c
@@ -1,11 +1,11 @@
#include "samd21_pins.h"
STATIC const mp_map_elem_t board_global_dict_table[] = {
- { MP_OBJ_NEW_QSTR(MP_QSTR_A0), (mp_obj_t)&pin_PA02 },
- { MP_OBJ_NEW_QSTR(MP_QSTR_D0), (mp_obj_t)&pin_PA11 },
- { MP_OBJ_NEW_QSTR(MP_QSTR_D1), (mp_obj_t)&pin_PA10 },
- { MP_OBJ_NEW_QSTR(MP_QSTR_D3), (mp_obj_t)&pin_PA09 },
- { MP_OBJ_NEW_QSTR(MP_QSTR_D4), (mp_obj_t)&pin_PA08 },
- { MP_OBJ_NEW_QSTR(MP_QSTR_D13),(mp_obj_t)&pin_PA17 },
+ { MP_OBJ_NEW_QSTR(MP_QSTR_D0), (mp_obj_t)&pin_PA04 },
+ { MP_OBJ_NEW_QSTR(MP_QSTR_D1), (mp_obj_t)&pin_PA02 },
+ { MP_OBJ_NEW_QSTR(MP_QSTR_D2), (mp_obj_t)&pin_PA05 },
+ { MP_OBJ_NEW_QSTR(MP_QSTR_D4), (mp_obj_t)&pin_PA06 },
+ { MP_OBJ_NEW_QSTR(MP_QSTR_D3), (mp_obj_t)&pin_PA07 },
+ { MP_OBJ_NEW_QSTR(MP_QSTR_D13),(mp_obj_t)&pin_PA10 },
};
MP_DEFINE_CONST_DICT(board_module_globals, board_global_dict_table);