Skip to content

Commit 90ad9be

Browse files
tannewttannewt
authored
Merge pull request #3136 from xiongyihui/master
Add 2 boards nRF52840 M.2 devkit and M60 Keyboard
2 parents 08375c7 + d712d12 commit 90ad9be

File tree

11 files changed

+437
-0
lines changed

11 files changed

+437
-0
lines changed

‎.github/workflows/build.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -203,6 +203,8 @@ jobs:
203203
- "itsybitsy_nrf52840_express"
204204
- "kicksat-sprite"
205205
- "loc_ber_m4_base_board"
206+
- "makerdiary_m60_keyboard"
207+
- "makerdiary_nrf52840_m2_devkit"
206208
- "makerdiary_nrf52840_mdk"
207209
- "makerdiary_nrf52840_mdk_usb_dongle"
208210
- "meowbit_v121"

‎ports/nrf/boards/makerdiary_m60_keyboard/README.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
# Makerdiary M60 Keyboard
2+
3+
M60 is a USB & BLE, modular, hot-swappable, 60% keyboard powered by Python.
4+
Refer to https://makerdiary.com/m60 for more details.

‎ports/nrf/boards/makerdiary_m60_keyboard/board.c

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
/*
2+
* This file is part of the MicroPython project, http://micropython.org/
3+
*
4+
* The MIT License (MIT)
5+
*
6+
* Copyright (c) 2017 Scott Shawcroft for Adafruit Industries
7+
*
8+
* Permission is hereby granted, free of charge, to any person obtaining a copy
9+
* of this software and associated documentation files (the "Software"), to deal
10+
* in the Software without restriction, including without limitation the rights
11+
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
12+
* copies of the Software, and to permit persons to whom the Software is
13+
* furnished to do so, subject to the following conditions:
14+
*
15+
* The above copyright notice and this permission notice shall be included in
16+
* all copies or substantial portions of the Software.
17+
*
18+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
19+
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
20+
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
21+
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
22+
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
23+
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
24+
* THE SOFTWARE.
25+
*/
26+
27+
#include "boards/board.h"
28+
29+
void board_init(void) {
30+
}
31+
32+
bool board_requests_safe_mode(void) {
33+
return false;
34+
}
35+
36+
void reset_board(void) {
37+
38+
}

‎ports/nrf/boards/makerdiary_m60_keyboard/mpconfigboard.h

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
/*
2+
* This file is part of the MicroPython project, http://micropython.org/
3+
*
4+
* The MIT License (MIT)
5+
*
6+
* Copyright (c) 2016 Glenn Ruben Bakke
7+
* Copyright (c) 2018 Dan Halbert for Adafruit Industries
8+
*
9+
* Permission is hereby granted, free of charge, to any person obtaining a copy
10+
* of this software and associated documentation files (the "Software"), to deal
11+
* in the Software without restriction, including without limitation the rights
12+
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
13+
* copies of the Software, and to permit persons to whom the Software is
14+
* furnished to do so, subject to the following conditions:
15+
*
16+
* The above copyright notice and this permission notice shall be included in
17+
* all copies or substantial portions of the Software.
18+
*
19+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
20+
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
21+
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
22+
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
23+
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
24+
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
25+
* THE SOFTWARE.
26+
*/
27+
28+
#include "nrfx/hal/nrf_gpio.h"
29+
30+
#define MICROPY_HW_BOARD_NAME "Makerdiary M60 Keyboard"
31+
#define MICROPY_HW_MCU_NAME "nRF52840"
32+
33+
#define CP_RGB_STATUS_R (&pin_P0_30)
34+
#define CP_RGB_STATUS_G (&pin_P0_29)
35+
#define CP_RGB_STATUS_B (&pin_P0_31)
36+
37+
#define MICROPY_QSPI_DATA0 NRF_GPIO_PIN_MAP(1, 10)
38+
#define MICROPY_QSPI_DATA1 NRF_GPIO_PIN_MAP(1, 14)
39+
#define MICROPY_QSPI_DATA2 NRF_GPIO_PIN_MAP(1, 15)
40+
#define MICROPY_QSPI_DATA3 NRF_GPIO_PIN_MAP(1, 12)
41+
#define MICROPY_QSPI_SCK NRF_GPIO_PIN_MAP(1, 11)
42+
#define MICROPY_QSPI_CS NRF_GPIO_PIN_MAP(1, 13)
43+
44+
#define BOARD_HAS_CRYSTAL 1
45+
46+
// #define DEFAULT_UART_BUS_RX (&pin_P0_15)
47+
// #define DEFAULT_UART_BUS_TX (&pin_P0_16)
48+
49+
#define DEFAULT_I2C_BUS_SCL (&pin_P1_06)
50+
#define DEFAULT_I2C_BUS_SDA (&pin_P1_05)

‎ports/nrf/boards/makerdiary_m60_keyboard/mpconfigboard.mk

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
USB_VID = 0x2886
2+
USB_PID = 0xf002
3+
USB_PRODUCT = "M60 Keyboard"
4+
USB_MANUFACTURER = "Makerdiary"
5+
6+
MCU_CHIP = nrf52840
7+
8+
QSPI_FLASH_FILESYSTEM = 1
9+
EXTERNAL_FLASH_DEVICE_COUNT = 1
10+
EXTERNAL_FLASH_DEVICES = "MX25R6435F"
11+
12+
CIRCUITPY_ENABLE_MPY_NATIVE = 1

‎ports/nrf/boards/makerdiary_m60_keyboard/pins.c

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
#include "shared-bindings/board/__init__.h"
2+
3+
#include "boards/board.h"
4+
#include "shared-module/displayio/__init__.h"
5+
6+
STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
7+
{ MP_ROM_QSTR(MP_QSTR_R1), MP_ROM_PTR(&pin_P0_05) },
8+
{ MP_ROM_QSTR(MP_QSTR_R2), MP_ROM_PTR(&pin_P0_06) },
9+
{ MP_ROM_QSTR(MP_QSTR_R3), MP_ROM_PTR(&pin_P0_07) },
10+
{ MP_ROM_QSTR(MP_QSTR_R4), MP_ROM_PTR(&pin_P0_08) },
11+
{ MP_ROM_QSTR(MP_QSTR_R5), MP_ROM_PTR(&pin_P1_09) },
12+
{ MP_ROM_QSTR(MP_QSTR_R6), MP_ROM_PTR(&pin_P1_08) },
13+
{ MP_ROM_QSTR(MP_QSTR_R7), MP_ROM_PTR(&pin_P0_12) },
14+
{ MP_ROM_QSTR(MP_QSTR_R8), MP_ROM_PTR(&pin_P0_11) },
15+
16+
{ MP_ROM_QSTR(MP_QSTR_C1), MP_ROM_PTR(&pin_P0_19) },
17+
{ MP_ROM_QSTR(MP_QSTR_C2), MP_ROM_PTR(&pin_P0_20) },
18+
{ MP_ROM_QSTR(MP_QSTR_C3), MP_ROM_PTR(&pin_P0_21) },
19+
{ MP_ROM_QSTR(MP_QSTR_C4), MP_ROM_PTR(&pin_P0_22) },
20+
{ MP_ROM_QSTR(MP_QSTR_C5), MP_ROM_PTR(&pin_P0_23) },
21+
{ MP_ROM_QSTR(MP_QSTR_C6), MP_ROM_PTR(&pin_P0_24) },
22+
{ MP_ROM_QSTR(MP_QSTR_C7), MP_ROM_PTR(&pin_P0_25) },
23+
{ MP_ROM_QSTR(MP_QSTR_C8), MP_ROM_PTR(&pin_P0_26) },
24+
25+
{ MP_ROM_QSTR(MP_QSTR_TXD), MP_ROM_PTR(&pin_P0_16) },
26+
{ MP_ROM_QSTR(MP_QSTR_RXD), MP_ROM_PTR(&pin_P0_15) },
27+
28+
{ MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_P1_06) },
29+
{ MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_P1_05) },
30+
31+
{ MP_ROM_QSTR(MP_QSTR_LED_R), MP_ROM_PTR(&pin_P0_30) },
32+
{ MP_ROM_QSTR(MP_QSTR_LED_G), MP_ROM_PTR(&pin_P0_29) },
33+
{ MP_ROM_QSTR(MP_QSTR_LED_B), MP_ROM_PTR(&pin_P0_31) },
34+
35+
{ MP_ROM_QSTR(MP_QSTR_BTN), MP_ROM_PTR(&pin_P0_27) },
36+
37+
// { MP_ROM_QSTR(MP_QSTR_UART), MP_ROM_PTR(&board_uart_obj) },
38+
{ MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) }
39+
};
40+
41+
MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);

‎ports/nrf/boards/makerdiary_nrf52840_m2_devkit/README.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# Makerdiary nRF52840 M.2 Developer Kit
2+
3+
The devkit is a versatile IoT prototyping platform,
4+
including the nRF52840 M.2 Module and M.2 Dock. You can use the developer kit
5+
to prototype your IoT products and then scale to production faster using the
6+
nRF52840 M.2 Module combined with your custom PCB hardware.
7+
8+
Refer to https://github.com/makerdiary/nrf52840-m2-devkit for more details.

‎ports/nrf/boards/makerdiary_nrf52840_m2_devkit/board.c

Lines changed: 103 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,103 @@
1+
/*
2+
* This file is part of the MicroPython project, http://micropython.org/
3+
*
4+
* The MIT License (MIT)
5+
*
6+
* Copyright (c) 2017 Scott Shawcroft for Adafruit Industries
7+
* Copyright (c) 2020 Yihui Xiong for Makerdiary
8+
*
9+
* Permission is hereby granted, free of charge, to any person obtaining a copy
10+
* of this software and associated documentation files (the "Software"), to deal
11+
* in the Software without restriction, including without limitation the rights
12+
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
13+
* copies of the Software, and to permit persons to whom the Software is
14+
* furnished to do so, subject to the following conditions:
15+
*
16+
* The above copyright notice and this permission notice shall be included in
17+
* all copies or substantial portions of the Software.
18+
*
19+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
20+
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
21+
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
22+
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
23+
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
24+
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
25+
* THE SOFTWARE.
26+
*/
27+
28+
#include "boards/board.h"
29+
#include "mpconfigboard.h"
30+
31+
#include "shared-bindings/busio/SPI.h"
32+
#include "shared-bindings/displayio/FourWire.h"
33+
#include "shared-module/displayio/__init__.h"
34+
#include "shared-module/displayio/mipi_constants.h"
35+
36+
displayio_fourwire_obj_t board_display_obj;
37+
38+
#define DELAY 0x80
39+
40+
uint8_t display_init_sequence[] = {
41+
0x01, 0 | DELAY, 150, // SWRESET
42+
0x11, 0 | DELAY, 255, // SLPOUT
43+
0x36, 1, 0b10100000, // _MADCTL for rotation 0
44+
0x3a, 1, 0x55, // COLMOD - 16bit color
45+
0x21, 0 | DELAY, 10, // _INVON
46+
0x13, 0 | DELAY, 10, // _NORON
47+
0x29, 0 | DELAY, 255, // _DISPON
48+
};
49+
50+
void board_init(void) {
51+
busio_spi_obj_t* spi = &displays[0].fourwire_bus.inline_bus;
52+
common_hal_busio_spi_construct(spi, &pin_P0_11, &pin_P0_12, NULL);
53+
common_hal_busio_spi_never_reset(spi);
54+
55+
displayio_fourwire_obj_t* bus = &displays[0].fourwire_bus;
56+
bus->base.type = &displayio_fourwire_type;
57+
common_hal_displayio_fourwire_construct(bus,
58+
spi,
59+
&pin_P0_08, // TFT_DC Command or data
60+
&pin_P0_06, // TFT_CS Chip select
61+
&pin_P1_09, // TFT_RST Reset
62+
60000000, // Baudrate
63+
0, // Polarity
64+
0); // Phase
65+
66+
displayio_display_obj_t* display = &displays[0].display;
67+
display->base.type = &displayio_display_type;
68+
common_hal_displayio_display_construct(display,
69+
bus,
70+
240, // Width (after rotation)
71+
240, // Height (after rotation)
72+
80, // column start
73+
0, // row start
74+
0, // rotation
75+
16, // Color depth
76+
false, // Grayscale
77+
false, // Pixels in a byte share a row. Only used for depth < 8
78+
1, // bytes per cell. Only valid for depths < 8
79+
false, // reverse_pixels_in_byte. Only valid for depths < 8
80+
true, // reverse_pixels_in_word
81+
MIPI_COMMAND_SET_COLUMN_ADDRESS, // Set column command
82+
MIPI_COMMAND_SET_PAGE_ADDRESS, // Set row command
83+
MIPI_COMMAND_WRITE_MEMORY_START, // Write memory command
84+
37, // set vertical scroll command
85+
display_init_sequence,
86+
sizeof(display_init_sequence),
87+
&pin_P0_20, // backlight pin
88+
NO_BRIGHTNESS_COMMAND,
89+
1.0f, // brightness (ignored)
90+
true, // auto_brightness
91+
false, // single_byte_bounds
92+
false, // data_as_commands
93+
true, // auto_refresh
94+
60, // native_frames_per_second
95+
true); // backlight_on_high
96+
}
97+
98+
bool board_requests_safe_mode(void) {
99+
return false;
100+
}
101+
102+
void reset_board(void) {
103+
}

‎ports/nrf/boards/makerdiary_nrf52840_m2_devkit/mpconfigboard.h

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
/*
2+
* This file is part of the MicroPython project, http://micropython.org/
3+
*
4+
* The MIT License (MIT)
5+
*
6+
* Copyright (c) 2016 Glenn Ruben Bakke
7+
* Copyright (c) 2018 Dan Halbert for Adafruit Industries
8+
*
9+
* Permission is hereby granted, free of charge, to any person obtaining a copy
10+
* of this software and associated documentation files (the "Software"), to deal
11+
* in the Software without restriction, including without limitation the rights
12+
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
13+
* copies of the Software, and to permit persons to whom the Software is
14+
* furnished to do so, subject to the following conditions:
15+
*
16+
* The above copyright notice and this permission notice shall be included in
17+
* all copies or substantial portions of the Software.
18+
*
19+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
20+
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
21+
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
22+
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
23+
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
24+
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
25+
* THE SOFTWARE.
26+
*/
27+
28+
#include "nrfx/hal/nrf_gpio.h"
29+
30+
#define MICROPY_HW_BOARD_NAME "Makerdiary nRF52840 M.2 Developer Kit"
31+
#define MICROPY_HW_MCU_NAME "nRF52840"
32+
33+
#define MICROPY_HW_LED_STATUS (&pin_P1_07)
34+
35+
#define CP_RGB_STATUS_INVERTED_PWM
36+
#define CP_RGB_STATUS_R (&pin_P0_30)
37+
#define CP_RGB_STATUS_G (&pin_P0_29)
38+
#define CP_RGB_STATUS_B (&pin_P0_31)
39+
40+
#define MICROPY_QSPI_DATA0 NRF_GPIO_PIN_MAP(1, 10)
41+
#define MICROPY_QSPI_DATA1 NRF_GPIO_PIN_MAP(1, 14)
42+
#define MICROPY_QSPI_DATA2 NRF_GPIO_PIN_MAP(1, 15)
43+
#define MICROPY_QSPI_DATA3 NRF_GPIO_PIN_MAP(1, 12)
44+
#define MICROPY_QSPI_SCK NRF_GPIO_PIN_MAP(1, 11)
45+
#define MICROPY_QSPI_CS NRF_GPIO_PIN_MAP(1, 13)
46+
47+
#define BOARD_HAS_CRYSTAL 1
48+
49+
#define DEFAULT_UART_BUS_RX (&pin_P0_15)
50+
#define DEFAULT_UART_BUS_TX (&pin_P0_16)
51+
52+
#define DEFAULT_I2C_BUS_SCL (&pin_P1_06)
53+
#define DEFAULT_I2C_BUS_SDA (&pin_P1_05)
54+
55+
#define DEFAULT_SPI_BUS_SCK (&pin_P0_11)
56+
#define DEFAULT_SPI_BUS_MOSI (&pin_P0_12)
57+
#define DEFAULT_SPI_BUS_MISO (&pin_P1_08)

‎ports/nrf/boards/makerdiary_nrf52840_m2_devkit/mpconfigboard.mk

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
USB_VID = 0x2886
2+
USB_PID = 0xf001
3+
USB_PRODUCT = "nRF52840 M.2 Developer Kit"
4+
USB_MANUFACTURER = "Makerdiary"
5+
6+
MCU_CHIP = nrf52840
7+
8+
QSPI_FLASH_FILESYSTEM = 1
9+
EXTERNAL_FLASH_DEVICE_COUNT = 1
10+
EXTERNAL_FLASH_DEVICES = "MX25R6435F"
11+
12+
CIRCUITPY_ENABLE_MPY_NATIVE = 1

0 commit comments

Comments
 (0)