Skip to content

Commit caf51cf

Browse files
deshipudeshipu
committed
Add default devices and tweak brightness in boards/pewpew10
1 parent 186e315 commit caf51cf

4 files changed

Lines changed: 41 additions & 5 deletions

File tree

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

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,3 +32,19 @@
3232
#define IGNORE_PIN_PB23 1
3333
#define IGNORE_PIN_PB30 1
3434
#define IGNORE_PIN_PB31 1
35+
36+
// USB is always used internally so skip the pin objects for it.
37+
#define IGNORE_PIN_PA24 1
38+
#define IGNORE_PIN_PA25 1
39+
40+
// Default protocol pins.
41+
42+
#define DEFAULT_I2C_BUS_SCL (&pin_PA01)
43+
#define DEFAULT_I2C_BUS_SDA (&pin_PA00)
44+
45+
#define DEFAULT_SPI_BUS_SCK (&pin_PA31)
46+
#define DEFAULT_SPI_BUS_MOSI (&pin_PA30)
47+
#define DEFAULT_SPI_BUS_MISO (&pin_PA04)
48+
49+
#define DEFAULT_UART_BUS_RX (&pin_PA01)
50+
#define DEFAULT_UART_BUS_TX (&pin_PA00)

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

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
#include "supervisor/shared/board_busses.h"
44

55
STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
6+
// Pins for internal use.
67
{ MP_ROM_QSTR(MP_QSTR__R1), MP_ROM_PTR(&pin_PA05) },
78
{ MP_ROM_QSTR(MP_QSTR__R2), MP_ROM_PTR(&pin_PA11) },
89
{ MP_ROM_QSTR(MP_QSTR__R3), MP_ROM_PTR(&pin_PA28) },
@@ -21,6 +22,9 @@ STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
2122
{ MP_ROM_QSTR(MP_QSTR__C2), MP_ROM_PTR(&pin_PA14) },
2223
{ MP_ROM_QSTR(MP_QSTR__C1), MP_ROM_PTR(&pin_PA15) },
2324

25+
{ MP_ROM_QSTR(MP_QSTR__BUTTONS), MP_ROM_PTR(&pin_PA08) },
26+
27+
// User pins.
2428
{ MP_ROM_QSTR(MP_QSTR_P1), MP_ROM_PTR(&pin_PA30) },
2529
{ MP_ROM_QSTR(MP_QSTR_P2), MP_ROM_PTR(&pin_PA31) },
2630
{ MP_ROM_QSTR(MP_QSTR_P3), MP_ROM_PTR(&pin_PA00) },
@@ -29,7 +33,21 @@ STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
2933
{ MP_ROM_QSTR(MP_QSTR_P6), MP_ROM_PTR(&pin_PA03) },
3034
{ MP_ROM_QSTR(MP_QSTR_P7), MP_ROM_PTR(&pin_PA04) },
3135

32-
{ MP_ROM_QSTR(MP_QSTR__BUTTONS), MP_ROM_PTR(&pin_PA08) },
36+
// Protocol aliases.
37+
{ MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_PA00) },
38+
{ MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_PA01) },
39+
40+
{ MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_PA00) },
41+
{ MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_PA01) },
42+
43+
{ MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_PA04) },
44+
{ MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_PA30) },
45+
{ MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_PA31) },
46+
47+
{ MP_ROM_QSTR(MP_QSTR_DAC), MP_ROM_PTR(&pin_PA02) },
3348

49+
{ MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) },
50+
{ MP_ROM_QSTR(MP_QSTR_SPI), MP_ROM_PTR(&board_spi_obj) },
51+
{ MP_ROM_QSTR(MP_QSTR_UART), MP_ROM_PTR(&board_uart_obj) },
3452
};
3553
MP_DEFINE_CONST_DICT(board_module_globals, board_global_dict_table);

‎shared-module/_pew/PewPew.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ void pew_init() {
107107
#endif
108108

109109
tc_set_enable(tc, true);
110-
tc->COUNT16.CC[0].reg = 160;
110+
tc->COUNT16.CC[0].reg = 64;
111111

112112
// Clear our interrupt in case it was set earlier
113113
tc->COUNT16.INTFLAG.reg = TC_INTFLAG_MC0;

‎shared-module/_pew/__init__.c‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ void pew_tick(void) {
5151
pressed = 0;
5252
col = 0;
5353
++turn;
54-
if (turn >= 8) {
54+
if (turn > 11) {
5555
turn = 0;
5656
}
5757
}
@@ -68,13 +68,15 @@ void pew_tick(void) {
6868
value = true;
6969
break;
7070
case 2:
71-
if (turn == 2 || turn == 4 || turn == 6) {
72-
value = true;
71+
if (turn == 2 || turn == 5 || turn == 8 || turn == 11) {
72+
value = true;
7373
}
74+
break;
7475
case 1:
7576
if (turn == 0) {
7677
value = true;
7778
}
79+
break;
7880
case 0:
7981
break;
8082
}

0 commit comments

Comments
 (0)