Skip to content

Commit 8505de1

Browse files
tannewttannewt
committed
atmel-samd: rename cplay_m0_flash to circuitplayground_express and update for new rev (F).
1 parent 45dfaa8 commit 8505de1

12 files changed

Lines changed: 97 additions & 56 deletions

File tree

‎.travis.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ script:
3636
- make -C atmel-samd BOARD=feather_m0_basic
3737
- make -C atmel-samd BOARD=feather_m0_express
3838
- make -C atmel-samd BOARD=metro_m0_flash
39-
- make -C atmel-samd BOARD=cplay_m0_flash
39+
- make -C atmel-samd BOARD=circuitplayground_express
4040
- make -C atmel-samd BOARD=trinket_m0
4141
- make -C atmel-samd BOARD=gemma_m0
4242
- make -C minimal CROSS=1 build/firmware.bin

atmel-samd/boards/cplay_m0_flash/conf_access.h renamed to atmel-samd/boards/circuitplayground_express/conf_access.h

File renamed without changes.

atmel-samd/boards/cplay_m0_flash/conf_board.h renamed to atmel-samd/boards/circuitplayground_express/conf_board.h

File renamed without changes.

atmel-samd/boards/cplay_m0_flash/conf_clocks.h renamed to atmel-samd/boards/circuitplayground_express/conf_clocks.h

File renamed without changes.

atmel-samd/boards/cplay_m0_flash/conf_usb.h renamed to atmel-samd/boards/circuitplayground_express/conf_usb.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
#endif
2020

2121
#ifndef USB_DEVICE_PRODUCT_NAME
22-
# define USB_DEVICE_PRODUCT_NAME "Circuit Playground M0 (Experimental)"
22+
# define USB_DEVICE_PRODUCT_NAME "CircuitPlayground Express"
2323
#endif
2424
// #define USB_DEVICE_SERIAL_NAME "12...EF"
2525
#define USB_DEVICE_GET_SERIAL_NAME_POINTER serial_number

atmel-samd/boards/cplay_m0_flash/init.c renamed to atmel-samd/boards/circuitplayground_express/init.c

File renamed without changes.

atmel-samd/boards/cplay_m0_flash/mpconfigboard.h renamed to atmel-samd/boards/circuitplayground_express/mpconfigboard.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#define USB_REPL
22

3-
#define MICROPY_HW_BOARD_NAME "Adafruit Circuit Playground M0 (Experimental)"
3+
#define MICROPY_HW_BOARD_NAME "Adafruit CircuitPlayground Express"
44
#define MICROPY_HW_MCU_NAME "samd21g18"
55

66
//#define MICROPY_HW_LED_MSC PIN_PA17

atmel-samd/boards/cplay_m0_flash/mpconfigboard.mk renamed to atmel-samd/boards/circuitplayground_express/mpconfigboard.mk

File renamed without changes.

‎atmel-samd/boards/circuitplayground_express/pins.c‎

