Skip to content

Commit d595a03

Browse files
deshipudeshipu
committed
Update ugame port for the final ugame10 version
There have been multiple uGame prototypes with differences in the pins and other details. This updates the board definition to fit the final uGame 10 design.
1 parent 271c4be commit d595a03

4 files changed

Lines changed: 16 additions & 8 deletions

File tree

ports/atmel-samd/boards/ugame/board.c renamed to ports/atmel-samd/boards/ugame10/board.c

File renamed without changes.

ports/atmel-samd/boards/ugame/mpconfigboard.h renamed to ports/atmel-samd/boards/ugame10/mpconfigboard.h

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#define MICROPY_HW_BOARD_NAME "uGame"
1+
#define MICROPY_HW_BOARD_NAME "uGame10"
22
#define MICROPY_HW_MCU_NAME "samd21e18"
33

44
// Salae reads 12mhz which is the limit even though we set it to the
@@ -8,7 +8,7 @@
88
#define SPI_FLASH_MOSI_PIN PIN_PA16
99
#define SPI_FLASH_MISO_PIN PIN_PA19
1010
#define SPI_FLASH_SCK_PIN PIN_PA17
11-
#define SPI_FLASH_CS_PIN PIN_PA11
11+
#define SPI_FLASH_CS_PIN PIN_PA18
1212
#define SPI_FLASH_MOSI_PIN_FUNCTION PINMUX_PA16D_SERCOM3_PAD0
1313
#define SPI_FLASH_MISO_PIN_FUNCTION PINMUX_PA19D_SERCOM3_PAD3
1414
#define SPI_FLASH_SCK_PIN_FUNCTION PINMUX_PA17D_SERCOM3_PAD1
@@ -26,9 +26,8 @@
2626
#define SPI_FLASH_DIPO 3 // same as MISO pad
2727

2828
// These are pins not to reset.
29-
#define MICROPY_PORT_A (PORT_PA11 | PORT_PA16 |\
30-
PORT_PA17 | PORT_PA18 | PORT_PA19 | PORT_PA24 |\
31-
PORT_PA25)
29+
#define MICROPY_PORT_A (PORT_PA16 | PORT_PA17 | PORT_PA18 | PORT_PA19 |\
30+
PORT_PA24 | PORT_PA25)
3231
#define MICROPY_PORT_B (0)
3332
#define MICROPY_PORT_C (0)
3433

ports/atmel-samd/boards/ugame/mpconfigboard.mk renamed to ports/atmel-samd/boards/ugame10/mpconfigboard.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ LD_FILE = boards/samd21x18-bootloader-external-flash-crystalless.ld
22
#LD_FILE = boards/samd21x18-bootloader.ld
33
USB_VID = 0x239A
44
USB_PID = 0x801F
5-
USB_PRODUCT = "uGame"
5+
USB_PRODUCT = "uGame10"
66
USB_MANUFACTURER = "Radomir Dopieralski"
77

88
SPI_FLASH_FILESYSTEM = 1

ports/atmel-samd/boards/ugame/pins.c renamed to ports/atmel-samd/boards/ugame10/pins.c

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,23 @@ STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
55
{ MP_ROM_QSTR(MP_QSTR_O), MP_ROM_PTR(&pin_PA01) },
66

77
{ MP_ROM_QSTR(MP_QSTR_SPEAKER), MP_ROM_PTR(&pin_PA02) },
8+
{ MP_ROM_QSTR(MP_QSTR_MUTE), MP_ROM_PTR(&pin_PA23) },
9+
10+
{ MP_ROM_QSTR(MP_QSTR_BATTERY), MP_ROM_PTR(&pin_PA10) },
811

912
{ MP_ROM_QSTR(MP_QSTR_UP), MP_ROM_PTR(&pin_PA03) },
1013
{ MP_ROM_QSTR(MP_QSTR_LEFT), MP_ROM_PTR(&pin_PA04) },
11-
{ MP_ROM_QSTR(MP_QSTR_DOWN), MP_ROM_PTR(&pin_PA23) },
14+
{ MP_ROM_QSTR(MP_QSTR_DOWN), MP_ROM_PTR(&pin_PA22) },
1215
{ MP_ROM_QSTR(MP_QSTR_RIGHT), MP_ROM_PTR(&pin_PA05) },
1316

1417
{ MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_PA06) },
1518
{ MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_PA07) },
16-
{ MP_ROM_QSTR(MP_QSTR_DC), MP_ROM_PTR(&pin_PA08) },
19+
{ MP_ROM_QSTR(MP_QSTR_DC), MP_ROM_PTR(&pin_PA09) },
20+
{ MP_ROM_QSTR(MP_QSTR_CS), MP_ROM_PTR(&pin_PA08) },
21+
22+
{ MP_ROM_QSTR(MP_QSTR_A), MP_ROM_PTR(&pin_PA11) },
23+
{ MP_ROM_QSTR(MP_QSTR_B), MP_ROM_PTR(&pin_PA14) },
24+
{ MP_ROM_QSTR(MP_QSTR_C), MP_ROM_PTR(&pin_PA15) },
25+
{ MP_ROM_QSTR(MP_QSTR_D), MP_ROM_PTR(&pin_PA28) },
1726
};
1827
MP_DEFINE_CONST_DICT(board_module_globals, board_global_dict_table);

0 commit comments

Comments
 (0)