djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move terminal font to terminalio from board.

Browse Source
This commit is contained in:
Scott Shawcroft 2019-02-12 10:10:02 -08:00
parent 5258bc4318
commit b4306314aa
No known key found for this signature in database
GPG Key ID: FD0EDC4B6C53CA59
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ports/atmel-samd/boards/grandcentral_m4_express/pins.c
View File

@ -1,7 +1,6 @@
#include "shared-bindings/board/__init__.h"
#include "supervisor/shared/board_busses.h"
#include "supervisor/shared/display.h"
// This mapping only includes functional names because pins broken
// out on connectors are labeled with their MCU name available from
@ -132,7 +131,5 @@ STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
{ MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) },
{ MP_ROM_QSTR(MP_QSTR_SPI), MP_ROM_PTR(&board_spi_obj) },
{ MP_ROM_QSTR(MP_QSTR_UART), MP_ROM_PTR(&board_uart_obj) },
{ MP_ROM_QSTR(MP_QSTR_TERMINAL_FONT), MP_ROM_PTR(&supervisor_terminal_font) },
};
MP_DEFINE_CONST_DICT(board_module_globals, board_global_dict_table);

5
shared-bindings/terminalio/__init__.c
View File

@ -31,6 +31,7 @@
#include "shared-bindings/terminalio/__init__.h"
#include "shared-bindings/terminalio/Terminal.h"
#include "supervisor/shared/display.h"
#include "py/runtime.h"
@ -40,7 +41,8 @@
//| .. module:: terminalio
//| :synopsis: Displays text in a TileGrid
//|
//| The `terminalio` module contains classes to display a character stream on a display
//| The `terminalio` module contains classes to display a character stream on a display. The built
//| in font is available as ``terminalio.FONT``.
//|
//| Libraries
//|
@ -53,6 +55,7 @@
STATIC const mp_rom_map_elem_t terminalio_module_globals_table[] = {
{ MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_terminalio) },
{ MP_ROM_QSTR(MP_QSTR_Terminal), MP_OBJ_FROM_PTR(&terminalio_terminal_type) },
{ MP_ROM_QSTR(MP_QSTR_FONT), MP_ROM_PTR(&supervisor_terminal_font) },
};