Skip to content

Commit 79f3456

Browse files
authored
Merge branch 'main' into mixervoice-loop-property
2 parents 372759f + 053cdfc commit 79f3456

File tree

170 files changed

+5872
-369
lines changed

Some content is hidden

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

170 files changed

+5872
-369
lines changed

.devcontainer/add_kitware_archive.sh

Lines changed: 107 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,107 @@
1+
#!/bin/sh
2+
# -----------------------------------------------------------------------------
3+
# This script is from: https://apt.kitware.com/kitware-archive.sh
4+
#
5+
# It installs key and repo for the kitware CMAKE-archive.
6+
#
7+
# Author: Bernhard Bablok
8+
#
9+
# -----------------------------------------------------------------------------
10+
11+
set -eu
12+
13+
help() {
14+
echo "Usage: $0 [--release <ubuntu-release>] [--rc]" > /dev/stderr
15+
}
16+
17+
doing=
18+
rc=
19+
release=
20+
help=
21+
for opt in "$@"
22+
do
23+
case "${doing}" in
24+
release)
25+
release="${opt}"
26+
doing=
27+
;;
28+
"")
29+
case "${opt}" in
30+
--rc)
31+
rc=1
32+
;;
33+
--release)
34+
doing=release
35+
;;
36+
--help)
37+
help=1
38+
;;
39+
esac
40+
;;
41+
esac
42+
done
43+
44+
if [ -n "${doing}" ]
45+
then
46+
echo "--${doing} option given no argument." > /dev/stderr
47+
echo > /dev/stderr
48+
help
49+
exit 1
50+
fi
51+
52+
if [ -n "${help}" ]
53+
then
54+
help
55+
exit
56+
fi
57+
58+
if [ -z "${release}" ]
59+
then
60+
unset UBUNTU_CODENAME
61+
. /etc/os-release
62+
63+
if [ -z "${UBUNTU_CODENAME+x}" ]
64+
then
65+
echo "This is not an Ubuntu system. Aborting." > /dev/stderr
66+
exit 1
67+
fi
68+
69+
release="${UBUNTU_CODENAME}"
70+
fi
71+
72+
case "${release}" in
73+
noble|jammy|focal)
74+
packages=
75+
keyring_packages="ca-certificates gpg wget"
76+
;;
77+
*)
78+
echo "Only Ubuntu Noble (24.04), Jammy (22.04), and Focal (20.04) are supported. Aborting." > /dev/stderr
79+
exit 1
80+
;;
81+
esac
82+
83+
get_keyring=
84+
if [ ! -f /usr/share/doc/kitware-archive-keyring/copyright ]
85+
then
86+
packages="${packages} ${keyring_packages}"
87+
get_keyring=1
88+
fi
89+
90+
# Start the real work
91+
set -x
92+
93+
apt-get update
94+
# shellcheck disable=SC2086
95+
apt-get install -y ${packages}
96+
97+
test -n "${get_keyring}" && (wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | gpg --dearmor - > /usr/share/keyrings/kitware-archive-keyring.gpg)
98+
99+
echo "deb [signed-by=/usr/share/keyrings/kitware-archive-keyring.gpg] https://apt.kitware.com/ubuntu/ ${release} main" > /etc/apt/sources.list.d/kitware.list
100+
if [ -n "${rc}" ]
101+
then
102+
echo "deb [signed-by=/usr/share/keyrings/kitware-archive-keyring.gpg] https://apt.kitware.com/ubuntu/ ${release}-rc main" >> /etc/apt/sources.list.d/kitware.list
103+
fi
104+
105+
apt-get update
106+
test -n "${get_keyring}" && rm /usr/share/keyrings/kitware-archive-keyring.gpg
107+
apt-get install -y kitware-archive-keyring

.devcontainer/common_tools.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,11 @@ cd "$REPO_ROOT"
1515

1616
# --- repositories and tools ------------------------------------------------
1717

18+
echo -e "[common_tools.sh] adding kitware-archive (for current CMAKE)"
19+
sudo .devcontainer/add_kitware_archive.sh
20+
echo -e "[common_tools.sh] installing current version of CMAKE"
21+
sudo apt-get -y install cmake
22+
1823
echo -e "[common_tools.sh] adding pybricks/ppa"
1924
sudo add-apt-repository -y ppa:pybricks/ppa
2025
echo -e "[common_tools.sh] installing uncrustify and mtools"

.gitmodules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -407,3 +407,6 @@
407407
[submodule "frozen/Adafruit_CircuitPython_Wiznet5k"]
408408
path = frozen/Adafruit_CircuitPython_Wiznet5k
409409
url = https://github.com/adafruit/Adafruit_CircuitPython_Wiznet5k
410+
[submodule "ports/analog/msdk"]
411+
path = ports/analog/msdk
412+
url = https://github.com/analogdevicesinc/msdk.git

docs/shared_bindings_matrix.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
from concurrent.futures import ThreadPoolExecutor
3232

