Skip to content

Commit ff0a17d

Browse files
PaintYourDragonPaintYourDragon
authored
Merge branch 'adafruit:main' into main
2 parents 2ebc0ea + b6a7613 commit ff0a17d

Some content is hidden

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

42 files changed

+1641
-208
lines changed

‎.github/workflows/build.yml

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@ on:
99
pull_request:
1010
release:
1111
types: [published]
12-
check_suite:
13-
types: [rerequested]
1412

1513
concurrency:
1614
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
@@ -64,24 +62,32 @@ jobs:
6462
PULL: ${{ github.event.number }}
6563
GITHUB_TOKEN: ${{ github.token }}
6664
EXCLUDE_COMMIT: ${{ github.event.pull_request.head.sha }}
67-
- name: Set head sha
65+
- name: Set head sha (pull)
6866
if: github.event_name == 'pull_request'
6967
run: echo "HEAD_SHA=${{ github.event.pull_request.head.sha }}" >> $GITHUB_ENV
70-
- name: Set base sha
68+
- name: Set base sha (pull)
7169
if: github.event_name == 'pull_request'
7270
run: |
7371
git fetch --no-tags --no-recurse-submodules --depth=$((DEPTH + 1)) origin $HEAD_SHA
7472
echo "BASE_SHA=$(git rev-list $HEAD_SHA --skip=$DEPTH --max-count=1)" >> $GITHUB_ENV
7573
env:
7674
DEPTH: ${{ steps.get-last-commit-with-checks.outputs.commit_depth || github.event.pull_request.commits }}
75+
- name: Set head sha (push)
76+
if: github.event_name == 'push'
77+
run: echo "HEAD_SHA=${{ github.event.after }}" >> $GITHUB_ENV
78+
- name: Set base sha (push)
79+
if: github.event_name == 'push'
80+
run: git cat-file -e $SHA && echo "BASE_SHA=$SHA" >> $GITHUB_ENV || true
81+
env:
82+
SHA: ${{ github.event.before }}
7783
- name: Get changes
7884
id: get-changes
79-
if: github.event_name == 'pull_request'
85+
if: env.BASE_SHA && env.HEAD_SHA
8086
run: echo $(git diff $BASE_SHA...$HEAD_SHA --name-only) | echo "changed_files=[\"$(sed "s/ /\", \"/g")\"]" >> $GITHUB_OUTPUT
8187
- name: Set matrix
8288
id: set-matrix
83-
working-directory: tools
8489
run: python3 -u ci_set_matrix.py
90+
working-directory: tools
8591
env:
8692
CHANGED_FILES: ${{ steps.get-changes.outputs.changed_files }}
8793
LAST_FAILED_JOBS: ${{ steps.get-last-commit-with-checks.outputs.check_runs }}

‎.github/workflows/create-website-pr.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ name: Update CircuitPython.org
66

77
on:
88
release:
9-
types: [published, rerequested]
9+
types: [published]
1010

1111
jobs:
1212
website:

‎.github/workflows/pre-commit.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
name: pre-commit
66

77
on:
8-
pull_request:
98
push:
9+
pull_request:
1010

1111
concurrency:
1212
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}

‎.gitmodules

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -309,8 +309,7 @@
309309
branch = circuitpython
310310
[submodule "ports/raspberrypi/lib/cyw43-driver"]
311311
path = ports/raspberrypi/lib/cyw43-driver
312-
url = https://github.com/adafruit/cyw43-driver.git
313-
branch = circuitpython8
312+
url = https://github.com/georgerobotics/cyw43-driver.git
314313
[submodule "ports/raspberrypi/lib/lwip"]
315314
path = ports/raspberrypi/lib/lwip
316315
url = https://github.com/adafruit/lwip.git

‎locale/circuitpython.pot

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ msgstr ""
144144
msgid "%q init failed"
145145
msgstr ""
146146

147-
#: shared-bindings/dualbank/__init__.c
147+
#: ports/espressif/bindings/espnow/Peer.c shared-bindings/dualbank/__init__.c
148148
msgid "%q is %q"
149149
msgstr ""
150150

@@ -242,7 +242,7 @@ msgstr ""
242242
msgid "%q=%q"
243243
msgstr ""
244244

245-
#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
245+
#: ports/espressif/common-hal/espidf/__init__.c
246246
#, c-format
247247
msgid "%s error 0x%x"
248248
msgstr ""
@@ -510,6 +510,7 @@ msgstr ""
510510
msgid "Already have all-matches listener"
511511
msgstr ""
512512

