Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit76a2178

Browse files
committed
atmel-samd: Fix PA00 and PA01 sercoms. New CircuitPlayground prototype pinout.
1 parent1a86968 commit76a2178

File tree

2 files changed

+28
-16
lines changed

2 files changed

+28
-16
lines changed

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

Lines changed: 23 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,33 @@
11
#include"samd21_pins.h"
22

33
STATICconstmp_map_elem_tboard_global_dict_table[]= {
4-
{MP_OBJ_NEW_QSTR(MP_QSTR_D10), (mp_obj_t)&pin_PA06 },
5-
{MP_OBJ_NEW_QSTR(MP_QSTR_D9), (mp_obj_t)&pin_PA07 },
6-
{MP_OBJ_NEW_QSTR(MP_QSTR_D6), (mp_obj_t)&pin_PA04 },
7-
{MP_OBJ_NEW_QSTR(MP_QSTR_D12), (mp_obj_t)&pin_PA05 },
8-
9-
{MP_OBJ_NEW_QSTR(MP_QSTR_D0), (mp_obj_t)&pin_PB09 },
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 },
1022
//{ MP_OBJ_NEW_QSTR(MP_QSTR_RX), (mp_obj_t)&pin_PA11 },
11-
{MP_OBJ_NEW_QSTR(MP_QSTR_D1), (mp_obj_t)&pin_PB08 },
23+
{MP_OBJ_NEW_QSTR(MP_QSTR_A7), (mp_obj_t)&pin_PB08 },
1224
//{ MP_OBJ_NEW_QSTR(MP_QSTR_TX), (mp_obj_t)&pin_PA10 },
1325

1426
{MP_OBJ_NEW_QSTR(MP_QSTR_NEOPIXEL), (mp_obj_t)&pin_PB23 },
1527

1628
{MP_OBJ_NEW_QSTR(MP_QSTR_MICROPHONE), (mp_obj_t)&pin_PA08 },
1729

18-
{MP_OBJ_NEW_QSTR(MP_QSTR_ACCELEROMETER_INTERRUPT), (mp_obj_t)&pin_PA10 },
30+
{MP_OBJ_NEW_QSTR(MP_QSTR_ACCELEROMETER_INTERRUPT), (mp_obj_t)&pin_PA09 },
1931
{MP_OBJ_NEW_QSTR(MP_QSTR_ACCELEROMETER_SDA), (mp_obj_t)&pin_PA00 },
2032
{MP_OBJ_NEW_QSTR(MP_QSTR_ACCELEROMETER_SCL), (mp_obj_t)&pin_PA01 },
2133

@@ -25,13 +37,13 @@ STATIC const mp_map_elem_t board_global_dict_table[] = {
2537
{MP_OBJ_NEW_QSTR(MP_QSTR_SLIDE_SWITCH), (mp_obj_t)&pin_PA15 },
2638
{MP_OBJ_NEW_QSTR(MP_QSTR_SPEAKER), (mp_obj_t)&pin_PA02 },
2739
{MP_OBJ_NEW_QSTR(MP_QSTR_LIGHT), (mp_obj_t)&pin_PA11 },
28-
{MP_OBJ_NEW_QSTR(MP_QSTR_TEMPERATURE), (mp_obj_t)&pin_PA09 },
40+
{MP_OBJ_NEW_QSTR(MP_QSTR_TEMPERATURE), (mp_obj_t)&pin_PA10 },
2941

3042
{MP_OBJ_NEW_QSTR(MP_QSTR_D13), (mp_obj_t)&pin_PA17 },
3143
{MP_OBJ_NEW_QSTR(MP_QSTR_SDA), (mp_obj_t)&pin_PB02 },
32-
{MP_OBJ_NEW_QSTR(MP_QSTR_D2), (mp_obj_t)&pin_PB02 },
44+
{MP_OBJ_NEW_QSTR(MP_QSTR_A5), (mp_obj_t)&pin_PB02 },
3345
{MP_OBJ_NEW_QSTR(MP_QSTR_SCL), (mp_obj_t)&pin_PB03 },
34-
{MP_OBJ_NEW_QSTR(MP_QSTR_D3), (mp_obj_t)&pin_PB03 },
46+
{MP_OBJ_NEW_QSTR(MP_QSTR_A4), (mp_obj_t)&pin_PB03 },
3547
{MP_OBJ_NEW_QSTR(MP_QSTR_SCK), (mp_obj_t)&pin_PB11 },
3648
{MP_OBJ_NEW_QSTR(MP_QSTR_MOSI), (mp_obj_t)&pin_PB10 },
3749
{MP_OBJ_NEW_QSTR(MP_QSTR_MISO), (mp_obj_t)&pin_PA12 },

‎atmel-samd/samd21_pins.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -73,15 +73,15 @@ void reset_pin(uint8_t pin) {
7373
PIN(PA00,NO_ADC,NO_TOUCH,
7474
TCC(TCC2,0,0),
7575
NO_TIMER,
76-
SERCOM(SERCOM1,0),
77-
NO_SERCOM);
76+
NO_SERCOM,
77+
SERCOM(SERCOM1,0));
7878
#endif
7979
#ifdefPIN_PA01
8080
PIN(PA01,NO_ADC,NO_TOUCH,
8181
TCC(TCC2,1,1),
8282
NO_TIMER,
83-
SERCOM(SERCOM1,1),
84-
NO_SERCOM);
83+
NO_SERCOM,
84+
SERCOM(SERCOM1,1));
8585
#endif
8686
#ifdefPIN_PA02
8787
PIN(PA02,ADC_INPUT(ADC_POSITIVE_INPUT_PIN0),TOUCH(0),
@@ -168,7 +168,7 @@ PIN(PA07, ADC_INPUT(ADC_POSITIVE_INPUT_PIN7), TOUCH(5),
168168
NO_SERCOM);
169169
#endif
170170
#ifdefPIN_PA08
171-
PIN(PA08,ADC_INPUT(ADC_POSITIVE_INPUT_PIN17),NO_TOUCH,
171+
PIN(PA08,ADC_INPUT(ADC_POSITIVE_INPUT_PIN16),NO_TOUCH,
172172
TCC(TCC0,0,0),
173173
TCC(TCC1,2,2),
174174
SERCOM(SERCOM0,0),

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp