8000 Merge remote-tracking branch 'upstream/main' into jerryn_gpio · domdfcoding/circuitpython@7cdffba · GitHub
[go: up one dir, main page]

Skip to content

Commit 7cdffba

Browse files
committed
Merge remote-tracking branch 'upstream/main' into jerryn_gpio
2 parents ed3ddea + cd7e879 commit 7cdffba

Some content is hidden

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

54 files changed

+178
-127
lines changed

locale/ID.po

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -669,6 +669,10 @@ msgstr "Bytes harus di antara 0 dan 255."
669669
msgid "CBC blocks must be multiples of 16 bytes"
670670
msgstr "Blok CBC harus merupakan kelipatan 16 byte"
671671

672+
#: supervisor/shared/safe_mode.c
673+
msgid "CIRCUITPY drive could not be found or created."
674+
msgstr ""
675+
672676
#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
673677
msgid "CRC or checksum was invalid"
674678
msgstr ""

locale/circuitpython.pot

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -659,6 +659,10 @@ msgstr ""
659659
msgid "CBC blocks must be multiples of 16 bytes"
660660
msgstr ""
661661

662+
#: supervisor/shared/safe_mode.c
663+
msgid "CIRCUITPY drive could not be found or created."
664+
msgstr ""
665+
662666
#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
663667
msgid "CRC or checksum was invalid"
664668
msgstr ""

locale/cs.po

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -668,6 +668,10 @@ msgstr ""
668668
msgid "CBC blocks must be multiples of 16 bytes"
669669
msgstr ""
670670

671+
#: supervisor/shared/safe_mode.c
672+
msgid "CIRCUITPY drive could not be found or created."
673+
msgstr ""
674+
671675
#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
672676
msgid "CRC or checksum was invalid"
673677
msgstr ""

locale/de_DE.po

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -670,6 +670,10 @@ msgstr "Ein Bytes kann nur Werte zwischen 0 und 255 annehmen."
670670
msgid "CBC blocks must be multiples of 16 bytes"
671671
msgstr "CBC-Blöcke müssen ein Vielfaches von 16 Bytes sein"
672672

673+
#: supervisor/shared/safe_mode.c
674+
msgid "CIRCUITPY drive could not be found or created."
675+
msgstr ""
676+
673677
#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
674678
msgid "CRC or checksum was invalid"
675679
msgstr "CRC oder Checksumme ungültig"

locale/el.po

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -659,6 +659,10 @@ msgstr ""
659659
msgid "CBC blocks must be multiples of 16 bytes"
660660
msgstr ""
661661

662+
#: supervisor/shared/safe_mode.c
663+
msgid "CIRCUITPY drive could not be found or created."
664+
msgstr ""
665+
662666
#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
663667
msgid "CRC or checksum was invalid"
664668
msgstr ""

locale/en_GB.po

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -670,6 +670,10 @@ msgstr "Bytes must be between 0 and 255."
670670
msgid "CBC blocks must be multiples of 16 bytes"
671671
msgstr "CBC blocks must be multiples of 16 bytes"
672672

673+
#: supervisor/shared/safe_mode.c
674+
msgid "CIRCUITPY drive could not be found or created."
675+
msgstr ""
676+
673677
#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
674678
msgid "CRC or checksum was invalid"
675679
msgstr "CRC or checksum was invalid"

locale/es.po

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -675,6 +675,10 @@ msgstr "Bytes debe estar entre 0 y 255."
675675
msgid "CBC blocks must be multiples of 16 bytes"
676676
msgstr "Los bloques CBC deben ser múltiplos de 16 bytes"
677677

678+
#: supervisor/shared/safe_mode.c
679+
msgid "CIRCUITPY drive could not be found or created."
680+
msgstr ""
681+
678682
#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
679683
msgid "CRC or checksum was invalid"
680684
msgstr "CRC o suma de comprobación inválida"

locale/fil.po

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -667,6 +667,10 @@ msgstr "Sa gitna ng 0 o 255 dapat ang bytes."
667667
msgid "CBC blocks must be multiples of 16 bytes"
668668
msgstr ""
669669

670+
#: supervisor/shared/safe_mode.c
671+
msgid "CIRCUITPY drive could not be found or created."
672+
msgstr ""
673+
670674
#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
671675
msgid "CRC or checksum was invalid"
672676
msgstr ""

locale/fr.po

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -676,6 +676,10 @@ msgstr "Les octets 'bytes' doivent être entre 0 et 255."
676676
msgid "CBC blocks must be multiples of 16 bytes"
677677
msgstr "Les blocs CBC doivent être des multiples de 16 octets"
678678

679+
#: supervisor/shared/safe_mode.c
680+
msgid "CIRCUITPY drive could not be found or created."
681+
msgstr ""
682+
679683
#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
680684
msgid "CRC or checksum was invalid"
681685
msgstr "CRC ou somme de contrôle invalide"

locale/hi.po

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -659,6 +659,10 @@ msgstr ""
659659
msgid "CBC blocks must be multiples of 16 bytes"
660660
msgstr ""
661661

662+
#: supervisor/shared/safe_mode.c
663+
msgid "CIRCUITPY drive could not be found or created."
664+
msgstr ""
665+
662666
#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
663667
msgid "CRC or checksum was invalid"
664668
msgstr ""

locale/it_IT.po

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -674,6 +674,10 @@ msgstr "I byte devono essere compresi tra 0 e 255."
674674
msgid "CBC blocks must be multiples of 16 bytes"
675675
msgstr "I blocchi CBC devono essere multipli di 16 bytes"
676676

677+
#: supervisor/shared/safe_mode.c
678+
msgid "CIRCUITPY drive could not be found or created."
679+
msgstr ""
680+
677681
#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
678682
msgid "CRC or checksum was invalid"
679683
msgstr "CRC o controllo totale è risultato non valido"

locale/ja.po

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -666,6 +666,10 @@ msgstr "バイト値は0から255の間でなければなりません"
666666
msgid "CBC blocks must be multiples of 16 bytes"
667667
msgstr "CBCブロックは16バイトの整数倍でなければなりません"
668668

669+
#: supervisor/shared/safe_mode.c
670+
msgid "CIRCUITPY drive could not be found or created."
671+
msgstr ""
672+
669673
#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
670674
msgid "CRC or checksum was invalid"
671675
msgstr ""

locale/ko.po

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -662,6 +662,10 @@ msgstr "바이트는 0에서 255 사이 여야합니다."
662662
msgid "CBC blocks must be multiples of 16 bytes"
663663
msgstr ""
664664

665+
#: supervisor/shared/safe_mode.c
666+
msgid "CIRCUITPY drive could not be found or created."
667+
msgstr ""
668+
665669
#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
666670
msgid "CRC or checksum was invalid"
667671
msgstr ""

locale/nl.po

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -664,6 +664,10 @@ msgstr "Bytes moeten tussen 0 en 255 liggen."
664664
msgid "CBC blocks must be multiples of 16 bytes"
665665
msgstr "CBC blocks moeten meervouden van 16 bytes zijn"
666666

667+
#: supervisor/shared/safe_mode.c
668+
msgid "CIRCUITPY drive could not be found or created."
669+
msgstr ""
670+
667671
#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
668672
msgid "CRC or checksum was invalid"
669673
msgstr ""

locale/pl.po

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -666,6 +666,10 @@ msgstr "Bytes musi być między 0 a 255."
666666
msgid "CBC blocks must be multiples of 16 bytes"
667667
msgstr "Bloki CBC muszą być wielokrotnościami 16 bajtów"
668668

669+
#: supervisor/shared/safe_mode.c
670+
msgid "CIRCUITPY drive could not be found or created."
671+
msgstr ""
672+
669673
#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
670674
msgid "CRC or checksum was invalid"
671675
msgstr ""

locale/pt_BR.po

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -679,6 +679,10 @@ msgstr "Os bytes devem estar entre 0 e 255."
679679
msgid "CBC blocks must be multiples of 16 bytes"
680680
msgstr "Os blocos CBC devem ter múltiplos de 16 bytes"
681681

682+
#: supervisor/shared/safe_mode.c
683+
msgid "CIRCUITPY drive could not be found or created."
684+
msgstr ""
685+
682686
#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
683687
msgid "CRC or checksum was invalid"
684688
msgstr "CRC ou checksum inválido"

locale/ru.po

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -677,6 +677,10 @@ msgstr "Bytes должен быть в диапазоне от 0 до 255."
677677
msgid "CBC blocks must be multiples of 16 bytes"
678678
msgstr "Блоки CBC должны быть кратны 16 байтам"
679679

680+
#: supervisor/shared/safe_mode.c
681+
msgid "CIRCUITPY drive could not be found or created."
682+
msgstr ""
683+
680684
#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
681685
msgid "CRC or checksum was invalid"
682686
msgstr "CRC или контрольная сумма неправильная"

locale/sv.po

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -669,6 +669,10 @@ msgstr "Bytes måste vara mellan 0 och 255."
669669
msgid "CBC blocks must be multiples of 16 bytes"
670670
msgstr "CBC-block måste vara multiplar om 16 byte"
671671

672+
#: supervisor/shared/safe_mode.c
673+
msgid "CIRCUITPY drive could not be found or created."
674+
msgstr ""
675+
672676
#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
673677
msgid "CRC or checksum was invalid"
674678
msgstr "CRC eller checksumma var ogiltig"

locale/zh_Latn_pinyin.po

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -648,7 +648,7 @@ msgid "Buffer must be at least length 1"
648648
msgstr "Huǎnchōng qū bìxū zhìshǎo chángdù wéi 1"
649649

650650
#: shared-bindings/_bleio/PacketBuffer.c
651-
#, c-format, fuzzy
651+
#, fuzzy, c-format
652652
msgid "Buffer too short by %d bytes"
653653
msgstr "Huǎn chōng qū tài duǎn , àn %d zì jié"
654654

@@ -676,6 +676,10 @@ msgstr "Zìjié bìxū jiè yú 0 dào 255 zhījiān."
676676
msgid "CBC blocks must be multiples of 16 bytes"
677677
msgstr "CBC kuài bìxū shì 16 zìjié de bèishù"
678678

679+
#: supervisor/shared/safe_mode.c
680+
msgid "CIRCUITPY drive could not be found or created."
681+
msgstr ""
682+
679683
#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
680684
msgid "CRC or checksum was invalid"
681685
msgstr "CRC huò jiàoyàn hé wúxiào"

main.c

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -811,7 +811,11 @@ int __attribute__((used)) main(void) {
811811
// Create a new filesystem only if we're not in a safe mode.
812812
// A power brownout here could make it appear as if there's
813813
// no SPI flash filesystem, and we might erase the existing one.
814-
filesystem_init(safe_mode == NO_SAFE_MODE, false);
814+
815+
// Check whether CIRCUITPY is available. Don't check if it already hasn't been found.
816+
if ((safe_mode != NO_CIRCUITPY) && !filesystem_init(safe_mode == NO_SAFE_MODE, false)) {
817+
reset_into_safe_mode(NO_CIRCUITPY);
818+
}
815819

816820
// displays init after filesystem, since they could share the flash SPI
817821
board_init();

ports/atmel-samd/boards/cp32-m4/mpconfigboard.mk

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ CHIP_FAMILY = samd51
88

99
QSPI_FLASH_FILESYSTEM = 1
1010
EXTERNAL_FLASH_DEVICES = "W25Q128JVxM"
11+
LONGINT_IMPL = MPZ
1112

1213
# No I2S on SAMD51G.
1314
CIRCUITPY_AUDIOBUSIO = 0

ports/atmel-samd/mpconfigport.mk

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,6 @@
22
# parameters that vary based on chip and/or board.
33
LD_TEMPLATE_FILE = boards/common.template.ld
44

5-
# Define an equivalent for MICROPY_LONGINT_IMPL, to pass to $(MPY-TOOL) in py/mkrules.mk
6-
# $(MPY-TOOL) needs to know what kind of longint to use (if any) to freeze long integers.
7-
# This should correspond to the MICROPY_LONGINT_IMPL definition in mpconfigport.h.
8-
9-
ifeq ($(LONGINT_IMPL),NONE)
10-
MPY_TOOL_LONGINT_IMPL = -mlongint-impl=none
11-
endif
12-
13-
ifeq ($(LONGINT_IMPL),MPZ)
14-
MPY_TOOL_LONGINT_IMPL = -mlongint-impl=mpz
15-
endif
16-
17-
ifeq ($(LONGINT_IMPL),LONGLONG)
18-
MPY_TOOL_LONGINT_IMPL = -mlongint-impl=longlong
19-
endif
20-
215
INTERNAL_LIBM = 1
226

237
# Number of USB endpoint pairs.

ports/broadcom/mpconfigport.mk

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,3 @@
1-
# Define an equivalent for MICROPY_LONGINT_IMPL, to pass to $(MPY-TOOL) in py/mkrules.mk
2-
# $(MPY-TOOL) needs to know what kind of longint to use (if any) to freeze long integers.
3-
# This should correspond to the MICROPY_LONGINT_IMPL definition in mpconfigport.h.
4-
5-
ifeq ($(LONGINT_IMPL),NONE)
6-
MPY_TOOL_LONGINT_IMPL = -mlongint-impl=none
7-
endif
8-
9-
ifeq ($(LONGINT_IMPL),MPZ)
10-
MPY_TOOL_LONGINT_IMPL = -mlongint-impl=mpz
11-
endif
12-
13-
ifeq ($(LONGINT_IMPL),LONGLONG)
14-
MPY_TOOL_LONGINT_IMPL = -mlongint-impl=longlong
15-
endif
16-
171
# All broadcom ports have longints.
182
LONGINT_IMPL = MPZ
193

ports/cxd56/mpconfigport.mk

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,6 @@ USB_HIGHSPEED = 1
33
# Number of USB endpoint pairs.
44
USB_NUM_ENDPOINT_PAIRS = 6
55

6-
# Define an equivalent for MICROPY_LONGINT_IMPL, to pass to $(MPY-TOOL) in py/mkrules.mk
7-
# $(MPY-TOOL) needs to know what kind of longint to use (if any) to freeze long integers.
8-
# This should correspond to the MICROPY_LONGINT_IMPL definition in mpconfigport.h.
9-
MPY_TOOL_LONGINT_IMPL = -mlongint-impl=mpz
10-
116
# Longints can be implemented as mpz, as longlong, or not
127
LONGINT_IMPL = MPZ
138

ports/espressif/boards/adafruit_feather_esp32s2/board.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
#include "supervisor/board.h"
2828
#include "mpconfigboard.h"
2929
#include "shared-bindings/microcontroller/Pin.h"
30+
#include "components/driver/include/driver/gpio.h"
3031

3132
void board_init(void) {
3233
// USB
@@ -39,7 +40,9 @@ bool board_requests_safe_mode(void) {
3940
}
4041

4142
void reset_board(void) {
42-
43+
// Turn on I2C power by default.
44+
gpio_set_direction(7, GPIO_MODE_DEF_OUTPUT);
45+
gpio_set_level(7, false);
4346
}
4447

4548
void board_deinit(void) {

ports/espressif/boards/adafruit_feather_esp32s2/pins.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
1414
{ MP_ROM_QSTR(MP_QSTR_D5), MP_ROM_PTR(&pin_GPIO5) },
1515
{ MP_ROM_QSTR(MP_QSTR_D6), MP_ROM_PTR(&pin_GPIO6) },
1616

17-
{ MP_ROM_QSTR(MP_QSTR_D7), MP_ROM_PTR(&pin_GPIO7) },
1817
{ MP_ROM_QSTR(MP_QSTR_I2C_POWER_INVERTED), MP_ROM_PTR(&pin_GPIO7) },
18+
{ MP_ROM_QSTR(MP_QSTR_D7), MP_ROM_PTR(&pin_GPIO7) },
1919

2020
{ MP_ROM_QSTR(MP_QSTR_A5), MP_ROM_PTR(&pin_GPIO8) },
2121
{ MP_ROM_QSTR(MP_QSTR_D8), MP_ROM_PTR(&pin_GPIO8) },

ports/espressif/mpconfigport.mk

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,3 @@
1-
# Define an equivalent for MICROPY_LONGINT_IMPL, to pass to $(MPY-TOOL) in py/mkrules.mk
2-
# $(MPY-TOOL) needs to know what kind of longint to use (if any) to freeze long integers.
3-
# This should correspond to the MICROPY_LONGINT_IMPL definition in mpconfigport.h.
4-
MPY_TOOL_LONGINT_IMPL = -mlongint-impl=mpz
5-
61
# Internal math library is substantially smaller than toolchain one
72
INTERNAL_LIBM = 1
83

ports/litex/mpconfigport.mk

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,3 @@
1-
# Define an equivalent for MICROPY_LONGINT_IMPL, to pass to $(MPY-TOOL) in py/mkrules.mk
2-
# $(MPY-TOOL) needs to know what kind of longint to use (if any) to freeze long integers.
3-
# This should correspond to the MICROPY_LONGINT_IMPL definition in mpconfigport.h.
4-
MPY_TOOL_LONGINT_IMPL = -mlongint-impl=mpz
5-
61
# Internal math library is substantially smaller than toolchain one
72
INTERNAL_LIBM = 1
83

ports/mimxrt10xx/mpconfigport.mk

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,5 @@
11
LD_FILE = $(FLASH).ld $(CHIP_FAMILY).ld imxrt10xx.ld
22

3-
ifeq ($(LONGINT_IMPL),NONE)
4-
MPY_TOOL_LONGINT_IMPL = -mlongint-impl=none
5-
endif
6-
7-
ifeq ($(LONGINT_IMPL),MPZ)
8-
MPY_TOOL_LONGINT_IMPL = -mlongint-impl=mpz
9-
endif
10-
11-
ifeq ($(LONGINT_IMPL),LONGLONG)
12-
MPY_TOOL_LONGINT_IMPL = -mlongint-impl=longlong
13-
endif
14-
153
INTERNAL_LIBM = 1
164

175
USB_HIGHSPEED = 1

ports/nrf/mpconfigport.mk

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,6 @@
22
# parameters that vary based on chip and/or board.
33
LD_TEMPLATE_FILE = boards/common.template.ld
44

5-
# Define an equivalent for MICROPY_LONGINT_IMPL, to pass to $(MPY-TOOL) in py/mkrules.mk
6-
# $(MPY-TOOL) needs to know what kind of longint to use (if any) to freeze long integers.
7-
# This should correspond to the MICROPY_LONGINT_IMPL definition in mpconfigport.h.
8-
MPY_TOOL_LONGINT_IMPL = -mlongint-impl=mpz
9-
105
INTERNAL_LIBM = 1
116

127
# Number of USB endpoint pairs.

ports/raspberrypi/common-hal/rgbmatrix/RGBMatrix.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
#include "shared-module/rgbmatrix/RGBMatrix.h"
3434

3535
#include "src/rp2_common/hardware_pwm/include/hardware/pwm.h"
36+
#include "src/rp2_common/hardware_irq/include/hardware/irq.h"
3637

3738
void *common_hal_rgbmatrix_timer_allocate(rgbmatrix_rgbmatrix_obj_t *self) {
3839
// Choose a PWM channel based on the first RGB pin
@@ -58,13 +59,17 @@ void common_hal_rgbmatrix_timer_enable(void *ptr) {
5859
void common_hal_rgbmatrix_timer_disable(void *ptr) {
5960
int8_t slice = ((intptr_t)ptr) & 0xff;
6061
pwm_set_enabled(slice, false);
62+
irq_set_enabled(PWM_IRQ_WRAP, false);
63+
pwm_clear_irq(slice);
6164
}
6265

6366
void common_hal_rgbmatrix_timer_free(void *ptr) {
6467
intptr_t value = (intptr_t)ptr;
6568
uint8_t slice = value & 0xff;
6669
uint8_t channel = value >> 8;
6770
pwm_set_enabled(slice, false);
71+
irq_set_enabled(PWM_IRQ_WRAP, false);
72+
pwm_clear_irq(slice);
6873
pwmout_free(slice, channel);
6974
return;
7075
}

0 commit comments

Comments
 (0)
0