Skip to content

Commit 2af48f2

Browse files
bill88tbill88t
committed
Merge branch 'main' into nodemcu_esp32c2
2 parents 2d18769 + d86e072 commit 2af48f2

File tree

84 files changed

+640
-88
lines changed

Some content is hidden

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

84 files changed

+640
-88
lines changed

‎.github/workflows/custom-board-build.yml renamed to ‎.github/workflows/build-board-custom.yml

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Custom board build
1+
name: Build board (custom)
22

33
on:
44
workflow_dispatch:
@@ -21,6 +21,11 @@ on:
2121
description: 'Flags: Build flags (e.g. CIRCUITPY_WIFI=1)'
2222
required: false
2323
type: string
24+
branch:
25+
description: 'Branch (only if Version="latest")'
26+
required: false
27+
default: 'main'
28+
type: string
2429
debug:
2530
description: 'Make a debug build'
2631
required: false
@@ -36,7 +41,22 @@ jobs:
3641
- name: Set up repository
3742
run: |
3843
git clone --filter=tree:0 https://github.com/adafruit/circuitpython.git $GITHUB_WORKSPACE
44+
- name: Checkout head / tag
45+
run: |
3946
git checkout ${{ inputs.version == 'latest' && 'HEAD' || inputs.version }}
47+
- name: fork compatibility
48+
if: github.repository_owner != 'adafruit'
49+
run: |
50+
git remote add fork https://github.com/${{github.repository}}.git
51+
git fetch fork --filter=tree:0
52+
- name: branch compatibility
53+
if: inputs.branch != 'main' && inputs.version == 'latest' && github.repository_owner == 'adafruit'
54+
run: |
55+
git checkout ${{inputs.branch}}
56+
- name: branch compatibility (fork)
57+
if: inputs.branch != '' && inputs.version == 'latest' && github.repository_owner != 'adafruit'
58+
run: |
59+
git checkout -b fork-branch fork/${{inputs.branch}}
4060
- name: Set up identifier
4161
if: inputs.debug || inputs.flags != ''
4262
run: |

‎.github/workflows/pre-commit.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
- name: Install dependencies
3434
run: |
3535
sudo apt-get update
36-
sudo apt-get install -y gettext uncrustify
36+
sudo apt-get install -y gettext
3737
- name: Run pre-commit
3838
uses: pre-commit/[email protected]
3939
- name: Make patch

‎locale/ID.po

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1181,6 +1181,7 @@ msgstr ""
11811181
msgid "Interrupted by output function"
11821182
msgstr ""
11831183

1184+
#: ports/espressif/common-hal/espulp/ULP.c
11841185
#: ports/mimxrt10xx/common-hal/audiobusio/__init__.c
11851186
#: ports/mimxrt10xx/common-hal/pwmio/PWMOut.c
11861187
#: ports/raspberrypi/bindings/picodvi/Framebuffer.c

‎locale/circuitpython.pot

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1173,6 +1173,7 @@ msgstr ""
11731173
msgid "Interrupted by output function"
11741174
msgstr ""
11751175

1176+
#: ports/espressif/common-hal/espulp/ULP.c
11761177
#: ports/mimxrt10xx/common-hal/audiobusio/__init__.c
11771178
#: ports/mimxrt10xx/common-hal/pwmio/PWMOut.c
11781179
#: ports/raspberrypi/bindings/picodvi/Framebuffer.c

‎locale/cs.po

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1193,6 +1193,7 @@ msgstr "Chyba přerušení."
11931193
msgid "Interrupted by output function"
11941194
msgstr ""
11951195

1196+
#: ports/espressif/common-hal/espulp/ULP.c
11961197
#: ports/mimxrt10xx/common-hal/audiobusio/__init__.c
11971198
#: ports/mimxrt10xx/common-hal/pwmio/PWMOut.c
11981199
#: ports/raspberrypi/bindings/picodvi/Framebuffer.c

‎locale/de_DE.po

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1204,6 +1204,7 @@ msgstr "Interrupt Fehler."
12041204
msgid "Interrupted by output function"
12051205
msgstr "Unterbrochen durch Ausgabefunktion"
12061206

1207+
#: ports/espressif/common-hal/espulp/ULP.c
12071208
#: ports/mimxrt10xx/common-hal/audiobusio/__init__.c
12081209
#: ports/mimxrt10xx/common-hal/pwmio/PWMOut.c
12091210
#: ports/raspberrypi/bindings/picodvi/Framebuffer.c

‎locale/el.po

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1199,6 +1199,7 @@ msgstr ""
11991199
msgid "Interrupted by output function"
12001200
msgstr ""
12011201

1202+
#: ports/espressif/common-hal/espulp/ULP.c
12021203
#: ports/mimxrt10xx/common-hal/audiobusio/__init__.c
12031204
#: ports/mimxrt10xx/common-hal/pwmio/PWMOut.c
12041205
#: ports/raspberrypi/bindings/picodvi/Framebuffer.c

‎locale/en_GB.po

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1192,6 +1192,7 @@ msgstr "Interrupt error."
11921192
msgid "Interrupted by output function"
11931193
msgstr "Interrupted by output function"
11941194

1195+
#: ports/espressif/common-hal/espulp/ULP.c
11951196
#: ports/mimxrt10xx/common-hal/audiobusio/__init__.c
11961197
#: ports/mimxrt10xx/common-hal/pwmio/PWMOut.c
11971198
#: ports/raspberrypi/bindings/picodvi/Framebuffer.c

‎locale/es.po

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1212,6 +1212,7 @@ msgstr "Error de interrupción."
12121212
msgid "Interrupted by output function"
12131213
msgstr ""
12141214

1215+
#: ports/espressif/common-hal/espulp/ULP.c
12151216
#: ports/mimxrt10xx/common-hal/audiobusio/__init__.c
12161217
#: ports/mimxrt10xx/common-hal/pwmio/PWMOut.c
12171218
#: ports/raspberrypi/bindings/picodvi/Framebuffer.c

‎locale/fil.po

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1183,6 +1183,7 @@ msgstr ""
11831183
msgid "Interrupted by output function"
11841184
msgstr ""
11851185

1186+
#: ports/espressif/common-hal/espulp/ULP.c
11861187
#: ports/mimxrt10xx/common-hal/audiobusio/__init__.c
11871188
#: ports/mimxrt10xx/common-hal/pwmio/PWMOut.c
11881189
#: ports/raspberrypi/bindings/picodvi/Framebuffer.c

0 commit comments

Comments
 (0)