Skip to content

Commit 6b8b58e

Browse files
its-kronosits-kronos
authored
Merge branch 'adafruit:main' into main
2 parents 58062e0 + 65cfcb8 commit 6b8b58e

File tree

40 files changed

+310
-60
lines changed

40 files changed

+310
-60
lines changed

‎.github/actions/deps/ports/nordic/action.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ runs:
55
steps:
66
- name: Get nrfutil 7+
77
run: |
8-
wget https://developer.nordicsemi.com/.pc-tools/nrfutil/x64-linux/nrfutil
8+
wget https://files.nordicsemi.com/artifactory/swtools/external/nrfutil/executables/x86_64-unknown-linux-gnu/nrfutil
99
chmod +x nrfutil
1010
./nrfutil install nrf5sdk-tools
1111
mkdir -p $HOME/.local/bin

‎locale/es.po‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ 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: 2025-07-17 04:01+0000\n"
12-
"Last-Translator: Jean Serrano <[email protected]>\n"
11+
"PO-Revision-Date: 2025-08-03 08:01+0000\n"
12+
"Last-Translator: MAE <[email protected]>\n"
1313
"Language-Team: \n"
1414
"Language: es\n"
1515
"MIME-Version: 1.0\n"
@@ -1803,10 +1803,9 @@ msgid "PWM slice channel A already in use"
18031803
msgstr "Segmento del PWM canal A ya esta en uso"
18041804

18051805
#: shared-bindings/spitarget/SPITarget.c
1806-
#, fuzzy
18071806
msgid "Packet buffers for an SPI transfer must have the same length."
18081807
msgstr ""
1809-
"Búferes de paquetes para transferencia SPI deben de ser de igual longitud"
1808+
"Búferes de paquetes para transferencia SPI deben de ser de igual longitud."
18101809

18111810
#: shared-module/jpegio/JpegDecoder.c
18121811
msgid "Parameter error"

‎locale/fr.po‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ msgstr ""
88
"Project-Id-Version: 0.1\n"
99
"Report-Msgid-Bugs-To: \n"
1010
"POT-Creation-Date: 2021-01-04 12:55-0600\n"
11-
"PO-Revision-Date: 2025-06-30 16:01+0000\n"
11+
"PO-Revision-Date: 2025-08-03 08:01+0000\n"
1212
"Last-Translator: MAE <[email protected]>\n"
1313
"Language-Team: \n"
1414
"Language: fr\n"
@@ -49,15 +49,15 @@ msgid ""
4949
"Press reset to exit safe mode.\n"
5050
msgstr ""
5151
"\n"
52-
"Pour quitter le mode sans échec, appuyez sur reset.\n"
52+
"Appuyer sur reset pour sortir du mode sans échec.\n"
5353

5454
#: supervisor/shared/safe_mode.c
5555
msgid ""
5656
"\n"
5757
"You are in safe mode because:\n"
5858
msgstr ""
5959
"\n"
60-
"Le mode sans échec est actif , car:\n"
60+
"Le mode sans échec est actif pour cette raison:\n"
6161

6262
#: py/obj.c
6363
msgid " File \"%q\""
@@ -1879,15 +1879,15 @@ msgstr "Plus tout autres modules présents sur le système de fichiers\n"
18791879

18801880
#: shared-module/vectorio/Polygon.c
18811881
msgid "Polygon needs at least 3 points"
1882-
msgstr "Polygon a besoin d'au moins 3 points"
1882+
msgstr "Un polygone a besoin d'au moins 3 points"
18831883

18841884
#: supervisor/shared/safe_mode.c
18851885
msgid "Power dipped. Make sure you are providing enough power."
1886-
msgstr "Chute de puissance.Apportez plus d'énergie."
1886+
msgstr "Chute de puissance. Assurez-vous de fournir assez de puissance."
18871887

18881888
#: shared-bindings/_bleio/Adapter.c
18891889
msgid "Prefix buffer must be on the heap"
1890-
msgstr "Le tampon de préfixe doit être sur la pile"
1890+
msgstr "Le tampon de préfixe doit être sur le tas"
18911891

18921892
#: main.c
18931893
msgid "Press any key to enter the REPL. Use CTRL-D to reload.\n"
@@ -1919,11 +1919,12 @@ msgstr "Programme trop long"
19191919

