Skip to content

Commit 37887c4

Browse files
dhalbertdhalbert
authored
Merge pull request #4595 from ladyada/moretrinkey
Moretrinkey
2 parents 2a78a51 + d136078 commit 37887c4

File tree

20 files changed

+440
-2
lines changed

20 files changed

+440
-2
lines changed

‎.github/workflows/build.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,11 @@ jobs:
178178
- "TG-Watch"
179179
- "adafruit_feather_rp2040"
180180
- "adafruit_itsybitsy_rp2040"
181+
- "adafruit_neokey_trinkey_m0"
182+
- "adafruit_proxlight_trinkey_m0"
181183
- "adafruit_qtpy_rp2040"
184+
- "adafruit_rotary_trinkey_m0"
185+
- "adafruit_slide_trinkey_m0"
182186
- "aloriumtech_evo_m51"
183187
- "aramcon_badge_2019"
184188
- "arduino_mkr1300"
@@ -305,7 +309,6 @@ jobs:
305309
- "raspberry_pi_pico"
306310
- "raytac_mdbt50q-db-40"
307311
- "robohatmm1_m4"
308-
- "rotary_trinkey_m0"
309312
- "sam32"
310313
- "same54_xplained"
311314
- "seeeduino_wio_terminal"

‎.gitmodules

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -171,10 +171,16 @@
171171
[submodule "frozen/Adafruit_CircuitPython_LC709203F"]
172172
path = frozen/Adafruit_CircuitPython_LC709203F
173173
url = https://github.com/adafruit/Adafruit_CircuitPython_LC709203F
174+
[submodule "frozen/Adafruit_CircuitPython_SimpleMath"]
175+
path = frozen/Adafruit_CircuitPython_SimpleMath
176+
url = https://github.com/adafruit/Adafruit_CircuitPython_SimpleMath
174177
[submodule "ports/raspberrypi/sdk"]
175178
path = ports/raspberrypi/sdk
176179
url = https://github.com/adafruit/pico-sdk.git
177180
[submodule "data/nvm.toml"]
178181
path = data/nvm.toml
179182
url = https://github.com/adafruit/nvm.toml.git
180183
branch = main
184+
[submodule "frozen/Adafruit_CircuitPython_MIDI"]
185+
path = frozen/Adafruit_CircuitPython_MIDI
186+
url = https://github.com/adafruit/Adafruit_CircuitPython_MIDI

‎frozen/Adafruit_CircuitPython_MIDI

‎frozen/Adafruit_CircuitPython_SimpleMath

‎ports/atmel-samd/boards/rotary_trinkey_m0/board.c renamed to ‎ports/atmel-samd/boards/adafruit_neokey_trinkey_m0/board.c

