Skip to content

Commit 5638526

Browse files
authored
Merge branch 'adafruit:main' into seeed_xiao_esp32s3
2 parents f31e3ad + 5e4cecd commit 5638526

File tree

2 files changed

+11
-6
lines changed

2 files changed

+11
-6
lines changed

locale/zh_Latn_pinyin.po

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@ msgstr ""
77
"Project-Id-Version: circuitpython-cn\n"
88
"Report-Msgid-Bugs-To: \n"
99
"POT-Creation-Date: 2021-01-04 12:55-0600\n"
10-
"PO-Revision-Date: 2024-07-01 04:38+0000\n"
10+
"PO-Revision-Date: 2024-08-19 18:09+0000\n"
1111
"Last-Translator: hexthat <[email protected]>\n"
1212
"Language-Team: Chinese Hanyu Pinyin\n"
1313
"Language: zh_Latn_pinyin\n"
1414
"MIME-Version: 1.0\n"
1515
"Content-Type: text/plain; charset=UTF-8\n"
1616
"Content-Transfer-Encoding: 8bit\n"
1717
"Plural-Forms: nplurals=1; plural=0;\n"
18-
"X-Generator: Weblate 5.7-dev\n"
18+
"X-Generator: Weblate 5.7\n"
1919

2020
#: main.c
2121
msgid ""
@@ -1227,7 +1227,7 @@ msgstr "wú xiào %q"
12271227
#: ports/raspberrypi/common-hal/picodvi/Framebuffer_RP2350.c
12281228
#: shared-module/aurora_epaper/aurora_framebuffer.c
12291229
msgid "Invalid %q and %q"
1230-
msgstr ""
1230+
msgstr "wúxiàode %q hé %q"
12311231

12321232
#: ports/atmel-samd/common-hal/microcontroller/Pin.c
12331233
#: ports/espressif/common-hal/dotclockframebuffer/DotClockFramebuffer.c
@@ -1329,7 +1329,7 @@ msgstr "tú céng bìxū shì zǔ huò píng pū wǎng gé zi lèi"
13291329

13301330
#: shared-bindings/audiocore/RawSample.c
13311331
msgid "Length of %q must be an even multiple of channel_count * type_size"
1332-
msgstr ""
1332+
msgstr "%q de chángdù bìxū shì channel_count * type_size de ǒu shùbèi"
13331333

13341334
#: ports/espressif/common-hal/espidf/__init__.c
13351335
msgid "MAC address was invalid"
@@ -2281,7 +2281,7 @@ msgstr "bù zhīchí de hā xī suànfǎ"
22812281

22822282
#: ports/espressif/common-hal/socketpool/Socket.c
22832283
msgid "Unsupported socket type"
2284-
msgstr ""
2284+
msgstr "bù zhīchí de tàojiēzì lèixíng"
22852285

22862286
#: ports/espressif/common-hal/_bleio/Adapter.c
22872287
#: ports/espressif/common-hal/dualbank/__init__.c

ports/nordic/common-hal/alarm/pin/PinAlarm.c

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,11 +123,16 @@ void alarm_pin_pinalarm_reset(void) {
123123
static void configure_pins_for_sleep(void) {
124124
_pinhandler_gpiote_count = 0;
125125

126+
int n_pin_alarms = __builtin_popcountll(high_alarms) + __builtin_popcountll(low_alarms);
127+
const int MAX_N_PIN_ALARMS_FOR_SENSE_FEATURE = 2;
128+
126129
nrfx_gpiote_in_config_t cfg = {
127130
.sense = NRF_GPIOTE_POLARITY_TOGGLE,
128131
.pull = NRF_GPIO_PIN_PULLUP,
129132
.is_watcher = false,
130-
.hi_accuracy = true,
133+
// hi_accuracy = False reduces sleep current by a factor of ~10x by using the SENSE feature,
134+
// but only works if not more than MAX_N_PIN_ALARMS_FOR_SENSE_FEATURE pin alarms are used.
135+
.hi_accuracy = (n_pin_alarms > MAX_N_PIN_ALARMS_FOR_SENSE_FEATURE),
131136
.skip_gpio_setup = false
132137
};
133138
for (size_t i = 0; i < 64; ++i) {

0 commit comments

Comments
 (0)