Skip to content

Commit 839fea0

Browse files
committed
adjust TRRS. Remove busio.UART.Parity if UART disabled
1 parent 1c3112b commit 839fea0

File tree

4 files changed

+21
-7
lines changed

4 files changed

+21
-7
lines changed

ports/atmel-samd/boards/adafruit_trrs_trinkey_m0/mpconfigboard.h

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,11 @@
44
#define MICROPY_HW_NEOPIXEL (&pin_PA01)
55
#define MICROPY_HW_NEOPIXEL_COUNT (1)
66

7+
#define DEFAULT_I2C_BUS_SCL (&pin_PA09)
8+
#define DEFAULT_I2C_BUS_SDA (&pin_PA08)
9+
710
#define IGNORE_PIN_PA00 1
811

9-
#define IGNORE_PIN_PA08 1
10-
#define IGNORE_PIN_PA09 1
1112
#define IGNORE_PIN_PA10 1
1213
#define IGNORE_PIN_PA11 1
1314
// no PA12

ports/atmel-samd/boards/adafruit_trrs_trinkey_m0/mpconfigboard.mk

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,19 @@ LONGINT_IMPL = NONE
1111

1212
CIRCUITPY_FULL_BUILD = 0
1313

14-
CIRCUITPY_BUSIO = 0
14+
CIRCUITPY_BUSIO_SPI = 0
15+
CIRCUITPY_BUSIO_UART = 0
1516
CIRCUITPY_KEYPAD = 1
17+
CIRCUITPY_KEYPAD_DEMUX = 0
18+
CIRCUITPY_KEYPAD_KEYMATRIX = 0
1619
CIRCUITPY_PWMIO = 0
1720
CIRCUITPY_RAINBOWIO = 0
21+
CIRCUITPY_ROTARYIO = 0
1822
CIRCUITPY_RTC = 0
1923

24+
# CIRCUITPY_KEYPAD_SHIFTREGISTERKEYS = 0
25+
# CIRCUITPY_TOUCHIO = 0
26+
2027
# Include these Python libraries in firmware.
21-
FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel
28+
#FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel
2229
FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_HID

ports/atmel-samd/boards/adafruit_trrs_trinkey_m0/pins.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,10 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
1212
{ MP_ROM_QSTR(MP_QSTR_RING_1), MP_ROM_PTR(&pin_PA06) },
1313
{ MP_ROM_QSTR(MP_QSTR_RING_1_SWITCH), MP_ROM_PTR(&pin_PA07) },
1414

15+
{ MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_PA09) },
16+
{ MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_PA08) },
17+
18+
{ MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) },
19+
{ MP_ROM_QSTR(MP_QSTR_STEMMA_I2C), MP_ROM_PTR(&board_i2c_obj) },
1520
};
1621
MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);

shared-bindings/busio/UART.c

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -384,8 +384,6 @@ STATIC mp_obj_t busio_uart_obj_reset_input_buffer(mp_obj_t self_in) {
384384
return mp_const_none;
385385
}
386386
STATIC MP_DEFINE_CONST_FUN_OBJ_1(busio_uart_reset_input_buffer_obj, busio_uart_obj_reset_input_buffer);
387-
#endif // CIRCUITPY_BUSIO_UART
388-
389387
//| class Parity:
390388
//| """Enum-like class to define the parity used to verify correct data transfer."""
391389
//|
@@ -427,6 +425,8 @@ MP_DEFINE_CONST_OBJ_TYPE(
427425
locals_dict, &busio_uart_parity_locals_dict
428426
);
429427

428+
#endif // CIRCUITPY_BUSIO_UART
429+
430430
STATIC const mp_rom_map_elem_t busio_uart_locals_dict_table[] = {
431431
#if CIRCUITPY_BUSIO_UART
432432
{ MP_ROM_QSTR(MP_QSTR___del__), MP_ROM_PTR(&busio_uart_deinit_obj) },
@@ -446,10 +446,11 @@ STATIC const mp_rom_map_elem_t busio_uart_locals_dict_table[] = {
446446
{ MP_ROM_QSTR(MP_QSTR_baudrate), MP_ROM_PTR(&busio_uart_baudrate_obj) },
447447
{ MP_ROM_QSTR(MP_QSTR_in_waiting), MP_ROM_PTR(&busio_uart_in_waiting_obj) },
448448
{ MP_ROM_QSTR(MP_QSTR_timeout), MP_ROM_PTR(&busio_uart_timeout_obj) },
449-
#endif // CIRCUITPY_BUSIO_UART
450449

451450
// Nested Enum-like Classes.
452451
{ MP_ROM_QSTR(MP_QSTR_Parity), MP_ROM_PTR(&busio_uart_parity_type) },
452+
#endif // CIRCUITPY_BUSIO_UART
453+
453454
};
454455
STATIC MP_DEFINE_CONST_DICT(busio_uart_locals_dict, busio_uart_locals_dict_table);
455456

0 commit comments

Comments
 (0)