19201920
#: shared-bindings/rclcpy/Publisher.c
19211921
msgid "Publishers can only be created from a parent node"
1922-
msgstr "Les Publishers ne peuvent etre crées que du noeud parent"
1922+
msgstr "Les Publishers ne peuvent être créés qu'à partir du nœud parent"
19231923

19241924
#: shared-bindings/digitalio/DigitalInOut.c
19251925
msgid "Pull not used when direction is output."
1926-
msgstr "Le tirage 'pull' n'est pas utilisé quand la direction est 'output'."
1926+
msgstr ""
1927+
"L'attribut \"pull\" n'est pas utilisé quand la direction est \"output\"."
19271928

19281929
#: ports/raspberrypi/common-hal/countio/Counter.c
19291930
msgid "RISE_AND_FALL not available on this chip"
@@ -2024,7 +2025,7 @@ msgstr "Format correct mais non supporté"
20242025

20252026
#: main.c
20262027
msgid "Running in safe mode! Not running saved code.\n"
2027-
msgstr "Mode sans- échec ! Le code sauvegardé n'est pas éxecuté.\n"
2028+
msgstr "Mode sans échec ! Le code sauvegardé n'est pas éxecuté.\n"
20282029

20292030
#: shared-module/sdcardio/SDCard.c
20302031
msgid "SD card CSD format not supported"
@@ -3971,7 +3972,7 @@ msgstr "seules les tranches avec 'step=1' (cad None) sont supportées"
39713972

39723973
#: py/vm.c
39733974
msgid "opcode"
3974-
msgstr "opcode"
3975+
msgstr ""
39753976

39763977
#: extmod/ulab/code/ndarray.c extmod/ulab/code/numpy/bitwise.c
39773978
#: extmod/ulab/code/numpy/compare.c extmod/ulab/code/numpy/vector.c

‎locale/pl.po‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ msgstr ""
77
"Project-Id-Version: \n"
88
"Report-Msgid-Bugs-To: \n"
99
"POT-Creation-Date: 2021-01-04 12:55-0600\n"
10-
"PO-Revision-Date: 2025-07-23 09:07+0000\n"
11-
"Last-Translator: MuskoM <[email protected]>\n"
10+
"PO-Revision-Date: 2025-08-06 18:01+0000\n"
11+
"Last-Translator: MAE <[email protected]>\n"
1212
"Language-Team: pl\n"
1313
"Language: pl\n"
1414
"MIME-Version: 1.0\n"
@@ -90,8 +90,8 @@ msgstr "%%c wymaga int lub char"
9090
msgid ""
9191
"%d address pins, %d rgb pins and %d tiles indicate a height of %d, not %d"
9292
msgstr ""
93-
"%d pinów adresowalnych, %d pinów rgb oraz %d płytek wskazują na wysokość "
94-
"%d, nie %d"
93+
"%d pinów adresowalnych, %d pinów rgb oraz %d płytek wskazują na wysokość %d, "
94+
"nie %d"
9595

9696
#: shared-bindings/microcontroller/Pin.c
9797
msgid "%q and %q contain duplicate pins"
@@ -204,7 +204,7 @@ msgstr ""
204204

205205
#: py/argcheck.c
206206
msgid "%q must be >= %d"
207-
msgstr ""
207+
msgstr "%q musi być >= %d"
208208

209209
#: shared-bindings/analogbufio/BufferedIn.c
210210
msgid "%q must be a bytearray or array of type 'H' or 'B'"

‎ports/analog/Makefile‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
#
33
# SPDX-FileCopyrightText: Copyright (c) 2020 Scott Shawcroft for Adafruit Industries
44
# SPDX-FileCopyrightText: Copyright (c) 2024 Brandon Hurst, Analog Devices, Inc.
5+
# SPDX-FileCopyrightText: Copyright (c) 2025 Peggy Zhu, Analog Devices, Inc.
56
#
67
# SPDX-License-Identifier: MIT
78

@@ -83,7 +84,8 @@ INC += \
8384
-I$(PERIPH_SRC)/ICC \
8485
-I$(PERIPH_SRC)/TMR \
8586
-I$(PERIPH_SRC)/RTC \
86-
-I$(PERIPH_SRC)/UART
87+
-I$(PERIPH_SRC)/UART \
88+
-I$(PERIPH_SRC)/TRNG
8789

8890
INC += -I$(CMSIS_ROOT)/Device/Maxim/$(MCU_VARIANT_UPPER)/Source/GCC
8991

