8000 Merge pull request #4765 from dhalbert/rotary-trinkey-rev-c-pins · michthom/circuitpython@9752162 · GitHub
[go: up one dir, main page]
Skip to content

Commit 9752162

Browse files
ladyadalad 8000 yada
authored
Merge pull request adafruit#4765 from dhalbert/rotary-trinkey-rev-c-pins
Update various Trinkey pins and add _pixelbuf
2 parents 689ec86 + ea0e18d commit 9752162

File tree

13 files changed

+46
-22
lines changed

13 files changed

+46
-22
lines changed

‎ports/atmel-samd/boards/adafruit_neokey_trinkey_m0/mpconfigboard.mk

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ CIRCUITPY_PWMIO = 0
1818
CIRCUITPY_ROTARYIO = 0
1919
CIRCUITPY_RTC = 0
2020

21+
CIRCUITPY_PIXELBUF = 1
22+
2123
# Include these Python libraries in firmware.
2224
FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel
2325
FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_HID

‎ports/atmel-samd/boards/adafruit_proxlight_trinkey_m0/mpconfigboard.mk

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,20 @@ CHIP_FAMILY = samd21
88

99
INTERNAL_FLASH_FILESYSTEM = 1
1010
LONGINT_IMPL = NONE
11+
1112
CIRCUITPY_FULL_BUILD = 0
1213

1314
CIRCUITPY_ANALOGIO = 0
1415
CIRCUITPY_AUDIOCORE = 0
15-
CIRCUITPY_ROTARYIO = 0
16-
CIRCUITPY_RTC = 0
16+
CIRCUITPY_BUSIO_SPI = 0
1717
CIRCUITPY_PULSEIO = 0
1818
CIRCUITPY_PWMIO = 0
19+
CIRCUITPY_ROTARYIO = 0
20+
CIRCUITPY_RTC = 0
21+
CIRCUITPY_USB_MIDI = 0
1922

20-
CIRCUITPY_PIXELBUF = 0
21-
CIRCUITPY_TOUCHIO = 1
23+
CIRCUITPY_PIXELBUF = 1
2224

2325
# Include these Python libraries in firmware.
2426
FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_HID
27+
FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel

‎ports/atmel-samd/boards/adafruit_rotary_trinkey_m0/mpconfigboard.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
#define IGNORE_PIN_PA02 1
1111
#define IGNORE_PIN_PA03 1
1212
#define IGNORE_PIN_PA05 1
13+
#define IGNORE_PIN_PA07 1
1314
#define IGNORE_PIN_PA08 1
1415
#define IGNORE_PIN_PA09 1
1516
#define IGNORE_PIN_PA10 1

‎ports/atmel-samd/boards/adafruit_rotary_trinkey_m0/mpconfigboard.mk

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ CIRCUITPY_PULSEIO = 0
1616
CIRCUITPY_PWMIO = 0
1717
CIRCUITPY_AUDIOCORE = 0
1818
CIRCUITPY_BUSIO = 0
19-
CIRCUITPY_TOUCHIO = 0
19+
20+
CIRCUITPY_PIXELBUF = 1
2021

2122
# Include these Python l 6D40 ibraries in firmware.
2223
FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel

‎ports/atmel-samd/boards/adafruit_rotary_trinkey_m0/pins.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,9 @@
22

33
STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
44
{ MP_ROM_QSTR(MP_QSTR_NEOPIXEL), MP_ROM_PTR(&pin_PA01) },
5+
{ MP_ROM_QSTR(MP_QSTR_ROTA), MP_ROM_PTR(&pin_PA04) },
56
{ MP_ROM_QSTR(MP_QSTR_ROTB), MP_ROM_PTR(&pin_PA00) },
6-
{ MP_ROM_QSTR(MP_QSTR_ROTA), MP_ROM_PTR(&pin_PA06) },
77
{ MP_ROM_QSTR(MP_QSTR_SWITCH), MP_ROM_PTR(&pin_PA27) },
8+
{ MP_ROM_QSTR(MP_QSTR_TOUCH), MP_ROM_PTR(&pin_PA06) },
89
};
910
MP_DEFINE_CONST_DICT(board_module_globals, board_global_dict_table);

‎ports/atmel-samd/boards/adafruit_slide_trinkey_m0/board.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,5 +37,5 @@ bool board_requests_safe_mode(void) {
3737
}
3838