Lines changed: 93 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,93 @@
1+
#include "samd21_pins.h"
2+
3+
// STATIC const mp_map_elem_t board_global_dict_table[] = {
4+
// // Rev C
5+
// // { MP_OBJ_NEW_QSTR(MP_QSTR_D10), (mp_obj_t)&pin_PA06 },
6+
// // { MP_OBJ_NEW_QSTR(MP_QSTR_D9), (mp_obj_t)&pin_PA07 },
7+
// // { MP_OBJ_NEW_QSTR(MP_QSTR_D6), (mp_obj_t)&pin_PA04 },
8+
// // { MP_OBJ_NEW_QSTR(MP_QSTR_D12), (mp_obj_t)&pin_PA05 },
9+
// //
10+
// // { MP_OBJ_NEW_QSTR(MP_QSTR_D0), (mp_obj_t)&pin_PB09 },
11+
// // //{ MP_OBJ_NEW_QSTR(MP_QSTR_RX), (mp_obj_t)&pin_PA11 },
12+
// // { MP_OBJ_NEW_QSTR(MP_QSTR_D1), (mp_obj_t)&pin_PB08 },
13+
// // //{ MP_OBJ_NEW_QSTR(MP_QSTR_TX), (mp_obj_t)&pin_PA10 },
14+
//
15+
// // Rev D
16+
// { MP_OBJ_NEW_QSTR(MP_QSTR_A11), (mp_obj_t)&pin_PA06 },
17+
// { MP_OBJ_NEW_QSTR(MP_QSTR_A10), (mp_obj_t)&pin_PA07 },
18+
// { MP_OBJ_NEW_QSTR(MP_QSTR_A9), (mp_obj_t)&pin_PA04 },
19+
// { MP_OBJ_NEW_QSTR(MP_QSTR_A8), (mp_obj_t)&pin_PA05 },
20+
//
21+
// { MP_OBJ_NEW_QSTR(MP_QSTR_A6), (mp_obj_t)&pin_PB09 },
22+
// //{ MP_OBJ_NEW_QSTR(MP_QSTR_RX), (mp_obj_t)&pin_PA11 },
23+
// { MP_OBJ_NEW_QSTR(MP_QSTR_A7), (mp_obj_t)&pin_PB08 },
24+
// //{ MP_OBJ_NEW_QSTR(MP_QSTR_TX), (mp_obj_t)&pin_PA10 },
25+
//
26+
// { MP_OBJ_NEW_QSTR(MP_QSTR_NEOPIXEL), (mp_obj_t)&pin_PB23 },
27+
//
28+
// { MP_OBJ_NEW_QSTR(MP_QSTR_MICROPHONE), (mp_obj_t)&pin_PA08 },
29+
//
30+
// { MP_OBJ_NEW_QSTR(MP_QSTR_ACCELEROMETER_INTERRUPT), (mp_obj_t)&pin_PA09 },
31+
// { MP_OBJ_NEW_QSTR(MP_QSTR_ACCELEROMETER_SDA), (mp_obj_t)&pin_PA00 },
32+
// { MP_OBJ_NEW_QSTR(MP_QSTR_ACCELEROMETER_SCL), (mp_obj_t)&pin_PA01 },
33+
//
34+
// { MP_OBJ_NEW_QSTR(MP_QSTR_LEFT_BUTTON), (mp_obj_t)&pin_PA28 },
35+
// { MP_OBJ_NEW_QSTR(MP_QSTR_RIGHT_BUTTON), (mp_obj_t)&pin_PA14 },
36+
//
37+
// { MP_OBJ_NEW_QSTR(MP_QSTR_SLIDE_SWITCH), (mp_obj_t)&pin_PA15 },
38+
// { MP_OBJ_NEW_QSTR(MP_QSTR_SPEAKER), (mp_obj_t)&pin_PA02 },
39+
// { MP_OBJ_NEW_QSTR(MP_QSTR_LIGHT), (mp_obj_t)&pin_PA11 },
40+
// { MP_OBJ_NEW_QSTR(MP_QSTR_TEMPERATURE), (mp_obj_t)&pin_PA10 },
41+
//
42+
// { MP_OBJ_NEW_QSTR(MP_QSTR_D13), (mp_obj_t)&pin_PA17 },
43+
// { MP_OBJ_NEW_QSTR(MP_QSTR_SDA), (mp_obj_t)&pin_PB02 },
44+
// { MP_OBJ_NEW_QSTR(MP_QSTR_A5), (mp_obj_t)&pin_PB02 },
45+
// { MP_OBJ_NEW_QSTR(MP_QSTR_SCL), (mp_obj_t)&pin_PB03 },
46+
// { MP_OBJ_NEW_QSTR(MP_QSTR_A4), (mp_obj_t)&pin_PB03 },
47+
// { MP_OBJ_NEW_QSTR(MP_QSTR_SCK), (mp_obj_t)&pin_PB11 },
48+
// { MP_OBJ_NEW_QSTR(MP_QSTR_MOSI), (mp_obj_t)&pin_PB10 },
49+
// { MP_OBJ_NEW_QSTR(MP_QSTR_MISO), (mp_obj_t)&pin_PA12 },
50+
// { MP_OBJ_NEW_QSTR(MP_QSTR_FLASH_CS), (mp_obj_t)&pin_PB22 },
51+
// };
52+
53+
// Rev F
54+
STATIC const mp_map_elem_t board_global_dict_table[] = {
55+
{ MP_OBJ_NEW_QSTR(MP_QSTR_A11), (mp_obj_t)&pin_PA06 },
56+
{ MP_OBJ_NEW_QSTR(MP_QSTR_A10), (mp_obj_t)&pin_PA07 },
57+
{ MP_OBJ_NEW_QSTR(MP_QSTR_A9), (mp_obj_t)&pin_PA04 },
58+
{ MP_OBJ_NEW_QSTR(MP_QSTR_A8), (mp_obj_t)&pin_PA05 },
59+
60+
{ MP_OBJ_NEW_QSTR(MP_QSTR_A6), (mp_obj_t)&pin_PB09 },
61+
{ MP_OBJ_NEW_QSTR(MP_QSTR_A7), (mp_obj_t)&pin_PB08 },
62+
63+
{ MP_OBJ_NEW_QSTR(MP_QSTR_REMOTEIN), (mp_obj_t)&pin_PA12 },
64+
{ MP_OBJ_NEW_QSTR(MP_QSTR_REMOTEOUT), (mp_obj_t)&pin_PA23 },
65+
66+
{ MP_OBJ_NEW_QSTR(MP_QSTR_NEOPIXEL), (mp_obj_t)&pin_PB23 },
67+
68+
{ MP_OBJ_NEW_QSTR(MP_QSTR_MICROPHONE_SCK), (mp_obj_t)&pin_PA10 },
69+
{ MP_OBJ_NEW_QSTR(MP_QSTR_MICROPHONE_DO), (mp_obj_t)&pin_PA08 },
70+
71+
{ MP_OBJ_NEW_QSTR(MP_QSTR_ACCELEROMETER_INTERRUPT), (mp_obj_t)&pin_PA13 },
72+
{ MP_OBJ_NEW_QSTR(MP_QSTR_ACCELEROMETER_SDA), (mp_obj_t)&pin_PA00 },
73+
{ MP_OBJ_NEW_QSTR(MP_QSTR_ACCELEROMETER_SCL), (mp_obj_t)&pin_PA01 },
74+
75+
{ MP_OBJ_NEW_QSTR(MP_QSTR_LEFT_BUTTON), (mp_obj_t)&pin_PA28 },
76+
{ MP_OBJ_NEW_QSTR(MP_QSTR_RIGHT_BUTTON), (mp_obj_t)&pin_PA14 },
77+
78+
{ MP_OBJ_NEW_QSTR(MP_QSTR_SLIDE_SWITCH), (mp_obj_t)&pin_PA15 },
79+
{ MP_OBJ_NEW_QSTR(MP_QSTR_SPEAKER), (mp_obj_t)&pin_PA02 },
80+
{ MP_OBJ_NEW_QSTR(MP_QSTR_LIGHT), (mp_obj_t)&pin_PA11 },
81+
{ MP_OBJ_NEW_QSTR(MP_QSTR_TEMPERATURE), (mp_obj_t)&pin_PA09 },
82+
83+
{ MP_OBJ_NEW_QSTR(MP_QSTR_D13), (mp_obj_t)&pin_PA17 },
84+
{ MP_OBJ_NEW_QSTR(MP_QSTR_SDA), (mp_obj_t)&pin_PB02 },
85+
{ MP_OBJ_NEW_QSTR(MP_QSTR_A5), (mp_obj_t)&pin_PB02 },
86+
{ MP_OBJ_NEW_QSTR(MP_QSTR_SCL), (mp_obj_t)&pin_PB03 },
87+
{ MP_OBJ_NEW_QSTR(MP_QSTR_A4), (mp_obj_t)&pin_PB03 },
88+
{ MP_OBJ_NEW_QSTR(MP_QSTR_SCK), (mp_obj_t)&pin_PA21 },
89+
{ MP_OBJ_NEW_QSTR(MP_QSTR_MOSI), (mp_obj_t)&pin_PA20 },
90+
{ MP_OBJ_NEW_QSTR(MP_QSTR_MISO), (mp_obj_t)&pin_PA16 },
91+
{ MP_OBJ_NEW_QSTR(MP_QSTR_FLASH_CS), (mp_obj_t)&pin_PB22 },
92+
};
93+
MP_DEFINE_CONST_DICT(board_module_globals, board_global_dict_table);

atmel-samd/boards/cplay_m0_flash/touch.h renamed to atmel-samd/boards/circuitplayground_express/touch.h

File renamed without changes.

0 commit comments

Comments
 (0)