File renamed without changes.

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

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
#define MICROPY_HW_BOARD_NAME "Adafruit NeoKey Trinkey M0"
2+
#define MICROPY_HW_MCU_NAME "samd21e18"
3+
4+
#define MICROPY_HW_NEOPIXEL (&pin_PA15)
5+
6+
#define MICROPY_PORT_A (0)
7+
#define MICROPY_PORT_B (0)
8+
#define MICROPY_PORT_C (0)
9+
10+
#define IGNORE_PIN_PA00 1
11+
#define IGNORE_PIN_PA01 1
12+
#define IGNORE_PIN_PA02 1
13+
#define IGNORE_PIN_PA03 1
14+
#define IGNORE_PIN_PA04 1
15+
#define IGNORE_PIN_PA05 1
16+
#define IGNORE_PIN_PA06 1
17+
#define IGNORE_PIN_PA08 1
18+
#define IGNORE_PIN_PA09 1
19+
#define IGNORE_PIN_PA10 1
20+
#define IGNORE_PIN_PA11 1
21+
#define IGNORE_PIN_PA12 1
22+
#define IGNORE_PIN_PA13 1
23+
#define IGNORE_PIN_PA14 1
24+
#define IGNORE_PIN_PA16 1
25+
#define IGNORE_PIN_PA17 1
26+
#define IGNORE_PIN_PA18 1
27+
#define IGNORE_PIN_PA19 1
28+
#define IGNORE_PIN_PA20 1
29+
#define IGNORE_PIN_PA21 1
30+
// USB is always used internally so skip the pin objects for it.
31+
#define IGNORE_PIN_PA24 1
32+
#define IGNORE_PIN_PA25 1
33+
#define IGNORE_PIN_PA27 1
34+
#define IGNORE_PIN_PA29 1
35+
#define IGNORE_PIN_PA30 1
36+
#define IGNORE_PIN_PA31 1
37+
#define IGNORE_PIN_PB00 1
38+
#define IGNORE_PIN_PB01 1
39+
#define IGNORE_PIN_PB02 1
40+
#define IGNORE_PIN_PB03 1
41+
#define IGNORE_PIN_PB04 1
42+
#define IGNORE_PIN_PB05 1
43+
#define IGNORE_PIN_PB06 1
44+
#define IGNORE_PIN_PB07 1
45+
#define IGNORE_PIN_PB08 1
46+
#define IGNORE_PIN_PB09 1
47+
#define IGNORE_PIN_PB10 1
48+
#define IGNORE_PIN_PB11 1
49+
#define IGNORE_PIN_PB12 1
50+
#define IGNORE_PIN_PB13 1
51+
#define IGNORE_PIN_PB14 1
52+
#define IGNORE_PIN_PB15 1
53+
#define IGNORE_PIN_PB16 1
54+
#define IGNORE_PIN_PB17 1
55+
#define IGNORE_PIN_PB22 1
56+
#define IGNORE_PIN_PB23 1
57+
#define IGNORE_PIN_PB30 1
58+
#define IGNORE_PIN_PB31 1

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

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
USB_VID = 0x239A
2+
USB_PID = 0x8100
3+
USB_PRODUCT = "NeoKey Trinkey M0"
4+
USB_MANUFACTURER = "Adafruit Industries LLC"
5+
6+
CHIP_VARIANT = SAMD21E18A
7+
CHIP_FAMILY = samd21
8+
9+
INTERNAL_FLASH_FILESYSTEM = 1
10+
LONGINT_IMPL = NONE
11+
12+
CIRCUITPY_ANALOGIO = 0
13+
CIRCUITPY_ROTARYIO = 0
14+
CIRCUITPY_RTC = 0
15+
CIRCUITPY_SAMD = 0
16+
CIRCUITPY_PS2IO = 0
17+
CIRCUITPY_PULSEIO = 0
18+
CIRCUITPY_PWMIO = 0
19+
CIRCUITPY_AUDIOCORE = 0
20+
CIRCUITPY_BUSIO = 0
21+
CIRCUITPY_STORAGE = 1
22+
23+
CIRCUITPY_MATH = 1
24+
CIRCUITPY_PIXELBUF = 1
25+
CIRCUITPY_USB_MIDI = 1
26+
CIRCUITPY_TOUCHIO = 1
27+
CIRCUITPY_FULL_BUILD = 0
28+
29+
SUPEROPT_GC = 0
30+
SUPEROPT_VM = 0
31+
32+
# Include these Python libraries in firmware.
33+
FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel
34+
FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_HID

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
#include "shared-bindings/board/__init__.h"
2+
3+
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_PA15) },
6+
{ MP_ROM_QSTR(MP_QSTR_SWITCH), MP_ROM_PTR(&pin_PA28) },
7+
};
8+
MP_DEFINE_CONST_DICT(board_module_globals, board_global_dict_table);

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

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
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 "supervisor/board.h"
28+
#include "common-hal/microcontroller/Pin.h"
29+
#include "supervisor/shared/board.h"
30+
#include "hal/include/hal_gpio.h"
31+
32+
void board_init(void) {
33+
}
34+
35+
bool board_requests_safe_mode(void) {
36+
return false;
37+
}
38+
39+
void reset_board(void) {
40+
}

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

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
#define MICROPY_HW_BOARD_NAME "Adafruit ProxLight Trinkey M0"
2+
#define MICROPY_HW_MCU_NAME "samd21e18"
3+
4+
#define MICROPY_HW_NEOPIXEL (&pin_PA15)
5+
6+
#define MICROPY_PORT_A (0)
7+
#define MICROPY_PORT_B (0)
8+
#define MICROPY_PORT_C (0)
9+
10+
#define IGNORE_PIN_PA01 1
11+
#define IGNORE_PIN_PA02 1
12+
#define IGNORE_PIN_PA04 1
13+
#define IGNORE_PIN_PA05 1
14+
#define IGNORE_PIN_PA06 1
15+
#define IGNORE_PIN_PA08 1
16+
#define IGNORE_PIN_PA09 1
17+
#define IGNORE_PIN_PA10 1
18+
#define IGNORE_PIN_PA11 1
19+
#define IGNORE_PIN_PA12 1
20+
#define IGNORE_PIN_PA13 1
21+
#define IGNORE_PIN_PA14 1
22+
#define IGNORE_PIN_PA18 1
23+
#define IGNORE_PIN_PA19 1
24+
#define IGNORE_PIN_PA20 1
25+
#define IGNORE_PIN_PA21 1
26+
// USB is always used internally so skip the pin objects for it.
27+
#define IGNORE_PIN_PA24 1
28+
#define IGNORE_PIN_PA25 1
29+
#define IGNORE_PIN_PA27 1
30+
#define IGNORE_PIN_PA28 1
31+
#define IGNORE_PIN_PA29 1
32+
#define IGNORE_PIN_PA30 1
33+
#define IGNORE_PIN_PA31 1
34+
#define IGNORE_PIN_PB00 1
35+
#define IGNORE_PIN_PB01 1
36+
#define IGNORE_PIN_PB02 1
37+
#define IGNORE_PIN_PB03 1
38+
#define IGNORE_PIN_PB04 1
39+
#define IGNORE_PIN_PB05 1
40+
#define IGNORE_PIN_PB06 1
41+
#define IGNORE_PIN_PB07 1
42+
#define IGNORE_PIN_PB08 1
43+
#define IGNORE_PIN_PB09 1
44+
#define IGNORE_PIN_PB10 1
45+
#define IGNORE_PIN_PB11 1
46+
#define IGNORE_PIN_PB12 1
47+
#define IGNORE_PIN_PB13 1
48+
#define IGNORE_PIN_PB14 1
49+
#define IGNORE_PIN_PB15 1
50+
#define IGNORE_PIN_PB16 1
51+
#define IGNORE_PIN_PB17 1
52+
#define IGNORE_PIN_PB22 1
53+
#define IGNORE_PIN_PB23 1
54+
#define IGNORE_PIN_PB30 1
55+
#define IGNORE_PIN_PB31 1
56+
57+
#define DEFAULT_I2C_BUS_SCL (&pin_PA17)
58+
#define DEFAULT_I2C_BUS_SDA (&pin_PA16)

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

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
USB_VID = 0x239A
2+
USB_PID = 0x8104
3+
USB_PRODUCT = "ProxLight Trinkey M0"
4+
USB_MANUFACTURER = "Adafruit Industries LLC"
5+
6+
CHIP_VARIANT = SAMD21E18A
7+
CHIP_FAMILY = samd21
8+
9+
INTERNAL_FLASH_FILESYSTEM = 1
10+
LONGINT_IMPL = NONE
11+
12+
CIRCUITPY_ANALOGIO = 0
13+
CIRCUITPY_ROTARYIO = 0
14+
CIRCUITPY_RTC = 0
15+
CIRCUITPY_SAMD = 0
16+
CIRCUITPY_PS2IO = 0
17+
CIRCUITPY_PULSEIO = 0
18+
CIRCUITPY_PWMIO = 0
19+
CIRCUITPY_AUDIOCORE = 0
20+
CIRCUITPY_BUSIO = 1
21+
CIRCUITPY_STORAGE = 1
22+
23+
CIRCUITPY_MATH = 1
24+
CIRCUITPY_PIXELBUF = 0
25+
CIRCUITPY_USB_MIDI = 1
26+
CIRCUITPY_TOUCHIO = 1
27+
CIRCUITPY_FULL_BUILD = 0
28+
29+
SUPEROPT_GC = 0
30+
SUPEROPT_VM = 0
31+
32+
# Include these Python libraries in firmware.
33+
FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_HID

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

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
#include "shared-bindings/board/__init__.h"
2+
3+
STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
4+
{ MP_ROM_QSTR(MP_QSTR_INTERRUPT), MP_ROM_PTR(&pin_PA00) },
5+
6+
{ MP_ROM_QSTR(MP_QSTR_TOUCH2), MP_ROM_PTR(&pin_PA03) },
7+
{ MP_ROM_QSTR(MP_QSTR_TOUCH1), MP_ROM_PTR(&pin_PA07) },
8+
9+
{ MP_ROM_QSTR(MP_QSTR_NEOPIXEL), MP_ROM_PTR(&pin_PA15) },
10+
{ MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_PA16) },
11+
{ MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_PA17) },
12+
13+
{ MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) },
14+
};
15+
MP_DEFINE_CONST_DICT(board_module_globals, board_global_dict_table);

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

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
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 "supervisor/board.h"
28+
#include "common-hal/microcontroller/Pin.h"
29+
#include "supervisor/shared/board.h"
30+
#include "hal/include/hal_gpio.h"
31+
32+
void board_init(void) {
33+
}
34+
35+
bool board_requests_safe_mode(void) {
36+
return false;
37+
}
38+
39+
void reset_board(void) {
40+
}

