8000 Merge pull request #4757 from dhalbert/6.3.x-cherry-pick-from-main · domdfcoding/circuitpython@e494ca4 · GitHub
[go: up one dir, main page]
Skip to content

Commit e494ca4

Browse files
dhalbertdhalbert
authored
Merge pull request adafruit#4757 from dhalbert/6.3.x-cherry-pick-from-main
6.3.x cherry pick from main
2 parents 1d39be4 + 25f0947 commit e494ca4

File tree

146 files changed

+2020
-158
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

146 files changed

+2020
-158
lines changed

‎.github/workflows/build.yml

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,18 +178,26 @@ jobs:
178178
- "TG-Watch"
179179
- "adafruit_feather_rp2040"
180180
- "adafruit_itsybitsy_rp2040"
181+
- "adafruit_neokey_trinkey_m0"
182+
- "adafruit_proxlight_trinkey_m0"
183+
- "adafruit_qt2040_trinkey"
181184
- "adafruit_qtpy_rp2040"
185+
- "adafruit_rotary_trinkey_m0"
186+
- "adafruit_slide_trinkey_m0"
182187
- "aloriumtech_evo_m51"
188+
- "aramcon2_badge"
183189
- "aramcon_badge_2019"
184190
- "arduino_mkr1300"
185191
- "arduino_mkrzero"
186192
- "arduino_nano_33_ble"
187193
- "arduino_nano_33_iot"
194+
- "arduino_nano_rp2040_connect"
188195
- "arduino_zero"
189196
- "bast_pro_mini_m0"
190197
- "bastble"
191198
- "bdmicro_vina_d21"
192199
- "bdmicro_vina_d51"
200+
- "bdmicro_vina_d51_pcb7"
193201
- "bless_dev_board_multi_sensor"
194202
- "blm_badge"
195203
- "capablerobot_usbhub"
@@ -239,6 +247,7 @@ jobs:
239247
- "hallowing_m0_express"
240248
- "hallowing_m4_express"
241249
- "hiibot_bluefi"
250+
- "huntercat_nfc"
242251
- "ikigaisense_vita"
243252
- "imxrt1010_evk"
244253
- "imxrt1020_evk"
@@ -283,6 +292,8 @@ jobs:
283292
- "pewpew_m4"
284293
- "picoplanet"
285294
- "pimoroni_keybow2040"
295+
- "pimoroni_picolipo_16mb"
296+
- "pimoroni_picolipo_4mb"
286297
- "pimoroni_picosystem"
287298
- "pimoroni_tiny2040"
288299
- "pirkey_m0"
@@ -303,7 +314,6 @@ jobs:
303314
- "raspberry_pi_pico"
304315
- "raytac_mdbt50q-db-40"
305316
- "robohatmm1_m4"
306-
- "rotary_trinkey_m0"
307317
- "sam32"
308318
- "same54_xplained"
309319
- "seeeduino_wio_terminal"
@@ -314,6 +324,7 @@ jobs:
314324
- "simmel"
315325
- "snekboard"
316326
- "sparkfun_lumidrive"
327+
- "sparkfun_micromod_rp2040"
317328
- "sparkfun_nrf52840_micromod"
318329
- "sparkfun_nrf52840_mini"
319330
- "sparkfun_pro_micro_rp2040"
@@ -450,6 +461,7 @@ jobs:
450461
- "adafruit_funhouse"
451462
- "adafruit_magtag_2.9_grayscale"
452463
- "adafruit_metro_esp32s2"
464+
- "artisense_rd00"
453465
- "electroniccats_bastwifi"
454466
- "espressif_kaluga_1"
455467
- "espressif_saola_1_wroom"

‎.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 10000
184+
[submodule "frozen/Adafruit_CircuitPython_MIDI"]
185+
path = frozen/Adafruit_CircuitPython_MIDI
186+
url = https://github.com/adafruit/Adafruit_CircuitPython_MIDI

‎conf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,7 @@
284284
# Add any extra paths that contain custom files (such as robots.txt or
285285
# .htaccess) here, relative to this directory. These files are copied
286286
# directly to the root of the documentation.
287-
html_extra_path = ["docs/robots.txt"]
287+
#html_extra_path = []
288288

289289
# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
290290
# using the given strftime format.

‎data/nvm.toml

‎docs/robots.txt

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎extmod/ulab

‎frozen/Adafruit_CircuitPython_BLE

Submodule Adafruit_CircuitPython_BLE updated 57 files

‎frozen/Adafruit_CircuitPython_BLE_Apple_Notification_Center

‎frozen/Adafruit_CircuitPython_BusDevice