513+
#: ports/espressif/bindings/espnow/ESPNow.c
513514
#: ports/espressif/common-hal/espulp/ULP.c
514515
#: shared-module/memorymonitor/AllocationAlarm.c
515516
#: shared-module/memorymonitor/AllocationSize.c
@@ -681,7 +682,7 @@ msgstr ""
681682
msgid "CIRCUITPY drive could not be found or created."
682683
msgstr ""
683684

684-
#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
685+
#: ports/espressif/common-hal/espidf/__init__.c
685686
msgid "CRC or checksum was invalid"
686687
msgstr ""
687688

@@ -1072,7 +1073,7 @@ msgstr ""
10721073
msgid "GNSS init"
10731074
msgstr ""
10741075

1075-
#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
1076+
#: ports/espressif/common-hal/espidf/__init__.c
10761077
msgid "Generic Failure"
10771078
msgstr ""
10781079

@@ -1255,8 +1256,7 @@ msgstr ""
12551256
msgid "Invalid MAC address"
12561257
msgstr ""
12571258

1258-
#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
1259-
#: py/moduerrno.c
1259+
#: ports/espressif/common-hal/espidf/__init__.c py/moduerrno.c
12601260
msgid "Invalid argument"
12611261
msgstr ""
12621262

@@ -1282,7 +1282,7 @@ msgstr ""
12821282
msgid "Invalid multicast MAC address"
12831283
msgstr ""
12841284

1285-
#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
1285+
#: ports/espressif/common-hal/espidf/__init__.c
12861286
msgid "Invalid size"
12871287
msgstr ""
12881288

@@ -1291,7 +1291,7 @@ msgstr ""
12911291
msgid "Invalid socket for TLS"
12921292
msgstr ""
12931293

1294-
#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
1294+
#: ports/espressif/common-hal/espidf/__init__.c
12951295
msgid "Invalid state"
12961296
msgstr ""
12971297

@@ -1323,7 +1323,7 @@ msgstr ""
13231323
msgid "Layer must be a Group or TileGrid subclass"
13241324
msgstr ""
13251325

1326-
#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
1326+
#: ports/espressif/common-hal/espidf/__init__.c
13271327
msgid "MAC address was invalid"
13281328
msgstr ""
13291329

@@ -1679,19 +1679,19 @@ msgstr ""
16791679
msgid "Operation not permitted"
16801680
msgstr ""
16811681

1682-
#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
1682+
#: ports/espressif/common-hal/espidf/__init__.c
16831683
msgid "Operation or feature not supported"
16841684
msgstr ""
16851685

1686-
#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
1686+
#: ports/espressif/common-hal/espidf/__init__.c
16871687
msgid "Operation timed out"
16881688
msgstr ""
16891689

16901690
#: ports/raspberrypi/common-hal/mdns/Server.c
16911691
msgid "Out of MDNS service slots"
16921692
msgstr ""
16931693

1694-
#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
1694+
#: ports/espressif/common-hal/espidf/__init__.c
16951695
msgid "Out of memory"
16961696
msgstr ""
16971697

@@ -1867,7 +1867,7 @@ msgstr ""
18671867
msgid "Read-only filesystem"
18681868
msgstr ""
18691869

1870-
#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
1870+
#: ports/espressif/common-hal/espidf/__init__.c
18711871
msgid "Received response was invalid"
18721872
msgstr ""
18731873

@@ -1887,7 +1887,7 @@ msgstr ""
18871887
msgid "Requested AES mode is unsupported"
18881888
msgstr ""
18891889

1890-
#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
1890+
#: ports/espressif/common-hal/espidf/__init__.c
18911891
msgid "Requested resource not found"
18921892
msgstr ""
18931893

@@ -2338,7 +2338,7 @@ msgstr ""
23382338
msgid "Value length > max_length"
23392339
msgstr ""
23402340

2341-
#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
2341+
#: ports/espressif/common-hal/espidf/__init__.c
23422342
msgid "Version was invalid"
23432343
msgstr ""
23442344

‎locale/es.po

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@ msgstr ""
88
"Project-Id-Version: \n"
99
"Report-Msgid-Bugs-To: \n"
1010
"POT-Creation-Date: 2021-01-04 12:55-0600\n"
11-
"PO-Revision-Date: 2023-02-24 23:20+0000\n"
12-
"Last-Translator: Luis Ruiz San Segundo <luisan00@hotmail.com>\n"
11+
"PO-Revision-Date: 2023-03-09 10:38+0000\n"
12+
"Last-Translator: Jose David M <jquintana202020@gmail.com>\n"
1313
"Language-Team: \n"
1414
"Language: es\n"
1515
"MIME-Version: 1.0\n"
1616
"Content-Type: text/plain; charset=UTF-8\n"
1717
"Content-Transfer-Encoding: 8bit\n"
1818
"Plural-Forms: nplurals=2; plural=n != 1;\n"
19-
"X-Generator: Weblate 4.16-dev\n"
19+
"X-Generator: Weblate 4.16.2-dev\n"
2020