‎ports/atmel-samd/boards/rotary_trinkey_m0/mpconfigboard.h renamed to ‎ports/atmel-samd/boards/adafruit_rotary_trinkey_m0/mpconfigboard.h

File renamed without changes.

‎ports/atmel-samd/boards/rotary_trinkey_m0/mpconfigboard.mk renamed to ‎ports/atmel-samd/boards/adafruit_rotary_trinkey_m0/mpconfigboard.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ CIRCUITPY_PULSEIO = 0
1818
CIRCUITPY_PWMIO = 0
1919
CIRCUITPY_AUDIOCORE = 0
2020
CIRCUITPY_BUSIO = 0
21-
CIRCUITPY_STORAGE = 0
21+
CIRCUITPY_STORAGE = 1
2222

2323
CIRCUITPY_MATH = 0
2424
CIRCUITPY_PIXELBUF = 1

‎ports/atmel-samd/boards/rotary_trinkey_m0/pins.c renamed to ‎ports/atmel-samd/boards/adafruit_rotary_trinkey_m0/pins.c

File renamed without changes.

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

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
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 "supervisor/board.h"
28+
#include "common-hal/microcontroller/Pin.h"
29+
#include "supervisor/shared/board.h"
30+
#include "hal/include/hal_gpio.h"
31+
32+
void board_init(void) {
33+
}
34+
35+
bool board_requests_safe_mode(void) {
36+
return false;
37+
}
38+
39+
void reset_board(void) {
40+
}

0 commit comments

Comments
 (0)