3333
SUPPORTED_PORTS = [
34+
"analog",
3435
"atmel-samd",
3536
"broadcom",
3637
"cxd56",

docs/supported_ports.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ Additional testing is limited.
1212
.. toctree::
1313
:maxdepth: 2
1414

15+
../ports/analog/README
1516
../ports/atmel-samd/README
1617
../ports/broadcom/README
1718
../ports/cxd56/README

locale/ID.po

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -751,8 +751,8 @@ msgstr ""
751751
#: ports/espressif/common-hal/alarm/pin/PinAlarm.c
752752
msgid "Can only alarm on two low pins from deep sleep."
753753
msgstr ""
754-
"Hanya dapat mengaktifkan alarm pada dua pin rendah dari mode tidur dalam ("
755-
"deep sleep)."
754+
"Hanya dapat mengaktifkan alarm pada dua pin rendah dari mode tidur dalam "
755+
"(deep sleep)."
756756

757757
#: ports/espressif/common-hal/_bleio/Characteristic.c
758758
#: ports/nordic/common-hal/_bleio/Characteristic.c
@@ -2549,6 +2549,10 @@ msgstr "typecode buruk"
25492549
msgid "binary op %q not implemented"
25502550
msgstr ""
25512551

2552+
#: ports/espressif/common-hal/audiobusio/PDMIn.c
2553+
msgid "bit_depth must be 8, 16, 24, or 32."
2554+
msgstr ""
2555+
25522556
#: shared-module/bitmapfilter/__init__.c
25532557
msgid "bitmap size and depth must match"
25542558
msgstr ""
@@ -2643,7 +2647,7 @@ msgstr "tidak dapat menetapkan ke ekspresi"
26432647
msgid "can't cancel self"
26442648
msgstr ""
26452649

2646-
#: shared-module/adafruit_pixelbuf/PixelBuf.c
2650+
#: py/obj.c shared-module/adafruit_pixelbuf/PixelBuf.c
26472651
msgid "can't convert %q to %q"
26482652
msgstr ""
26492653

locale/circuitpython.pot

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2498,6 +2498,10 @@ msgstr ""
24982498
msgid "binary op %q not implemented"
24992499
msgstr ""
25002500

2501+
#: ports/espressif/common-hal/audiobusio/PDMIn.c
2502+
msgid "bit_depth must be 8, 16, 24, or 32."
2503+
msgstr ""
2504+
25012505
#: shared-module/bitmapfilter/__init__.c
25022506
msgid "bitmap size and depth must match"
25032507
msgstr ""
@@ -2592,7 +2596,7 @@ msgstr ""
25922596
msgid "can't cancel self"
25932597
msgstr ""
25942598

2595-
#: shared-module/adafruit_pixelbuf/PixelBuf.c
2599+
#: py/obj.c shared-module/adafruit_pixelbuf/PixelBuf.c
25962600
msgid "can't convert %q to %q"
25972601
msgstr ""
25982602

locale/cs.po

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2529,6 +2529,10 @@ msgstr ""
25292529
msgid "binary op %q not implemented"
25302530
msgstr ""
25312531

2532+
#: ports/espressif/common-hal/audiobusio/PDMIn.c
2533+
msgid "bit_depth must be 8, 16, 24, or 32."
2534+
msgstr ""
2535+
25322536
#: shared-module/bitmapfilter/__init__.c
25332537
msgid "bitmap size and depth must match"
25342538
msgstr ""
@@ -2623,7 +2627,7 @@ msgstr ""
26232627
msgid "can't cancel self"
26242628
msgstr "nelze zrušit sám sebe"
26252629

2626-
#: shared-module/adafruit_pixelbuf/PixelBuf.c
2630+
#: py/obj.c shared-module/adafruit_pixelbuf/PixelBuf.c
26272631
msgid "can't convert %q to %q"
26282632
msgstr "není možné převést %q na %q"
26292633

locale/de_DE.po

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2561,6 +2561,10 @@ msgstr "Falscher Typcode"
25612561
msgid "binary op %q not implemented"
25622562
msgstr "Der binäre Operator %q ist nicht implementiert"
25632563

2564+
#: ports/espressif/common-hal/audiobusio/PDMIn.c
2565+
msgid "bit_depth must be 8, 16, 24, or 32."
2566+
msgstr ""
2567+
25642568
#: shared-module/bitmapfilter/__init__.c
25652569
msgid "bitmap size and depth must match"
25662570
msgstr "Bitmap-Größen und -Tiefe müssen übereinstimmen"
@@ -2657,7 +2661,7 @@ msgstr "kann keinem Ausdruck zuweisen"
26572661
msgid "can't cancel self"
26582662
msgstr "kann self nicht abbrechen"
26592663

2660-
#: shared-module/adafruit_pixelbuf/PixelBuf.c
2664+
#: py/obj.c shared-module/adafruit_pixelbuf/PixelBuf.c
26612665
msgid "can't convert %q to %q"
26622666
msgstr "kann %q nicht zu %q konvertieren"
26632667

locale/el.po

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2526,6 +2526,10 @@ msgstr ""
25262526
msgid "binary op %q not implemented"
25272527
msgstr ""
25282528

2529+
#: ports/espressif/common-hal/audiobusio/PDMIn.c
2530+
msgid "bit_depth must be 8, 16, 24, or 32."
2531+
msgstr ""
2532+
25292533
#: shared-module/bitmapfilter/__init__.c
25302534
msgid "bitmap size and depth must match"
25312535
msgstr ""
@@ -2620,7 +2624,7 @@ msgstr ""
26202624
msgid "can't cancel self"
26212625
msgstr ""
26222626

2623-
#: shared-module/adafruit_pixelbuf/PixelBuf.c
2627+
#: py/obj.c shared-module/adafruit_pixelbuf/PixelBuf.c
26242628
msgid "can't convert %q to %q"
26252629
msgstr ""
26262630

0 commit comments

Comments
 (0)