3939
void reset_board(void) {
40-
board_reset_user_neopixels(&pin_PA06, 2);
40+
board_reset_user_neopixels(&pin_PA04, 2);
4141
}

‎ports/atmel-samd/boards/adafruit_slide_trinkey_m0/mpconfigboard.h

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,17 @@
11
#define MICROPY_HW_BOARD_NAME "Adafruit Slide Trinkey M0"
22
#define MICROPY_HW_MCU_NAME "samd21e18"
33

4-
#define MICROPY_HW_NEOPIXEL (&pin_PA06)
4+
#define MICROPY_HW_NEOPIXEL (&pin_PA04)
55

66
#define MICROPY_PORT_A (0)
77
#define MICROPY_PORT_B (0)
88
#define MICROPY_PORT_C (0)
99

1010
#define IGNORE_PIN_PA00 1
1111
#define IGNORE_PIN_PA01 1
12-
#define IGNORE_PIN_PA02 1
1312
#define IGNORE_PIN_PA03 1
14-
#define IGNORE_PIN_PA04 1
1513
#define IGNORE_PIN_PA05 1
14+
#define IGNORE_PIN_PA06 1
1615
#define IGNORE_PIN_PA08 1
1716
#define IGNORE_PIN_PA09 1
1817
#define IGNORE_PIN_PA10 1

‎ports/atmel-samd/boards/adafruit_slide_trinkey_m0/mpconfigboard.mk

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ CIRCUITPY_PWMIO = 0
1818
CIRCUITPY_AUDIOCORE = 0
1919
CIRCUITPY_BUSIO = 0
2020

21+
CIRCUITPY_PIXELBUF = 1
22+
2123
# Include these Python libraries in firmware.
2224
FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_SimpleMath
2325
FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel

‎ports/atmel-samd/boards/adafruit_slide_trinkey_m0/pins.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#include "shared-bindings/board/__init__.h"
22

33
STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
4-
// { MP_ROM_QSTR(MP_QSTR_TOUCH), MP_ROM_PTR(&pin_PA07) },
5-
{ MP_ROM_QSTR(MP_QSTR_NEOPIXEL), MP_ROM_PTR(&pin_PA06) },
6-
{ MP_ROM_QSTR(MP_QSTR_POTENTIOMETER), MP_ROM_PTR(&pin_PA07) },
4+
{ MP_ROM_QSTR(MP_QSTR_NEOPIXEL), MP_ROM_PTR(&pin_PA04) },
5+
{ MP_ROM_QSTR(MP_QSTR_POTENTIOMETER), MP_ROM_PTR(&pin_PA02) },
6+
{ MP_ROM_QSTR(MP_QSTR_TOUCH), MP_ROM_PTR(&pin_PA07) },
77
};
88
MP_DEFINE_CONST_DICT(board_module_globals, board_global_dict_table);

‎ports/atmel-samd/boards/neopixel_trinkey_m0/mpconfigboard.mk

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,15 @@ LONGINT_IMPL = NONE
1212
CIRCUITPY_FULL_BUILD = 0
1313

1414
CIRCUITPY_ANALOGIO = 0
15-
CIRCUITPY_ROTARYIO = 0
16-
CIRCUITPY_RTC = 0
17-
CIRCUITPY_PULSEIO = 0
18-
CIRCUITPY_PWMIO = 0
1915
CIRCUITPY_AUDIOCORE = 0
2016
CIRCUITPY_BUSIO = 0
17+
CIRCUITPY_PULSEIO = 0
18+
CIRCUITPY_PWMIO = 0
19+
CIRCUITPY_ROTARYIO = 0
20+
CIRCUITPY_RTC = 0
2121

2222
CIRCUITPY_PIXELBUF = 1
23-
CIRCUITPY_USB_MIDI = 1
24-
CIRCUITPY_TOUCHIO = 1
2523

2624
# Include these Python libraries in firmware.
27-
FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel
2825
FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_HID
26+
FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel

‎ports/atmel-samd/mpconfigport.mk

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,14 +60,19 @@ CIRCUITPY_VECTORIO = 0
6060

6161
MICROPY_PY_ASYNC_AWAIT = 0
6262