@@ -116,7 +118,9 @@ SRC_MAX32 += \
116118
$(PERIPH_SRC)/TMR/tmr_$(DIE_TYPE).c \
117119
$(PERIPH_SRC)/UART/uart_common.c \
118120
$(PERIPH_SRC)/UART/uart_$(DIE_TYPE).c \
119-
$(PERIPH_SRC)/UART/uart_revb.c
121+
$(PERIPH_SRC)/UART/uart_revb.c \
122+
$(PERIPH_SRC)/TRNG/trng_revb.c \
123+
$(PERIPH_SRC)/TRNG/trng_$(DIE_TYPE).c
120124

121125
SRC_C += $(SRC_MAX32) \
122126
boards/$(BOARD)/board.c \

‎ports/analog/common-hal/os/__init__.c‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
//
33
// SPDX-FileCopyrightText: Copyright (c) 2017 Scott Shawcroft for Adafruit Industries
44
// SPDX-FileCopyrightText: Copyright (c) 2019 Lucian Copeland for Adafruit Industries
5+
// SPDX-FileCopyrightText: Copyright (c) 2025 Peggy Zhu, Analog Devices, Inc.
56
//
67
// SPDX-License-Identifier: MIT
78

@@ -15,9 +16,14 @@
1516

1617
// #include "peripherals/periph.h"
1718

19+
// true random number generator, TRNG
20+
#include "trng.h"
21+
1822
bool common_hal_os_urandom(uint8_t *buffer, uint32_t length) {
1923
#if (HAS_TRNG)
20-
// todo (low prior): implement
24+
// get a random number of "length" number of bytes
25+
MXC_TRNG_Random(buffer, length);
26+
return true;
2127
#else
2228
#endif
2329
return false;

‎ports/analog/mpconfigport.mk‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
#
33
# SPDX-FileCopyrightText: Copyright (c) 2020 Scott Shawcroft for Adafruit Industries
44
# SPDX-FileCopyrightText: Copyright (c) 2024 Brandon Hurst, Analog Devices, Inc.
5+
# SPDX-FileCopyrightText: Copyright (c) 2025 Peggy Zhu, Analog Devices, Inc.
56
#
67
# SPDX-License-Identifier: MIT
78

@@ -51,7 +52,7 @@ CIRCUITPY_BITBANGIO ?= 1
5152
# Requires Microcontroller
5253
CIRCUITPY_TOUCHIO ?= 1
5354
# Requires OS
54-
CIRCUITPY_RANDOM ?= 0
55+
CIRCUITPY_RANDOM ?= 1
5556
# Requires busio.UART
5657
CIRCUITPY_CONSOLE_UART ?= 0
5758
# Does nothing without I2C

‎ports/analog/supervisor/port.c‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,9 @@
4444
#include "mxc_delay.h"
4545
#include "rtc.h"
4646

47+
// true random number generator, TRNG
48+
#include "trng.h"
49+
4750
// msec to RTC subsec ticks (4 kHz)
4851
/* Converts a time in milleseconds to equivalent RSSA register value */
4952
#define MSEC_TO_SS_ALARM(x) (0 - ((x * 4096) / 1000))
@@ -112,9 +115,18 @@ safe_mode_t port_init(void) {
112115
}
113116
;
114117

118+
// enable TRNG (true random number generator)
119+
#ifdef CIRCUITPY_RANDOM
120+
MXC_TRNG_Init();
121+
#endif
122+
115123
return SAFE_MODE_NONE;
116124
}
117125

126+
void TRNG_IRQHandler(void) {
127+
MXC_TRNG_Handler();
128+
}
129+
118130
void RTC_IRQHandler(void) {
119131
// Read flags to clear
120132
int flags = MXC_RTC_GetFlags();

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@ void board_init(void) {
7676
NO_COMMAND, // write_color_ram_command (can add this for grayscale eventually)
7777
false, // color_bits_inverted
7878
0x000000, // highlight_color
79+
0x000000, // highlight_color2
7980
refresh_sequence, // refresh_display_sequence
8081
sizeof(refresh_sequence),
8182
40, // refresh_time

‎ports/espressif/README.rst‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -222,4 +222,3 @@ And follow the Espressif GDB tutorial `instructions for connecting <https://docs
222222
mon reset halt
223223
flushregs
224224
thb app_main
225-
c

0 commit comments

Comments
 (0)