‎frozen/Adafruit_CircuitPython_CircuitPlayground

Submodule Adafruit_CircuitPython_CircuitPlayground updated 96 files

‎frozen/Adafruit_CircuitPython_Crickit

Submodule Adafruit_CircuitPython_Crickit updated 28 files

‎frozen/Adafruit_CircuitPython_DRV2605

‎frozen/Adafruit_CircuitPython_DS3231

‎frozen/Adafruit_CircuitPython_Display_Shapes

Submodule Adafruit_CircuitPython_Display_Shapes updated 32 files

‎frozen/Adafruit_CircuitPython_Display_Text

Submodule Adafruit_CircuitPython_Display_Text updated 44 files

‎frozen/Adafruit_CircuitPython_DotStar

‎frozen/Adafruit_CircuitPython_ESP32SPI

‎frozen/Adafruit_CircuitPython_FocalTouch

‎frozen/Adafruit_CircuitPython_HID

Submodule Adafruit_CircuitPython_HID updated 31 files

‎frozen/Adafruit_CircuitPython_IRRemote

‎frozen/Adafruit_CircuitPython_LC709203F

‎frozen/Adafruit_CircuitPython_LIS3DH

‎frozen/Adafruit_CircuitPython_LSM6DS

‎frozen/Adafruit_CircuitPython_MIDI

‎frozen/Adafruit_CircuitPython_Motor

Submodule Adafruit_CircuitPython_Motor updated 30 files

‎frozen/Adafruit_CircuitPython_NeoPixel

‎frozen/Adafruit_CircuitPython_ProgressBar

Submodule Adafruit_CircuitPython_ProgressBar updated 33 files

‎frozen/Adafruit_CircuitPython_RFM69

‎frozen/Adafruit_CircuitPython_RFM9x

‎frozen/Adafruit_CircuitPython_Register

‎frozen/Adafruit_CircuitPython_Requests

Submodule Adafruit_CircuitPython_Requests updated 41 files

‎frozen/Adafruit_CircuitPython_SD

‎frozen/Adafruit_CircuitPython_ST7789

Submodule Adafruit_CircuitPython_ST7789 updated 28 files

‎frozen/Adafruit_CircuitPython_SimpleMath

‎frozen/Adafruit_CircuitPython_Thermistor

‎frozen/Adafruit_CircuitPython_seesaw

Submodule Adafruit_CircuitPython_seesaw updated 36 files

‎frozen/pew-pewpew-standalone-10.x

‎locale/circuitpython.pot

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3733,6 +3733,10 @@ msgstr ""
37333733
msgid "pressing both buttons at start up.\n"
37343734
msgstr ""
37353735

3736+
#: ports/nrf/boards/aramcon2_badge/mpconfigboard.h
3737+
msgid "pressing the left button at start up\n"
3738+
msgstr ""
3739+
37363740
#: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
37373741
msgid "pull masks conflict with direction masks"
37383742
msgstr ""

‎main.c

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -332,17 +332,19 @@ STATIC bool run_code_py(safe_mode_t safe_mode) {
332332
bool asleep = false;
333333
while (true) {
334334
RUN_BACKGROUND_TASKS;
335+
336+
// If a reload was requested by the supervisor or autoreload, return
335337
if (reload_requested) {
336338
#if CIRCUITPY_ALARM
337339
if (asleep) {
338340
board_init();
339341
}
340342
#endif
341-
supervisor_set_run_reason(RUN_REASON_AUTO_RELOAD);
342343
reload_requested = false;
343344
return true;
344345
}
345346

347+
// If interrupted by keyboard, return
346348
if (serial_connected() && serial_bytes_available()) {
347349
#if CIRCUITPY_ALARM
348350
if (asleep) {
@@ -369,6 +371,7 @@ STATIC bool run_code_py(safe_mode_t safe_mode) {
369371
}
370372
#endif
371373

374+
// If messages haven't been printed yet, print them
372375
if (!printed_press_any_key && serial_connected()) {
373376
if (!serial_connected_at_start) {
374377
print_code_py_status_message(safe_mode);
@@ -595,6 +598,7 @@ int __attribute__((used)) main(void) {
595598
for (;;) {
596599
if (!skip_repl) {
597600
exit_code = run_repl();
601+
supervisor_set_run_reason(RUN_REASON_REPL_RELOAD);
598602
}
599603
if (exit_code == PYEXEC_FORCED_EXIT) {
600604
if (!first_run) {

‎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: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
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+
CIRCUITPY_PIXELBUF = 1
33+
34+
# Include these Python libraries in firmware.
35+
FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel
36+
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+
}

0 commit comments

Comments
 (0)
0