63+
# We don't have room for the fonts for terminalio for ja and ko
64+
# so turn off terminalio, and if it's off and displayio is on,
65+
# force a clean build.
66+
# Note that we cannot test $(CIRCUITPY_DISPLAYIO) directly with an
67+
# ifeq, because it's not set yet.
6368
ifeq ($(TRANSLATION), ja)
64-
RELEASE_NEEDS_CLEAN_BUILD = 1
6569
CIRCUITPY_TERMINALIO = 0
70+
RELEASE_NEEDS_CLEAN_BUILD = $(CIRCUITPY_DISPLAYIO)
6671
endif
6772

6873
ifeq ($(TRANSLATION), ko)
69-
RELEASE_NEEDS_CLEAN_BUILD = 1
7074
CIRCUITPY_TERMINALIO = 0
75+
RELEASE_NEEDS_CLEAN_BUILD = $(CIRCUITPY_DISPLAYIO)
7176
endif
7277

7378
SUPEROPT_GC = 0

‎py/circuitpy_mpconfig.mk

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,9 @@ CFLAGS += -DCIRCUITPY_BUILTINS_POW3=$(CIRCUITPY_BUILTINS_POW3)
121121
CIRCUITPY_BUSIO ?= 1
122122
CFLAGS += -DCIRCUITPY_BUSIO=$(CIRCUITPY_BUSIO)
123123

124+
CIRCUITPY_BUSIO_SPI ?= 1
125+
CFLAGS += -DCIRCUITPY_BUSIO_SPI=$(CIRCUITPY_BUSIO_SPI)
126+
124127
CIRCUITPY_CAMERA ?= 0
125128
CFLAGS += -DCIRCUITPY_CAMERA=$(CIRCUITPY_CAMERA)
126129

‎shared-bindings/busio/SPI.c

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@
8181

8282
// TODO(tannewt): Support LSB SPI.
8383
STATIC mp_obj_t busio_spi_make_new(const mp_obj_type_t *type, size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
84+
#if CIRCUITPY_BUSIO_SPI
8485
busio_spi_obj_t *self = m_new_obj(busio_spi_obj_t);
8586
self->base.type = &busio_spi_type;
8687
enum { ARG_clock, ARG_MOSI, ARG_MISO };
@@ -102,8 +103,12 @@ STATIC mp_obj_t busio_spi_make_new(const mp_obj_type_t *type, size_t n_args, con
102103

103104
common_hal_busio_spi_construct(self, clock, mosi, miso);
104105
return MP_OBJ_FROM_PTR(self);
106+
#else
107+
mp_raise_NotImplementedError(NULL);
108+
#endif // CIRCUITPY_BUSIO_SPI
105109
}
106110

111+
#if CIRCUITPY_BUSIO_SPI
107112
//| def deinit(self) -> None:
108113
//| """Turn off the SPI bus."""
109114
//| ...
@@ -399,8 +404,11 @@ const mp_obj_property_t busio_spi_frequency_obj = {
399404
MP_ROM_NONE,
400405
MP_ROM_NONE},
401406
};
407+
#endif // CIRCUITPY_BUSIO_SPI
408+
402409

403410
STATIC const mp_rom_map_elem_t busio_spi_locals_dict_table[] = {
411+
#if CIRCUITPY_BUSIO_SPI
404412
{ MP_ROM_QSTR(MP_QSTR_deinit), MP_ROM_PTR(&busio_spi_deinit_obj) },
405413
{ MP_ROM_QSTR(MP_QSTR___enter__), MP_ROM_PTR(&default___enter___obj) },
406414
{ MP_ROM_QSTR(MP_QSTR___exit__), MP_ROM_PTR(&busio_spi_obj___exit___obj) },
@@ -413,6 +421,7 @@ STATIC const mp_rom_map_elem_t busio_spi_locals_dict_table[] = {
413421
{ MP_ROM_QSTR(MP_QSTR_write), MP_ROM_PTR(&busio_spi_write_obj) },
414422
{ MP_ROM_QSTR(MP_QSTR_write_readinto), MP_ROM_PTR(&busio_spi_write_readinto_obj) },
415423
{ MP_ROM_QSTR(MP_QSTR_frequency), MP_ROM_PTR(&busio_spi_frequency_obj) }
424+
#endif // CIRCUITPY_BUSIO_SPI
416425
};
417426
STATIC MP_DEFINE_CONST_DICT(busio_spi_locals_dict, busio_spi_locals_dict_table);
418427

0 commit comments

Comments
 (0)
0