2121
#: main.c
2222
msgid ""
@@ -848,11 +848,11 @@ msgstr ""
848848

849849
#: shared-bindings/bitmaptools/__init__.c
850850
msgid "Coordinate arrays have different lengths"
851-
msgstr ""
851+
msgstr "Las matrices de coordenadas tienen diferentes longitudes"
852852

853853
#: shared-bindings/bitmaptools/__init__.c
854854
msgid "Coordinate arrays types have different sizes"
855-
msgstr ""
855+
msgstr "Las matrices de coordenadas tienen diferentes tamaños"
856856

857857
#: py/persistentcode.c
858858
msgid "Corrupt .mpy file"

‎ports/atmel-samd/common-hal/busio/SPI.c

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -271,10 +271,17 @@ bool common_hal_busio_spi_write(busio_spi_obj_t *self,
271271
size_t bytes_remaining = len;
272272

273273
// Maximum DMA transfer is 65535
274-
while (bytes_remaining > 0) {
274+
while (1) {
275275
size_t to_send = (bytes_remaining > 65535) ? 65535 : bytes_remaining;
276276
status = sercom_dma_write(self->spi_desc.dev.prvt, data + (len - bytes_remaining), to_send);
277277
bytes_remaining -= to_send;
278+
if (bytes_remaining > 0) {
279+
// Multi-part transfer; let other things run before doing the next chunk.
280+
RUN_BACKGROUND_TASKS;
281+
} else {
282+
// All done.
283+
break;
284+
}
278285
}
279286
} else {
280287
struct io_descriptor *spi_io;

‎ports/espressif/Makefile

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -126,9 +126,13 @@ ifeq ($(DEBUG), 1)
126126
# CFLAGS += -fno-inline -fno-ipa-sra
127127
else
128128
CFLAGS += -DNDEBUG -ggdb3
129-
OPTIMIZATION_FLAGS ?= -O2
130129
# RISC-V is larger than xtensa
131130
# Use -Os for RISC-V when it overflows
131+
ifeq ($(IDF_TARGET_ARCH),riscv)
132+
OPTIMIZATION_FLAGS ?= -Os
133+
else
134+
OPTIMIZATION_FLAGS ?= -O2
135+
endif
132136
endif
133137

134138
# option to override compiler optimization level, set in boards/$(BOARD)/mpconfigboard.mk
@@ -214,7 +218,6 @@ endif
214218
SRC_C += \
215219
background.c \
216220
mphalport.c \
217-
bindings/espidf/__init__.c \
218221
boards/$(BOARD)/board.c \
219222
boards/$(BOARD)/pins.c \
220223
shared/netutils/netutils.c \
@@ -248,8 +251,6 @@ ifneq ($(CIRCUITPY_BLEIO),0)
248251
SRC_C += common-hal/_bleio/ble_events.c
249252
endif
250253

251-
SRC_C += $(wildcard common-hal/espidf/*.c)
252-
253254
ifneq ($(CIRCUITPY_ESPCAMERA),0)
254255
SRC_CAMERA := \
255256
$(wildcard common-hal/espcamera/*.c) \
@@ -259,6 +260,20 @@ CFLAGS += -isystem esp32-camera/driver/include
259260
CFLAGS += -isystem esp32-camera/conversions/include
260261
endif
261262

263+
ifneq ($(CIRCUITPY_ESPIDF),0)
264+
SRC_ESPIDF := \
265+
$(wildcard common-hal/espidf/*.c) \
266+
$(wildcard bindings/espidf/*.c)
267+
SRC_C += $(SRC_ESPIDF)
268+
endif
269+
270+
ifneq ($(CIRCUITPY_ESPNOW),0)
271+
SRC_ESPNOW := \
272+
$(wildcard common-hal/espnow/*.c) \
273+
$(wildcard bindings/espnow/*.c)
274+
SRC_C += $(SRC_ESPNOW)
275+
endif
276+
262277
ifneq ($(CIRCUITPY_ESPULP),0)
263278
SRC_ULP := \
264279
$(wildcard common-hal/espulp/*.c) \

0 commit comments

Comments
 (0)