Skip to content

Commit d11a112

Browse files
ladyadaladyada
authored
Merge pull request #2528 from oshwabadge2020/ohs2020-badge
Ohs2020 badge initial support
2 parents 8b61333 + cc77e86 commit d11a112

File tree

5 files changed

+185
-0
lines changed

5 files changed

+185
-0
lines changed

‎.github/workflows/build.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,7 @@ jobs:
126126
- "metro_nrf52840_express"
127127
- "mini_sam_m4"
128128
- "monster_m4sk"
129+
- "ohs2020_badge"
129130
- "openbook_m4"
130131
- "particle_argon"
131132
- "particle_boron"

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

Lines changed: 99 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,99 @@
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+
#include "mpconfigboard.h"
29+
30+
#include "shared-bindings/busio/SPI.h"
31+
#include "shared-bindings/displayio/FourWire.h"
32+
#include "shared-module/displayio/__init__.h"
33+
#include "shared-module/displayio/mipi_constants.h"
34+
#include "tick.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, 0x00, // _MADCTL bottom to top refresh in vsync aligned order.
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_14, &pin_P0_15, 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_14, // TFT_CS Chip select
61+
&pin_P0_13, // TFT_RST Reset
62+
60000000);
63+
64+
displayio_display_obj_t* display = &displays[0].display;
65+
display->base.type = &displayio_display_type;
66+
common_hal_displayio_display_construct(display,
67+
bus,
68+
240, // Width (after rotation)
69+
240, // Height (after rotation)
70+
0, // column start
71+
0, // row start
72+
270, // rotation
73+
16, // Color depth
74+
false, // Grayscale
75+
false, // Pixels in a byte share a row. Only used for depth < 8
76+
1, // bytes per cell. Only valid for depths < 8
77+
false, // reverse_pixels_in_byte. Only valid for depths < 8
78+
MIPI_COMMAND_SET_COLUMN_ADDRESS, // Set column command
79+
MIPI_COMMAND_SET_PAGE_ADDRESS, // Set row command
80+
MIPI_COMMAND_WRITE_MEMORY_START, // Write memory command
81+
0x37, // set vertical scroll command
82+
display_init_sequence,
83+
sizeof(display_init_sequence),
84+
&pin_P0_02, // backlight pin
85+
NO_BRIGHTNESS_COMMAND,
86+
1.0f, // brightness (ignored)
87+
true, // auto_brightness
88+
false, // single_byte_bounds
89+
false, // data_as_commands
90+
true, // auto_refresh
91+
60); // native_frames_per_second
92+
}
93+
94+
bool board_requests_safe_mode(void) {
95+
return false;
96+
}
97+
98+
void reset_board(void) {
99+
}

‎ports/nrf/boards/ohs2020_badge/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+
* Copyright (c) 2020 Michael Welling
9+
*
10+
* Permission is hereby granted, free of charge, to any person obtaining a copy
11+
* of this software and associated documentation files (the "Software"), to deal
12+
* in the Software without restriction, including without limitation the rights
13+
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
14+
* copies of the Software, and to permit persons to whom the Software is
15+
* furnished to do so, subject to the following conditions:
16+
*
17+
* The above copyright notice and this permission notice shall be included in
18+
* all copies or substantial portions of the Software.
19+
*
20+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
21+
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
22+
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
23+
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
24+
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
25+
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
26+
* THE SOFTWARE.
27+
*/
28+
29+
#include "nrfx/hal/nrf_gpio.h"
30+
31+
#define MICROPY_HW_BOARD_NAME "Open Hardware Summit 2020 Badge"
32+
#define MICROPY_HW_MCU_NAME "nRF52840"
33+
34+
#if QSPI_FLASH_FILESYSTEM
35+
#define MICROPY_QSPI_DATA0 NRF_GPIO_PIN_MAP(0, 22)
36+
#define MICROPY_QSPI_DATA1 NRF_GPIO_PIN_MAP(1, 0)
37+
#define MICROPY_QSPI_DATA2 NRF_GPIO_PIN_MAP(0, 20)
38+
#define MICROPY_QSPI_DATA3 NRF_GPIO_PIN_MAP(1, 2)
39+
#define MICROPY_QSPI_SCK NRF_GPIO_PIN_MAP(1, 1)
40+
#define MICROPY_QSPI_CS NRF_GPIO_PIN_MAP(0, 23)
41+
#endif
42+
43+
#if SPI_FLASH_FILESYSTEM
44+
#define SPI_FLASH_MOSI_PIN &pin_P1_00
45+
#define SPI_FLASH_MISO_PIN &pin_P0_22
46+
#define SPI_FLASH_SCK_PIN &pin_P1_01
47+
#define SPI_FLASH_CS_PIN &pin_P0_23
48+
#endif
49+
50+
#define BOARD_HAS_CRYSTAL 1
51+
52+
#define DEFAULT_I2C_BUS_SCL (&pin_P1_14)
53+
#define DEFAULT_I2C_BUS_SDA (&pin_P1_15)
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_P0_07)

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
USB_VID = 0x239A
2+
USB_PID = 0x8080
3+
USB_PRODUCT = "OHS2020 Badge"
4+
USB_MANUFACTURER = "OSHWA"
5+
6+
MCU_CHIP = nrf52840
7+
8+
QSPI_FLASH_FILESYSTEM = 1
9+
EXTERNAL_FLASH_DEVICE_COUNT = 1
10+
EXTERNAL_FLASH_DEVICES = "W25Q32JV_IQ"

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

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
#include "shared-bindings/board/__init__.h"
2+
3+
STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
4+
{ MP_ROM_QSTR(MP_QSTR_MICROPHONE_CLOCK), MP_ROM_PTR(&pin_P0_25) },
5+
{ MP_ROM_QSTR(MP_QSTR_MICROPHONE_DATA), MP_ROM_PTR(&pin_P0_28) },
6+
7+
{ MP_ROM_QSTR(MP_QSTR_TFT_RESET), MP_ROM_PTR(&pin_P0_13) },
8+
{ MP_ROM_QSTR(MP_QSTR_TFT_BACKLIGHT), MP_ROM_PTR(&pin_P0_02) },
9+
{ MP_ROM_QSTR(MP_QSTR_TFT_CS), MP_ROM_PTR(&pin_P0_14) },
10+
{ MP_ROM_QSTR(MP_QSTR_TFT_DC), MP_ROM_PTR(&pin_P0_08) },
11+
{ MP_ROM_QSTR(MP_QSTR_TFT_SCK), MP_ROM_PTR(&pin_P0_11) },
12+
{ MP_ROM_QSTR(MP_QSTR_TFT_MOSI), MP_ROM_PTR(&pin_P0_12) },
13+
14+
{ MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) },
15+
{ MP_ROM_QSTR(MP_QSTR_SPI), MP_ROM_PTR(&board_spi_obj) },
16+
};
17+
18+
MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);

0 commit comments

Comments
 (0)