From 6011db3aec0ae0b15af50ccafbedf657895c9603 Mon Sep 17 00:00:00 2001 From: ZodiusInfuser Date: Thu, 3 Jun 2021 15:49:23 +0100 Subject: [PATCH 01/27] Added board definition --- .github/workflows/build.yml | 1 + .../boards/pimoroni_pga2040/board.c | 37 +++++++++++++++ .../boards/pimoroni_pga2040/mpconfigboard.h | 2 + .../boards/pimoroni_pga2040/mpconfigboard.mk | 11 +++++ .../boards/pimoroni_pga2040/pins.c | 47 +++++++++++++++++++ 5 files changed, 98 insertions(+) create mode 100644 ports/raspberrypi/boards/pimoroni_pga2040/board.c create mode 100644 ports/raspberrypi/boards/pimoroni_pga2040/mpconfigboard.h create mode 100644 ports/raspberrypi/boards/pimoroni_pga2040/mpconfigboard.mk create mode 100644 ports/raspberrypi/boards/pimoroni_pga2040/pins.c diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e78c4067ed..fe719a845b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -308,6 +308,7 @@ jobs: - "pewpew_m4" - "picoplanet" - "pimoroni_keybow2040" + - "pimoroni_pga2040" - "pimoroni_picolipo_16mb" - "pimoroni_picolipo_4mb" - "pimoroni_picosystem" diff --git a/ports/raspberrypi/boards/pimoroni_pga2040/board.c b/ports/raspberrypi/boards/pimoroni_pga2040/board.c new file mode 100644 index 0000000000..67486d4c23 --- /dev/null +++ b/ports/raspberrypi/boards/pimoroni_pga2040/board.c @@ -0,0 +1,37 @@ +/* + * This file is part of the MicroPython project, http://micropython.org/ + * + * The MIT License (MIT) + * + * Copyright (c) 2021 Scott Shawcroft for Adafruit Industries + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ + +#include "supervisor/board.h" + +void board_init(void) { +} + +bool board_requests_safe_mode(void) { + return false; +} + +void reset_board(void) { +} diff --git a/ports/raspberrypi/boards/pimoroni_pga2040/mpconfigboard.h b/ports/raspberrypi/boards/pimoroni_pga2040/mpconfigboard.h new file mode 100644 index 0000000000..a5a0414146 --- /dev/null +++ b/ports/raspberrypi/boards/pimoroni_pga2040/mpconfigboard.h @@ -0,0 +1,2 @@ +#define MICROPY_HW_BOARD_NAME "Pimoroni PGA2040" +#define MICROPY_HW_MCU_NAME "rp2040" diff --git a/ports/raspberrypi/boards/pimoroni_pga2040/mpconfigboard.mk b/ports/raspberrypi/boards/pimoroni_pga2040/mpconfigboard.mk new file mode 100644 index 0000000000..b5b750bd39 --- /dev/null +++ b/ports/raspberrypi/boards/pimoroni_pga2040/mpconfigboard.mk @@ -0,0 +1,11 @@ +USB_VID = 0x2E8A +USB_PID = 0x1006 +USB_PRODUCT = "PGA2040" +USB_MANUFACTURER = "Pimoroni" + +CHIP_VARIANT = RP2040 +CHIP_FAMILY = rp2 + +EXTERNAL_FLASH_DEVICES = "W25Q64JVxQ" + +CIRCUITPY__EVE = 1 diff --git a/ports/raspberrypi/boards/pimoroni_pga2040/pins.c b/ports/raspberrypi/boards/pimoroni_pga2040/pins.c new file mode 100644 index 0000000000..1ddc885082 --- /dev/null +++ b/ports/raspberrypi/boards/pimoroni_pga2040/pins.c @@ -0,0 +1,47 @@ +#include "shared-bindings/board/__init__.h" + +STATIC const mp_rom_map_elem_t board_global_dict_table[] = { + { MP_ROM_QSTR(MP_QSTR_GP0), MP_ROM_PTR(&pin_GPIO0) }, + { MP_ROM_QSTR(MP_QSTR_GP1), MP_ROM_PTR(&pin_GPIO1) }, + { MP_ROM_QSTR(MP_QSTR_GP2), MP_ROM_PTR(&pin_GPIO2) }, + { MP_ROM_QSTR(MP_QSTR_GP3), MP_ROM_PTR(&pin_GPIO3) }, + { MP_ROM_QSTR(MP_QSTR_GP4), MP_ROM_PTR(&pin_GPIO4) }, + { MP_ROM_QSTR(MP_QSTR_GP5), MP_ROM_PTR(&pin_GPIO5) }, + { MP_ROM_QSTR(MP_QSTR_GP6), MP_ROM_PTR(&pin_GPIO6) }, + { MP_ROM_QSTR(MP_QSTR_GP7), MP_ROM_PTR(&pin_GPIO7) }, + { MP_ROM_QSTR(MP_QSTR_GP8), MP_ROM_PTR(&pin_GPIO8) }, + { MP_ROM_QSTR(MP_QSTR_GP9), MP_ROM_PTR(&pin_GPIO9) }, + { MP_ROM_QSTR(MP_QSTR_GP10), MP_ROM_PTR(&pin_GPIO10) }, + { MP_ROM_QSTR(MP_QSTR_GP11), MP_ROM_PTR(&pin_GPIO11) }, + { MP_ROM_QSTR(MP_QSTR_GP12), MP_ROM_PTR(&pin_GPIO12) }, + { MP_ROM_QSTR(MP_QSTR_GP13), MP_ROM_PTR(&pin_GPIO13) }, + { MP_ROM_QSTR(MP_QSTR_GP14), MP_ROM_PTR(&pin_GPIO14) }, + { MP_ROM_QSTR(MP_QSTR_GP15), MP_ROM_PTR(&pin_GPIO15) }, + { MP_ROM_QSTR(MP_QSTR_GP16), MP_ROM_PTR(&pin_GPIO16) }, + { MP_ROM_QSTR(MP_QSTR_GP17), MP_ROM_PTR(&pin_GPIO17) }, + { MP_ROM_QSTR(MP_QSTR_GP18), MP_ROM_PTR(&pin_GPIO18) }, + { MP_ROM_QSTR(MP_QSTR_GP19), MP_ROM_PTR(&pin_GPIO19) }, + { MP_ROM_QSTR(MP_QSTR_GP20), MP_ROM_PTR(&pin_GPIO20) }, + { MP_ROM_QSTR(MP_QSTR_GP21), MP_ROM_PTR(&pin_GPIO21) }, + { MP_ROM_QSTR(MP_QSTR_GP22), MP_ROM_PTR(&pin_GPIO22) }, + { MP_ROM_QSTR(MP_QSTR_GP23), MP_ROM_PTR(&pin_GPIO23) }, + { MP_ROM_QSTR(MP_QSTR_GP24), MP_ROM_PTR(&pin_GPIO24) }, + { MP_ROM_QSTR(MP_QSTR_GP25), MP_ROM_PTR(&pin_GPIO25) }, + + { MP_ROM_QSTR(MP_QSTR_GP26_A0), MP_ROM_PTR(&pin_GPIO26) }, + { MP_ROM_QSTR(MP_QSTR_GP26), MP_ROM_PTR(&pin_GPIO26) }, + { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_GPIO26) }, + + { MP_ROM_QSTR(MP_QSTR_GP27_A1), MP_ROM_PTR(&pin_GPIO27) }, + { MP_ROM_QSTR(MP_QSTR_GP27), MP_ROM_PTR(&pin_GPIO27) }, + { MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_GPIO27) }, + + { MP_ROM_QSTR(MP_QSTR_GP28_A2), MP_ROM_PTR(&pin_GPIO28) }, + { MP_ROM_QSTR(MP_QSTR_GP28), MP_ROM_PTR(&pin_GPIO28) }, + { MP_ROM_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_GPIO28) }, + + { MP_ROM_QSTR(MP_QSTR_GP29_A3), MP_ROM_PTR(&pin_GPIO29) }, + { MP_ROM_QSTR(MP_QSTR_GP29), MP_ROM_PTR(&pin_GPIO29) }, + { MP_ROM_QSTR(MP_QSTR_A3), MP_ROM_PTR(&pin_GPIO29) }, +}; +MP_DEFINE_CONST_DICT(board_module_globals, board_global_dict_table); From af7557b53b5ebfd8189905e97538d187bdb384dd Mon Sep 17 00:00:00 2001 From: ZodiusInfuser Date: Fri, 4 Jun 2021 16:02:32 +0100 Subject: [PATCH 02/27] Updated with final USB PID --- ports/raspberrypi/boards/pimoroni_pga2040/mpconfigboard.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/raspberrypi/boards/pimoroni_pga2040/mpconfigboard.mk b/ports/raspberrypi/boards/pimoroni_pga2040/mpconfigboard.mk index b5b750bd39..1b870037d4 100644 --- a/ports/raspberrypi/boards/pimoroni_pga2040/mpconfigboard.mk +++ b/ports/raspberrypi/boards/pimoroni_pga2040/mpconfigboard.mk @@ -1,5 +1,5 @@ USB_VID = 0x2E8A -USB_PID = 0x1006 +USB_PID = 0x1008 USB_PRODUCT = "PGA2040" USB_MANUFACTURER = "Pimoroni" From 0de61075e494716d5b8338b16cb2c9ba3b9e0075 Mon Sep 17 00:00:00 2001 From: microDev <70126934+microDev1@users.noreply.github.com> Date: Sat, 5 Jun 2021 10:15:57 +0530 Subject: [PATCH 03/27] update readme --- README.rst | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/README.rst b/README.rst index b71ad005e6..7b8919db1f 100644 --- a/README.rst +++ b/README.rst @@ -199,19 +199,18 @@ amongst ports including CircuitPython: Ports ~~~~~ -Ports include the code unique to a microcontroller line and also -variations based on the board. +Ports include the code unique to a microcontroller line. ================ ============================================================ Supported Support status ================ ============================================================ atmel-samd ``SAMD21`` stable | ``SAMD51`` stable cxd56 stable -esp32s2 beta +esp32s2 stable litex alpha mimxrt10xx alpha nrf stable -raspberrypi beta +raspberrypi stable stm ``F4`` stable | ``others`` beta unix alpha ================ ============================================================ @@ -220,8 +219,13 @@ unix alpha - ``beta`` Being actively improved but may be missing functionality and have bugs. - ``alpha`` Will have bugs and missing functionality. -The remaining port directories not listed above are in the repo to maintain compatibility with the -`MicroPython `__ parent project. +Boards +~~~~~~ + +- Each ``port`` has a ``boards`` directory containing variations of boards + which belong to a specific microcontroller line. +- A list of native modules supported by a particular board can be found + `here `__. `Back to Top <#circuitpython>`__ From b2dea8ae0d116b4cb6aabbdb1a23aac68dc5f2dc Mon Sep 17 00:00:00 2001 From: root Date: Sat, 5 Jun 2021 16:17:14 -0500 Subject: [PATCH 04/27] Fix for issue #3383 - SAMD51 microcontroller.cpu.voltage --- ports/atmel-samd/common-hal/microcontroller/Processor.c | 1 + 1 file changed, 1 insertion(+) diff --git a/ports/atmel-samd/common-hal/microcontroller/Processor.c b/ports/atmel-samd/common-hal/microcontroller/Processor.c index 2985cf5a67..0776ff65b1 100644 --- a/ports/atmel-samd/common-hal/microcontroller/Processor.c +++ b/ports/atmel-samd/common-hal/microcontroller/Processor.c @@ -292,6 +292,7 @@ float common_hal_mcu_processor_get_voltage(void) { #endif #ifdef SAM_D5X_E5X + hri_supc_clear_VREF_ONDEMAND_bit(SUPC); hri_supc_set_VREF_SEL_bf(SUPC, SUPC_VREF_SEL_1V0_Val); hri_supc_set_VREF_VREFOE_bit(SUPC); From 01195c2089ec189c30d875180f9def03e8862b57 Mon Sep 17 00:00:00 2001 From: lady ada Date: Sun, 6 Jun 2021 15:55:33 -0400 Subject: [PATCH 05/27] update to rev B --- .../adafruit_macropad_rp2040/mpconfigboard.h | 10 ++++++--- .../boards/adafruit_macropad_rp2040/pins.c | 21 ++++++++++++------- 2 files changed, 20 insertions(+), 11 deletions(-) diff --git a/ports/raspberrypi/boards/adafruit_macropad_rp2040/mpconfigboard.h b/ports/raspberrypi/boards/adafruit_macropad_rp2040/mpconfigboard.h index 5900003713..00a97d088d 100644 --- a/ports/raspberrypi/boards/adafruit_macropad_rp2040/mpconfigboard.h +++ b/ports/raspberrypi/boards/adafruit_macropad_rp2040/mpconfigboard.h @@ -1,7 +1,11 @@ #define MICROPY_HW_BOARD_NAME "Adafruit Macropad RP2040" #define MICROPY_HW_MCU_NAME "rp2040" -#define MICROPY_HW_NEOPIXEL (&pin_GPIO16) +#define MICROPY_HW_NEOPIXEL (&pin_GPIO19) -#define DEFAULT_I2C_BUS_SCL (&pin_GPIO25) -#define DEFAULT_I2C_BUS_SDA (&pin_GPIO24) +#define DEFAULT_I2C_BUS_SCL (&pin_GPIO21) +#define DEFAULT_I2C_BUS_SDA (&pin_GPIO20) + +#define DEFAULT_SPI_BUS_SCK (&pin_GPIO26) +#define DEFAULT_SPI_BUS_MOSI (&pin_GPIO27) +#define DEFAULT_SPI_BUS_MISO (&pin_GPIO28) diff --git a/ports/raspberrypi/boards/adafruit_macropad_rp2040/pins.c b/ports/raspberrypi/boards/adafruit_macropad_rp2040/pins.c index 8ce16c0e9c..2e5890c1c4 100644 --- a/ports/raspberrypi/boards/adafruit_macropad_rp2040/pins.c +++ b/ports/raspberrypi/boards/adafruit_macropad_rp2040/pins.c @@ -15,24 +15,29 @@ STATIC const mp_rom_map_elem_t board_global_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_KEY12), MP_ROM_PTR(&pin_GPIO12) }, { MP_ROM_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_GPIO13) }, - { MP_ROM_QSTR(MP_QSTR_SPEAKER), MP_ROM_PTR(&pin_GPIO14) }, + { MP_ROM_QSTR(MP_QSTR_SPEAKER_SHUTDOWN), MP_ROM_PTR(&pin_GPIO14) }, + { MP_ROM_QSTR(MP_QSTR_SPEAKER), MP_ROM_PTR(&pin_GPIO16) }, { MP_ROM_QSTR(MP_QSTR_ENCODER_SWITCH), MP_ROM_PTR(&pin_GPIO0) }, - { MP_ROM_QSTR(MP_QSTR_NEOPIXEL), MP_ROM_PTR(&pin_GPIO16) }, { MP_ROM_QSTR(MP_QSTR_ENCODER_A), MP_ROM_PTR(&pin_GPIO17) }, { MP_ROM_QSTR(MP_QSTR_ENCODER_B), MP_ROM_PTR(&pin_GPIO18) }, + { MP_ROM_QSTR(MP_QSTR_NEOPIXEL), MP_ROM_PTR(&pin_GPIO19) }, + + { MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO20) }, + { MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_GPIO21) }, + + { MP_ROM_QSTR(MP_QSTR_OLED_CS), MP_ROM_PTR(&pin_GPIO22) }, { MP_ROM_QSTR(MP_QSTR_OLED_RESET), MP_ROM_PTR(&pin_GPIO23) }, + { MP_ROM_QSTR(MP_QSTR_OLED_DC), MP_ROM_PTR(&pin_GPIO24) }, - { MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO24) }, - { MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_GPIO25) }, - { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_GPIO26) }, - { MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_GPIO27) }, - { MP_ROM_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_GPIO28) }, - { MP_ROM_QSTR(MP_QSTR_A3), MP_ROM_PTR(&pin_GPIO29) }, + { MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_GPIO26) }, + { MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_GPIO27) }, + { MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_GPIO28) }, { MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) }, + { MP_ROM_QSTR(MP_QSTR_SPI), MP_ROM_PTR(&board_i2c_obj) }, }; MP_DEFINE_CONST_DICT(board_module_globals, board_global_dict_table); From 8f1c25c8aeecba4d02e7811e5eb49afa96e1a412 Mon Sep 17 00:00:00 2001 From: lady ada Date: Sun, 6 Jun 2021 18:25:40 -0400 Subject: [PATCH 06/27] fix SH110x mode, the SH1107 is actually column not row mode BUT the SD1107 module we use is vertical orientation (confusing!) so row/col are NOT swapped. we will have to fix the SH1107 driver to match. this fix required for SH1106 (which uses the same page mode commands but ISNT rotated) --- shared-module/displayio/Display.c | 4 ++-- shared-module/displayio/display_core.c | 29 +++++++++++++------------- 2 files changed, 17 insertions(+), 16 deletions(-) diff --git a/shared-module/displayio/Display.c b/shared-module/displayio/Display.c index 9117a50b78..c583ead54b 100644 --- a/shared-module/displayio/Display.c +++ b/shared-module/displayio/Display.c @@ -249,8 +249,8 @@ STATIC bool _refresh_area(displayio_display_obj_t *self, const displayio_area_t // for SH1107 and other boundary constrained controllers // write one single row at a time if (self->SH1107_addressing) { - subrectangles = rows_per_buffer; // vertical (column mode) write each separately (height times) - rows_per_buffer = 1; + subrectangles = rows_per_buffer/8; // vertical (column mode) write each separately (height times) + rows_per_buffer = 8; } else if (displayio_area_size(&clipped) > buffer_size * pixels_per_word) { rows_per_buffer = buffer_size * pixels_per_word / displayio_area_width(&clipped); if (rows_per_buffer == 0) { diff --git a/shared-module/displayio/display_core.c b/shared-module/displayio/display_core.c index 5b4b20b344..86c104d9ad 100644 --- a/shared-module/displayio/display_core.c +++ b/shared-module/displayio/display_core.c @@ -260,14 +260,15 @@ void displayio_display_core_set_region_to_update(displayio_display_core_t *self, data[data_length++] = x2 >> 8; data[data_length++] = x2 & 0xff; } + // Quirk for SH1107 "SH1107_addressing" - // Note... column is y! page is x! - // Page address command = 0xB0 + // Column lower command = 0x00, Column upper command = 0x10 if (SH1107_addressing) { - // set the page to our x value - data[0] = 0xB0 | (x1 & 0x0F); - data_length = 1; + data[0] = ((x1 >> 4) & 0x0F) | 0x10; // 0x10 to 0x17 + data[1] = x1 & 0x0F; // 0x00 to 0x0F + data_length = 2; } + self->send(self->bus, data_type, chip_select, data, data_length); displayio_display_core_end_transaction(self); @@ -299,16 +300,16 @@ void displayio_display_core_set_region_to_update(displayio_display_core_t *self, data[data_length++] = y2 >> 8; data[data_length++] = y2 & 0xff; } - // Quirk for SH1107 "SH1107_addressing" - // Note... column is y! page is x! - // Column lower command = 0x00, Column upper command = 0x10 - if (SH1107_addressing) { - data[0] = y1 & 0x0F; // 0x00 to 0x0F - data[1] = (y1 >> 4 & 0x0F) | 0x10; // 0x10 to 0x17 - data_length = 2; - } - self->send(self->bus, data_type, chip_select, data, data_length); + // Quirk for SH1107 "SH1107_addressing" + // Page address command = 0xB0 + if (SH1107_addressing) { + // set the page to our y value + data[0] = 0xB0 | y1; + data_length = 1; + } + + self->send(self->bus, data_type, chip_select, data, data_length); displayio_display_core_end_transaction(self); if (set_current_row_command != NO_COMMAND) { From 3890271f19659654544c7a84e66a94198d01de23 Mon Sep 17 00:00:00 2001 From: lady ada Date: Sun, 6 Jun 2021 18:30:17 -0400 Subject: [PATCH 07/27] turn off all neopix when booting --- ports/raspberrypi/boards/adafruit_macropad_rp2040/board.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ports/raspberrypi/boards/adafruit_macropad_rp2040/board.c b/ports/raspberrypi/boards/adafruit_macropad_rp2040/board.c index c4021a83e9..400c8f858c 100644 --- a/ports/raspberrypi/boards/adafruit_macropad_rp2040/board.c +++ b/ports/raspberrypi/boards/adafruit_macropad_rp2040/board.c @@ -28,6 +28,7 @@ #include "shared-bindings/microcontroller/Pin.h" #include "src/rp2_common/hardware_gpio/include/hardware/gpio.h" +#include "supervisor/shared/board.h" void board_init(void) { } @@ -37,4 +38,6 @@ bool board_requests_safe_mode(void) { } void reset_board(void) { + // turn off any left over LED + board_reset_user_neopixels(&pin_GPIO19, 12); } From 2ff9e9766f4ae28f31ed997af075d20df2248ded Mon Sep 17 00:00:00 2001 From: lady ada Date: Mon, 7 Jun 2021 12:39:59 -0400 Subject: [PATCH 08/27] handclang --- ports/raspberrypi/boards/adafruit_macropad_rp2040/board.c | 4 ++-- shared-module/displayio/Display.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/raspberrypi/boards/adafruit_macropad_rp2040/board.c b/ports/raspberrypi/boards/adafruit_macropad_rp2040/board.c index 400c8f858c..a9f1226295 100644 --- a/ports/raspberrypi/boards/adafruit_macropad_rp2040/board.c +++ b/ports/raspberrypi/boards/adafruit_macropad_rp2040/board.c @@ -38,6 +38,6 @@ bool board_requests_safe_mode(void) { } void reset_board(void) { - // turn off any left over LED - board_reset_user_neopixels(&pin_GPIO19, 12); + // turn off any left over LED + board_reset_user_neopixels(&pin_GPIO19, 12); } diff --git a/shared-module/displayio/Display.c b/shared-module/displayio/Display.c index c583ead54b..8419ddb237 100644 --- a/shared-module/displayio/Display.c +++ b/shared-module/displayio/Display.c @@ -249,7 +249,7 @@ STATIC bool _refresh_area(displayio_display_obj_t *self, const displayio_area_t // for SH1107 and other boundary constrained controllers // write one single row at a time if (self->SH1107_addressing) { - subrectangles = rows_per_buffer/8; // vertical (column mode) write each separately (height times) + subrectangles = rows_per_buffer / 8; // vertical (column mode) write each separately (height times) rows_per_buffer = 8; } else if (displayio_area_size(&clipped) > buffer_size * pixels_per_word) { rows_per_buffer = buffer_size * pixels_per_word / displayio_area_width(&clipped); From b39dd845600082db76c3adb354e1e7de4cd99869 Mon Sep 17 00:00:00 2001 From: lady ada Date: Mon, 7 Jun 2021 19:43:49 -0400 Subject: [PATCH 09/27] move the col/row offsets to the top so oleds can take advantage of em --- shared-module/displayio/display_core.c | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/shared-module/displayio/display_core.c b/shared-module/displayio/display_core.c index 86c104d9ad..234c0a096b 100644 --- a/shared-module/displayio/display_core.c +++ b/shared-module/displayio/display_core.c @@ -216,10 +216,11 @@ void displayio_display_core_set_region_to_update(displayio_display_core_t *self, uint8_t row_command, uint16_t set_current_column_command, uint16_t set_current_row_command, bool data_as_commands, bool always_toggle_chip_select, displayio_area_t *area, bool SH1107_addressing) { - uint16_t x1 = area->x1; - uint16_t x2 = area->x2; - uint16_t y1 = area->y1; - uint16_t y2 = area->y2; + uint16_t x1 = area->x1 + self->colstart; + uint16_t x2 = area->x2 + self->colstart; + uint16_t y1 = area->y1 + self->rowstart; + uint16_t y2 = area->y2 + self->rowstart; + // Collapse down the dimension where multiple pixels are in a byte. if (self->colorspace.depth < 8) { uint8_t pixels_per_byte = 8 / self->colorspace.depth; @@ -232,6 +233,9 @@ void displayio_display_core_set_region_to_update(displayio_display_core_t *self, } } + x2 -= 1; + y2 -= 1; + display_chip_select_behavior_t chip_select = CHIP_SELECT_UNTOUCHED; if (always_toggle_chip_select || data_as_commands) { chip_select = CHIP_SELECT_TOGGLE_EVERY_BYTE; @@ -249,12 +253,11 @@ void displayio_display_core_set_region_to_update(displayio_display_core_t *self, } else { data_type = DISPLAY_COMMAND; } + if (self->ram_width < 0x100) { - data[data_length++] = x1 + self->colstart; - data[data_length++] = x2 - 1 + self->colstart; + data[data_length++] = x1; + data[data_length++] = x2; } else { - x1 += self->colstart; - x2 += self->colstart - 1; data[data_length++] = x1 >> 8; data[data_length++] = x1 & 0xff; data[data_length++] = x2 >> 8; @@ -289,12 +292,11 @@ void displayio_display_core_set_region_to_update(displayio_display_core_t *self, self->send(self->bus, DISPLAY_COMMAND, CHIP_SELECT_UNTOUCHED, data, 1); data_length = 0; } + if (self->ram_height < 0x100) { - data[data_length++] = y1 + self->rowstart; - data[data_length++] = y2 - 1 + self->rowstart; + data[data_length++] = y1; + data[data_length++] = y2; } else { - y1 += self->rowstart; - y2 += self->rowstart - 1; data[data_length++] = y1 >> 8; data[data_length++] = y1 & 0xff; data[data_length++] = y2 >> 8; From 467a4e766470a52438744031b4ed7eda4b399697 Mon Sep 17 00:00:00 2001 From: lady ada Date: Mon, 7 Jun 2021 19:51:57 -0400 Subject: [PATCH 10/27] fix comment --- shared-module/displayio/Display.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shared-module/displayio/Display.c b/shared-module/displayio/Display.c index 8419ddb237..ba509c6986 100644 --- a/shared-module/displayio/Display.c +++ b/shared-module/displayio/Display.c @@ -249,7 +249,7 @@ STATIC bool _refresh_area(displayio_display_obj_t *self, const displayio_area_t // for SH1107 and other boundary constrained controllers // write one single row at a time if (self->SH1107_addressing) { - subrectangles = rows_per_buffer / 8; // vertical (column mode) write each separately (height times) + subrectangles = rows_per_buffer / 8; // page addressing mode writes 8 rows at a time rows_per_buffer = 8; } else if (displayio_area_size(&clipped) > buffer_size * pixels_per_word) { rows_per_buffer = buffer_size * pixels_per_word / displayio_area_width(&clipped); From 72db13fc2dde848b34fd907e7cfd062eb97656ac Mon Sep 17 00:00:00 2001 From: root Date: Tue, 8 Jun 2021 10:04:40 -0500 Subject: [PATCH 11/27] enable microcontroller.cpu.voltage on SAME54 --- ports/atmel-samd/mpconfigport.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/atmel-samd/mpconfigport.h b/ports/atmel-samd/mpconfigport.h index c66ab99ab2..9025af9153 100644 --- a/ports/atmel-samd/mpconfigport.h +++ b/ports/atmel-samd/mpconfigport.h @@ -73,9 +73,9 @@ #define MICROPY_PY_SYS_PLATFORM "MicroChip SAMD51" #elif defined(SAME54) #define MICROPY_PY_SYS_PLATFORM "MicroChip SAME54" -#ifndef MICROCONTROLLER_VOLTAGE_DISABLE -#define MICROCONTROLLER_VOLTAGE_DISABLE (1) -#endif +// #ifndef MICROCONTROLLER_VOLTAGE_DISABLE +// #define MICROCONTROLLER_VOLTAGE_DISABLE (1) +// #endif #endif #define SPI_FLASH_MAX_BAUDRATE 24000000 #define MICROPY_PY_BUILTINS_NOTIMPLEMENTED (1) From 124c7b785a2a966a21f61a5783bd309d99ec963c Mon Sep 17 00:00:00 2001 From: Jeff Epler Date: Tue, 8 Jun 2021 13:25:50 -0500 Subject: [PATCH 12/27] Add kaluga version 1.3 .. this board is nearly the same as the "1.2" version originally released, but makes a few changes to reduce pin conflicts between the 13-pin camera header and the bootstrapping pins. "1.3" was introduced in summer 2020-- check the bottom of your board silk to find out whether you have a 1.2 or a 1.3, because it's not clear whether there is remaining 1.2 stock. Another vexing fact about the 1.3 is that its LCD can have one of two chipets, and the chipset used is not marked anywhere! --- .github/workflows/build.yml | 1 + .../boards/espressif_kaluga_1.3/board.c | 52 +++++++ .../espressif_kaluga_1.3/mpconfigboard.h | 38 +++++ .../espressif_kaluga_1.3/mpconfigboard.mk | 23 +++ .../boards/espressif_kaluga_1.3/pins.c | 142 ++++++++++++++++++ .../boards/espressif_kaluga_1.3/sdkconfig | 56 +++++++ tools/ci_check_duplicate_usb_vid_pid.py | 2 + 7 files changed, 314 insertions(+) create mode 100644 ports/esp32s2/boards/espressif_kaluga_1.3/board.c create mode 100644 ports/esp32s2/boards/espressif_kaluga_1.3/mpconfigboard.h create mode 100644 ports/esp32s2/boards/espressif_kaluga_1.3/mpconfigboard.mk create mode 100644 ports/esp32s2/boards/espressif_kaluga_1.3/pins.c create mode 100644 ports/esp32s2/boards/espressif_kaluga_1.3/sdkconfig diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5cbf8abc15..d91df7b104 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -485,6 +485,7 @@ jobs: - "atmegazero_esp32s2" - "electroniccats_bastwifi" - "espressif_kaluga_1" + - "espressif_kaluga_1.3" - "espressif_saola_1_wroom" - "espressif_saola_1_wrover" - "franzininho_wifi_wroom" diff --git a/ports/esp32s2/boards/espressif_kaluga_1.3/board.c b/ports/esp32s2/boards/espressif_kaluga_1.3/board.c new file mode 100644 index 0000000000..e40b6335bc --- /dev/null +++ b/ports/esp32s2/boards/espressif_kaluga_1.3/board.c @@ -0,0 +1,52 @@ +/* + * This file is part of the MicroPython project, http://micropython.org/ + * + * The MIT License (MIT) + * + * Copyright (c) 2020 Scott Shawcroft for Adafruit Industries + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ + +#include "supervisor/board.h" +#include "mpconfigboard.h" +#include "shared-bindings/microcontroller/Pin.h" + +void board_init(void) { + // USB + common_hal_never_reset_pin(&pin_GPIO19); + common_hal_never_reset_pin(&pin_GPIO20); + + // Debug UART + #ifdef DEBUG + common_hal_never_reset_pin(&pin_GPIO43); + common_hal_never_reset_pin(&pin_GPIO44); + #endif /* DEBUG */ +} + +bool board_requests_safe_mode(void) { + return false; +} + +void reset_board(void) { + +} + +void board_deinit(void) { +} diff --git a/ports/esp32s2/boards/espressif_kaluga_1.3/mpconfigboard.h b/ports/esp32s2/boards/espressif_kaluga_1.3/mpconfigboard.h new file mode 100644 index 0000000000..21f6ae2456 --- /dev/null +++ b/ports/esp32s2/boards/espressif_kaluga_1.3/mpconfigboard.h @@ -0,0 +1,38 @@ +/* + * This file is part of the MicroPython project, http://micropython.org/ + * + * The MIT License (MIT) + * + * Copyright (c) 2019 Scott Shawcroft for Adafruit Industries + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ + +// Micropython setup + +#define MICROPY_HW_BOARD_NAME "Kaluga 1" +#define MICROPY_HW_MCU_NAME "ESP32S2" + +#define MICROPY_HW_NEOPIXEL (&pin_GPIO45) + +#define CIRCUITPY_BOOT_BUTTON (&pin_GPIO0) + +#define BOARD_USER_SAFE_MODE_ACTION translate("pressing boot button at start up.\n") + +#define AUTORESET_DELAY_MS 500 diff --git a/ports/esp32s2/boards/espressif_kaluga_1.3/mpconfigboard.mk b/ports/esp32s2/boards/espressif_kaluga_1.3/mpconfigboard.mk new file mode 100644 index 0000000000..52c63cb9c7 --- /dev/null +++ b/ports/esp32s2/boards/espressif_kaluga_1.3/mpconfigboard.mk @@ -0,0 +1,23 @@ +USB_VID = 0x239A +USB_PID = 0x80C8 +USB_PRODUCT = "Kaluga 1" +USB_MANUFACTURER = "Espressif" + +INTERNAL_FLASH_FILESYSTEM = 1 +LONGINT_IMPL = MPZ + +# The default queue depth of 16 overflows on release builds, +# so increase it to 32. +CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32 + +CIRCUITPY_ESP_FLASH_MODE=dio +CIRCUITPY_ESP_FLASH_FREQ=80m +CIRCUITPY_ESP_FLASH_SIZE=4MB + +# We only have enough endpoints available in hardware to +# enable ONE of these at a time. +CIRCUITPY_USB_MIDI = 1 +CIRCUITPY_USB_HID = 0 +CIRCUITPY_USB_VENDOR = 0 + +CIRCUITPY_MODULE=wrover diff --git a/ports/esp32s2/boards/espressif_kaluga_1.3/pins.c b/ports/esp32s2/boards/espressif_kaluga_1.3/pins.c new file mode 100644 index 0000000000..557a0977c1 --- /dev/null +++ b/ports/esp32s2/boards/espressif_kaluga_1.3/pins.c @@ -0,0 +1,142 @@ +#include "py/objtuple.h" +#include "shared-bindings/board/__init__.h" + +STATIC const mp_rom_obj_tuple_t camera_data_tuple = { + {&mp_type_tuple}, + 8, + { + MP_ROM_PTR(&pin_GPIO36), + MP_ROM_PTR(&pin_GPIO37), + MP_ROM_PTR(&pin_GPIO41), + MP_ROM_PTR(&pin_GPIO42), + MP_ROM_PTR(&pin_GPIO39), + MP_ROM_PTR(&pin_GPIO40), + MP_ROM_PTR(&pin_GPIO21), + MP_ROM_PTR(&pin_GPIO38), + } +}; + +STATIC const mp_rom_map_elem_t board_global_dict_table[] = { + { MP_ROM_QSTR(MP_QSTR_IO0), MP_ROM_PTR(&pin_GPIO0) }, + { MP_ROM_QSTR(MP_QSTR_IO1), MP_ROM_PTR(&pin_GPIO1) }, + { MP_ROM_QSTR(MP_QSTR_IO2), MP_ROM_PTR(&pin_GPIO2) }, + { MP_ROM_QSTR(MP_QSTR_IO3), MP_ROM_PTR(&pin_GPIO3) }, + { MP_ROM_QSTR(MP_QSTR_IO4), MP_ROM_PTR(&pin_GPIO4) }, + { MP_ROM_QSTR(MP_QSTR_IO5), MP_ROM_PTR(&pin_GPIO5) }, + { MP_ROM_QSTR(MP_QSTR_IO6), MP_ROM_PTR(&pin_GPIO6) }, + { MP_ROM_QSTR(MP_QSTR_IO7), MP_ROM_PTR(&pin_GPIO7) }, + { MP_ROM_QSTR(MP_QSTR_IO8), MP_ROM_PTR(&pin_GPIO8) }, + { MP_ROM_QSTR(MP_QSTR_IO9), MP_ROM_PTR(&pin_GPIO9) }, + { MP_ROM_QSTR(MP_QSTR_IO10), MP_ROM_PTR(&pin_GPIO10) }, + { MP_ROM_QSTR(MP_QSTR_IO11), MP_ROM_PTR(&pin_GPIO11) }, + { MP_ROM_QSTR(MP_QSTR_IO12), MP_ROM_PTR(&pin_GPIO12) }, + { MP_ROM_QSTR(MP_QSTR_IO13), MP_ROM_PTR(&pin_GPIO13) }, + { MP_ROM_QSTR(MP_QSTR_IO14), MP_ROM_PTR(&pin_GPIO14) }, + { MP_ROM_QSTR(MP_QSTR_IO15), MP_ROM_PTR(&pin_GPIO15) }, + { MP_ROM_QSTR(MP_QSTR_IO16), MP_ROM_PTR(&pin_GPIO16) }, + { MP_ROM_QSTR(MP_QSTR_IO17), MP_ROM_PTR(&pin_GPIO17) }, + + + { MP_ROM_QSTR(MP_QSTR_IO18), MP_ROM_PTR(&pin_GPIO18) }, + { MP_ROM_QSTR(MP_QSTR_IO19), MP_ROM_PTR(&pin_GPIO19) }, + { MP_ROM_QSTR(MP_QSTR_IO20), MP_ROM_PTR(&pin_GPIO20) }, + { MP_ROM_QSTR(MP_QSTR_IO21), MP_ROM_PTR(&pin_GPIO21) }, + { MP_ROM_QSTR(MP_QSTR_IO26), MP_ROM_PTR(&pin_GPIO26) }, + { MP_ROM_QSTR(MP_QSTR_IO33), MP_ROM_PTR(&pin_GPIO33) }, + { MP_ROM_QSTR(MP_QSTR_IO34), MP_ROM_PTR(&pin_GPIO34) }, + { MP_ROM_QSTR(MP_QSTR_IO35), MP_ROM_PTR(&pin_GPIO35) }, + { MP_ROM_QSTR(MP_QSTR_IO36), MP_ROM_PTR(&pin_GPIO36) }, + { MP_ROM_QSTR(MP_QSTR_IO37), MP_ROM_PTR(&pin_GPIO37) }, + { MP_ROM_QSTR(MP_QSTR_IO38), MP_ROM_PTR(&pin_GPIO38) }, + { MP_ROM_QSTR(MP_QSTR_IO39), MP_ROM_PTR(&pin_GPIO39) }, + { MP_ROM_QSTR(MP_QSTR_IO40), MP_ROM_PTR(&pin_GPIO40) }, + { MP_ROM_QSTR(MP_QSTR_IO41), MP_ROM_PTR(&pin_GPIO41) }, + { MP_ROM_QSTR(MP_QSTR_IO42), MP_ROM_PTR(&pin_GPIO42) }, + { MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO43) }, + { MP_ROM_QSTR(MP_QSTR_IO43), MP_ROM_PTR(&pin_GPIO43) }, + { MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_GPIO44) }, + { MP_ROM_QSTR(MP_QSTR_IO44), MP_ROM_PTR(&pin_GPIO44) }, + { MP_ROM_QSTR(MP_QSTR_IO45), MP_ROM_PTR(&pin_GPIO45) }, + { MP_ROM_QSTR(MP_QSTR_IO46), MP_ROM_PTR(&pin_GPIO46) }, + + + { MP_ROM_QSTR(MP_QSTR_NEOPIXEL), MP_ROM_PTR(&pin_GPIO45) }, + + { MP_ROM_QSTR(MP_QSTR_CAMERA_XCLK), MP_ROM_PTR(&pin_GPIO1) }, + { MP_ROM_QSTR(MP_QSTR_CAMERA_PCLK), MP_ROM_PTR(&pin_GPIO33) }, + { MP_ROM_QSTR(MP_QSTR_CAMERA_HREF), MP_ROM_PTR(&pin_GPIO3) }, + { MP_ROM_QSTR(MP_QSTR_CAMERA_VSYNC), MP_ROM_PTR(&pin_GPIO2) }, + { MP_ROM_QSTR(MP_QSTR_CAMERA_SIOD), MP_ROM_PTR(&pin_GPIO8) }, + { MP_ROM_QSTR(MP_QSTR_CAMERA_SIOC), MP_ROM_PTR(&pin_GPIO7) }, + + + { MP_ROM_QSTR(MP_QSTR_CAMERA_DATA), MP_ROM_PTR(&camera_data_tuple) }, + { MP_ROM_QSTR(MP_QSTR_CAMERA_D2), MP_ROM_PTR(&pin_GPIO36) }, + { MP_ROM_QSTR(MP_QSTR_CAMERA_D3), MP_ROM_PTR(&pin_GPIO37) }, + { MP_ROM_QSTR(MP_QSTR_CAMERA_D4), MP_ROM_PTR(&pin_GPIO41) }, + { MP_ROM_QSTR(MP_QSTR_CAMERA_D5), MP_ROM_PTR(&pin_GPIO42) }, + { MP_ROM_QSTR(MP_QSTR_CAMERA_D6), MP_ROM_PTR(&pin_GPIO39) }, + { MP_ROM_QSTR(MP_QSTR_CAMERA_D7), MP_ROM_PTR(&pin_GPIO40) }, + { MP_ROM_QSTR(MP_QSTR_CAMERA_D8), MP_ROM_PTR(&pin_GPIO21) }, + { MP_ROM_QSTR(MP_QSTR_CAMERA_D9), MP_ROM_PTR(&pin_GPIO38) }, + + + { MP_ROM_QSTR(MP_QSTR_TOUCH1), MP_ROM_PTR(&pin_GPIO1) }, + { MP_ROM_QSTR(MP_QSTR_TOUCH2), MP_ROM_PTR(&pin_GPIO2) }, + { MP_ROM_QSTR(MP_QSTR_TOUCH3), MP_ROM_PTR(&pin_GPIO3) }, + { MP_ROM_QSTR(MP_QSTR_TOUCH4), MP_ROM_PTR(&pin_GPIO4) }, + { MP_ROM_QSTR(MP_QSTR_TOUCH5), MP_ROM_PTR(&pin_GPIO5) }, + { MP_ROM_QSTR(MP_QSTR_TOUCH6), MP_ROM_PTR(&pin_GPIO6) }, + { MP_ROM_QSTR(MP_QSTR_TOUCH7), MP_ROM_PTR(&pin_GPIO7) }, + { MP_ROM_QSTR(MP_QSTR_TOUCH8), MP_ROM_PTR(&pin_GPIO8) }, + { MP_ROM_QSTR(MP_QSTR_TOUCH9), MP_ROM_PTR(&pin_GPIO9) }, + { MP_ROM_QSTR(MP_QSTR_TOUCH10), MP_ROM_PTR(&pin_GPIO10) }, + { MP_ROM_QSTR(MP_QSTR_TOUCH11), MP_ROM_PTR(&pin_GPIO11) }, + { MP_ROM_QSTR(MP_QSTR_TOUCH12), MP_ROM_PTR(&pin_GPIO12) }, + { MP_ROM_QSTR(MP_QSTR_TOUCH13), MP_ROM_PTR(&pin_GPIO13) }, + { MP_ROM_QSTR(MP_QSTR_TOUCH14), MP_ROM_PTR(&pin_GPIO14) }, + + // LED FPC + { MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_GPIO7) }, + { MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO8) }, + { MP_ROM_QSTR(MP_QSTR_BT_ARRAY_ADC), MP_ROM_PTR(&pin_GPIO6) }, + + // 3.2 inch LCD FPC + { MP_ROM_QSTR(MP_QSTR_LCD_TP_MISO), MP_ROM_PTR(&pin_GPIO42) }, + { MP_ROM_QSTR(MP_QSTR_LCD_TP_MOSI), MP_ROM_PTR(&pin_GPIO40) }, + { MP_ROM_QSTR(MP_QSTR_LCD_TP_SCK), MP_ROM_PTR(&pin_GPIO38) }, + { MP_ROM_QSTR(MP_QSTR_LCD_TP_CS), MP_ROM_PTR(&pin_GPIO33) }, + { MP_ROM_QSTR(MP_QSTR_LCD_TP_IRQ), MP_ROM_PTR(&pin_GPIO2) }, + { MP_ROM_QSTR(MP_QSTR_LCD_TP_BUSY), MP_ROM_PTR(&pin_GPIO4) }, + { MP_ROM_QSTR(MP_QSTR_LCD_BL_CTR), MP_ROM_PTR(&pin_GPIO6) }, + { MP_ROM_QSTR(MP_QSTR_LCD_MISO), MP_ROM_PTR(&pin_GPIO8) }, + { MP_ROM_QSTR(MP_QSTR_LCD_MOSI), MP_ROM_PTR(&pin_GPIO9) }, + { MP_ROM_QSTR(MP_QSTR_LCD_CS), MP_ROM_PTR(&pin_GPIO11) }, + { MP_ROM_QSTR(MP_QSTR_LCD_D_C), MP_ROM_PTR(&pin_GPIO13) }, + { MP_ROM_QSTR(MP_QSTR_LCD_CLK), MP_ROM_PTR(&pin_GPIO15) }, + { MP_ROM_QSTR(MP_QSTR_LCD_RST), MP_ROM_PTR(&pin_GPIO16) }, + + // Audio + { MP_ROM_QSTR(MP_QSTR_AUDIO_SPI_MISO), MP_ROM_PTR(&pin_GPIO42) }, + { MP_ROM_QSTR(MP_QSTR_AUDIO_SPI_MOSI), MP_ROM_PTR(&pin_GPIO40) }, + { MP_ROM_QSTR(MP_QSTR_AUDIO_SPI_SCK), MP_ROM_PTR(&pin_GPIO38) }, + { MP_ROM_QSTR(MP_QSTR_AUDIO_SPI_CS), MP_ROM_PTR(&pin_GPIO33) }, + { MP_ROM_QSTR(MP_QSTR_AUDIO_BT_ADC), MP_ROM_PTR(&pin_GPIO6) }, + { MP_ROM_QSTR(MP_QSTR_AUDIO_SCL), MP_ROM_PTR(&pin_GPIO7) }, + { MP_ROM_QSTR(MP_QSTR_AUDIO_SDA), MP_ROM_PTR(&pin_GPIO8) }, + { MP_ROM_QSTR(MP_QSTR_AUDIO_I2S0_MCLK), MP_ROM_PTR(&pin_GPIO41) }, + { MP_ROM_QSTR(MP_QSTR_AUDIO_I2S0_BCLK), MP_ROM_PTR(&pin_GPIO39) }, + { MP_ROM_QSTR(MP_QSTR_AUDIO_I2S0_LRCK), MP_ROM_PTR(&pin_GPIO21) }, + { MP_ROM_QSTR(MP_QSTR_AUDIO_I2S0_SDI), MP_ROM_PTR(&pin_GPIO1) }, + { MP_ROM_QSTR(MP_QSTR_AUDIO_I2S0_SDO), MP_ROM_PTR(&pin_GPIO3) }, + { MP_ROM_QSTR(MP_QSTR_AUDIO_RST), MP_ROM_PTR(&pin_GPIO5) }, + { MP_ROM_QSTR(MP_QSTR_AUDIO_WAKE_INT), MP_ROM_PTR(&pin_GPIO46) }, + { MP_ROM_QSTR(MP_QSTR_AUDIO_I2S1_MCLK), MP_ROM_PTR(&pin_GPIO35) }, + { MP_ROM_QSTR(MP_QSTR_AUDIO_PA_CTRL), MP_ROM_PTR(&pin_GPIO10) }, + { MP_ROM_QSTR(MP_QSTR_AUDIO_I2S1_SDI), MP_ROM_PTR(&pin_GPIO34) }, + { MP_ROM_QSTR(MP_QSTR_AUDIO_I2S1_SDO), MP_ROM_PTR(&pin_GPIO12) }, + { MP_ROM_QSTR(MP_QSTR_AUDIO_I2S1_LRCK_DAC1), MP_ROM_PTR(&pin_GPIO17) }, + { MP_ROM_QSTR(MP_QSTR_AUDIO_I2S1_BCLK_DAC2), MP_ROM_PTR(&pin_GPIO18) }, + +}; +MP_DEFINE_CONST_DICT(board_module_globals, board_global_dict_table); diff --git a/ports/esp32s2/boards/espressif_kaluga_1.3/sdkconfig b/ports/esp32s2/boards/espressif_kaluga_1.3/sdkconfig new file mode 100644 index 0000000000..26c6388fe5 --- /dev/null +++ b/ports/esp32s2/boards/espressif_kaluga_1.3/sdkconfig @@ -0,0 +1,56 @@ +# CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_SIZE is not set +# CONFIG_COMPILER_OPTIMIZATION_SIZE is not set +# CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_SILENT is not set +# TWAI configuration +# +# CONFIG_TWAI_ISR_IN_IRAM is not set +# end of TWAI configuration + +# +CONFIG_ESP32S2_SPIRAM_SUPPORT=y + +# +# SPI RAM config +# +# CONFIG_SPIRAM_TYPE_AUTO is not set +CONFIG_SPIRAM_TYPE_ESPPSRAM16=y +# CONFIG_SPIRAM_TYPE_ESPPSRAM32 is not set +# CONFIG_SPIRAM_TYPE_ESPPSRAM64 is not set +CONFIG_SPIRAM_SIZE=2097152 + +# +# PSRAM clock and cs IO for ESP32S2 +# +CONFIG_DEFAULT_PSRAM_CLK_IO=30 +CONFIG_DEFAULT_PSRAM_CS_IO=26 +# end of PSRAM clock and cs IO for ESP32S2 + +# CONFIG_SPIRAM_FETCH_INSTRUCTIONS is not set +# CONFIG_SPIRAM_RODATA is not set +# CONFIG_SPIRAM_USE_AHB_DBUS3 is not set +# CONFIG_SPIRAM_SPEED_80M is not set +CONFIG_SPIRAM_SPEED_40M=y +# CONFIG_SPIRAM_SPEED_26M is not set +# CONFIG_SPIRAM_SPEED_20M is not set +CONFIG_SPIRAM=y +CONFIG_SPIRAM_BOOT_INIT=y +# CONFIG_SPIRAM_IGNORE_NOTFOUND is not set +CONFIG_SPIRAM_USE_MEMMAP=y +# CONFIG_SPIRAM_USE_CAPS_ALLOC is not set +# CONFIG_SPIRAM_USE_MALLOC is not set +CONFIG_SPIRAM_MEMTEST=y +# CONFIG_SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY is not set +# end of SPI RAM config + +# CONFIG_ESP_CONSOLE_UART_NONE is not set +CONFIG_ESP_CONSOLE_UART_TX_GPIO=43 +CONFIG_ESP_CONSOLE_UART_RX_GPIO=44 +CONFIG_FREERTOS_TASK_FUNCTION_WRAPPER=y +CONFIG_LWIP_TCP_HIGH_SPEED_RETRANSMISSION=y +CONFIG_COMPILER_OPTIMIZATION_LEVEL_DEBUG=y +# CONFIG_COMPILER_OPTIMIZATION_LEVEL_RELEASE is not set +CONFIG_OPTIMIZATION_ASSERTIONS_ENABLED=y +# CONFIG_OPTIMIZATION_ASSERTIONS_SILENT is not set +# CONFIG_CONSOLE_UART_NONE is not set +CONFIG_CONSOLE_UART_TX_GPIO=43 +CONFIG_CONSOLE_UART_RX_GPIO=44 diff --git a/tools/ci_check_duplicate_usb_vid_pid.py b/tools/ci_check_duplicate_usb_vid_pid.py index 33260eb390..72f7858898 100644 --- a/tools/ci_check_duplicate_usb_vid_pid.py +++ b/tools/ci_check_duplicate_usb_vid_pid.py @@ -47,6 +47,8 @@ DEFAULT_IGNORELIST = [ "metro_m4_express", "unexpectedmaker_feathers2", "unexpectedmaker_feathers2_prerelease", + "espressif_kaluga_1", + "espressif_kaluga_1.3", ] cli_parser = argparse.ArgumentParser(description="USB VID/PID Duplicate Checker") From 3e463ed89e98874b496d2becc8c8409122bd2905 Mon Sep 17 00:00:00 2001 From: Aditya Date: Wed, 9 Jun 2021 17:37:16 +0200 Subject: [PATCH 13/27] fix #4810 --- ports/esp32s2/boards/lilygo_ttgo_t8_s2_st7789/sdkconfig | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/ports/esp32s2/boards/lilygo_ttgo_t8_s2_st7789/sdkconfig b/ports/esp32s2/boards/lilygo_ttgo_t8_s2_st7789/sdkconfig index ce6fe832bf..5d52cbff44 100644 --- a/ports/esp32s2/boards/lilygo_ttgo_t8_s2_st7789/sdkconfig +++ b/ports/esp32s2/boards/lilygo_ttgo_t8_s2_st7789/sdkconfig @@ -13,14 +13,12 @@ CONFIG_DEFAULT_PSRAM_CLK_IO=30 CONFIG_DEFAULT_PSRAM_CS_IO=26 # end of PSRAM clock and cs IO for ESP32S2 -CONFIG_SPIRAM_SPIWP_SD3_PIN=28 CONFIG_SPIRAM_SPEED_40M=y CONFIG_SPIRAM=y CONFIG_SPIRAM_BOOT_INIT=y CONFIG_SPIRAM_USE_MALLOC=y +CONFIG_SPIRAM_USE_MEMMAP=y CONFIG_SPIRAM_MEMTEST=y -CONFIG_SPIRAM_MALLOC_ALWAYSINTERNAL=16384 -CONFIG_SPIRAM_MALLOC_RESERVE_INTERNAL=32768 # end of SPI RAM config # From bc34403d710a3757069bd248da432c35a34e284a Mon Sep 17 00:00:00 2001 From: root Date: Wed, 9 Jun 2021 10:46:14 -0500 Subject: [PATCH 14/27] Removed all references to MICROCONTROLLER_VOLTAGE_DISABLE --- ports/atmel-samd/common-hal/microcontroller/Processor.c | 4 ---- ports/atmel-samd/mpconfigport.h | 7 ------- 2 files changed, 11 deletions(-) diff --git a/ports/atmel-samd/common-hal/microcontroller/Processor.c b/ports/atmel-samd/common-hal/microcontroller/Processor.c index 0776ff65b1..e9831c953a 100644 --- a/ports/atmel-samd/common-hal/microcontroller/Processor.c +++ b/ports/atmel-samd/common-hal/microcontroller/Processor.c @@ -279,9 +279,6 @@ float common_hal_mcu_processor_get_temperature(void) { } float common_hal_mcu_processor_get_voltage(void) { - #if MICROCONTROLLER_VOLTAGE_DISABLE - return NAN; - #else struct adc_sync_descriptor adc; static Adc *adc_insts[] = ADC_INSTS; @@ -327,7 +324,6 @@ float common_hal_mcu_processor_get_voltage(void) { adc_sync_deinit(&adc); // Multiply by 4 to compensate for SCALEDIOVCC division by 4. return (reading / 4095.0f) * 4.0f; - #endif } uint32_t common_hal_mcu_processor_get_frequency(void) { diff --git a/ports/atmel-samd/mpconfigport.h b/ports/atmel-samd/mpconfigport.h index 9025af9153..20f5e2bed0 100644 --- a/ports/atmel-samd/mpconfigport.h +++ b/ports/atmel-samd/mpconfigport.h @@ -73,9 +73,6 @@ #define MICROPY_PY_SYS_PLATFORM "MicroChip SAMD51" #elif defined(SAME54) #define MICROPY_PY_SYS_PLATFORM "MicroChip SAME54" -// #ifndef MICROCONTROLLER_VOLTAGE_DISABLE -// #define MICROCONTROLLER_VOLTAGE_DISABLE (1) -// #endif #endif #define SPI_FLASH_MAX_BAUDRATE 24000000 #define MICROPY_PY_BUILTINS_NOTIMPLEMENTED (1) @@ -243,8 +240,4 @@ CIRCUITPY_COMMON_ROOT_POINTERS \ mp_obj_t playing_audio[AUDIO_DMA_CHANNEL_COUNT]; -#ifndef MICROCONTROLLER_VOLTAGE_DISABLE -#define MICROCONTROLLER_VOLTAGE_DISABLE (0) -#endif - #endif // __INCLUDED_MPCONFIGPORT_H From 5c835adb1088984ee7389dd38b05b8f44c4468e2 Mon Sep 17 00:00:00 2001 From: Ben Clifford Date: Wed, 9 Jun 2021 20:39:56 +0000 Subject: [PATCH 15/27] Correct pull-down direction in parameter documentation for rp2pio --- ports/raspberrypi/bindings/rp2pio/StateMachine.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/raspberrypi/bindings/rp2pio/StateMachine.c b/ports/raspberrypi/bindings/rp2pio/StateMachine.c index f1f511b800..6de6b4f5e4 100644 --- a/ports/raspberrypi/bindings/rp2pio/StateMachine.c +++ b/ports/raspberrypi/bindings/rp2pio/StateMachine.c @@ -100,7 +100,7 @@ //| :param ~microcontroller.Pin first_in_pin: the first pin to use with the IN instruction //| :param int in_pin_count: the count of consecutive pins to use with IN starting at first_in_pin //| :param int pull_in_pin_up: a 1-bit in this mask sets pull up on the corresponding in pin -//| :param int pull_in_pin_down: a 1-bit in this mask sets pull up on the corresponding in pin. Setting both pulls enables a "bus keep" function, i.e. a weak pull to whatever is current high/low state of GPIO. +//| :param int pull_in_pin_down: a 1-bit in this mask sets pull down on the corresponding in pin. Setting both pulls enables a "bus keep" function, i.e. a weak pull to whatever is current high/low state of GPIO. //| :param ~microcontroller.Pin first_set_pin: the first pin to use with the SET instruction //| :param int set_pin_count: the count of consecutive pins to use with SET starting at first_set_pin //| :param int initial_set_pin_state: the initial output value for set pins starting at first_set_pin From 8e5c389c953695be93d980f6f2a31f1b85de33bd Mon Sep 17 00:00:00 2001 From: Jeff Epler Date: Thu, 10 Jun 2021 09:26:59 -0500 Subject: [PATCH 16/27] setup.py: Improve installation of stubs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Don't include a full path from the build system * Rename all packages to "foo-stubs" * Don't install stubs for standard packages like "os" After this, I can `python setup.py install --user` to install the stubs to my local environment, and successfully check code against the stubs, such as ``` /$ mypy -c 'import busio; b: busio.I2C; b.readfrom_into(0x30, b"")' :1: error: Argument 2 to "readfrom_into" of "I2C" has incompatible type "bytes"; expected "Union[bytearray, memoryview, array[Any], ndarray, RGBMatrix]" Found 1 error in 1 file (checked 1 source file) ``` The structure of a wheel built with `python setup.py bdist_wheel` looks more like lxml-stubs, as well. ``` Archive: dist/circuitpython_stubs-7.0.0a3.dev28+g124c7b785-py3-none-any.whl Length Date Time Name --------- ---------- ----- ---- 30705 2021-06-10 13:50 _bleio-stubs/__init__.pyi… ``` Finally, by eliminating `site.getsitepackages()`, this **may** fix the doc building problem on readthedocs. --- setup.py | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/setup.py b/setup.py index 8c1f27e405..930d6b7905 100644 --- a/setup.py +++ b/setup.py @@ -4,13 +4,15 @@ import os import site from datetime import datetime -from typing import List +from typing import Dict, List from setuptools import setup from pathlib import Path import subprocess import re +STD_PACKAGES = set(('array', 'math', 'os', 'random', 'struct', 'sys', 'ssl', 'time')) + stub_root = Path("circuitpython-stubs") stubs = [p.relative_to(stub_root).as_posix() for p in stub_root.glob("*.pyi")] @@ -28,13 +30,18 @@ if len(pieces) > 2: pieces.pop() version = "-".join(pieces) -def build_data_files_list() -> List[tuple]: - result = [] - for package in os.listdir("circuitpython-stubs"): - result.append((site.getsitepackages()[0] + "/" + package + "/", - ["circuitpython-stubs/{}/__init__.pyi".format(package)])) +packages = set(os.listdir("circuitpython-stubs")) - STD_PACKAGES +package_dir = dict((f"{package}-stubs", f"circuitpython-stubs/{package}") + for package in packages) +print("package dir is", package_dir) + +def build_package_data() -> Dict[str, List[str]]: + result = {} + for package in packages: + result[f"{package}-stubs"] = ["*.pyi", "*/*.pyi"] return result +package_data=build_package_data() setup( name="circuitpython-stubs", description="PEP 561 type stubs for CircuitPython", @@ -44,6 +51,9 @@ setup( author_email="circuitpython@adafruit.com", version=version, license="MIT", - data_files=build_data_files_list(), + packages=list(package_data.keys()), + package_data=package_data, + package_dir = package_dir, setup_requires=["setuptools>=38.6.0"], + zip_safe=False, ) From 430480afaad02211a1cfe32c1ed4ff95b6d35505 Mon Sep 17 00:00:00 2001 From: Jeff Epler Date: Thu, 10 Jun 2021 12:54:55 -0500 Subject: [PATCH 17/27] update to ulab 3.0.0 --- extmod/ulab | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extmod/ulab b/extmod/ulab index e3bf07cabb..161a728848 160000 --- a/extmod/ulab +++ b/extmod/ulab @@ -1 +1 @@ -Subproject commit e3bf07cabb728ecfa2b78ea5e468179f94dbf933 +Subproject commit 161a7288482200c884623ed3cb59dd91f53be91a From 046dc28d4ce89e84b4403fd5cfa11f73600a0747 Mon Sep 17 00:00:00 2001 From: Jeff Epler Date: Thu, 10 Jun 2021 13:00:21 -0500 Subject: [PATCH 18/27] make translate --- locale/circuitpython.pot | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot index fbb6402051..f261eb33d3 100644 --- a/locale/circuitpython.pot +++ b/locale/circuitpython.pot @@ -3052,6 +3052,10 @@ msgstr "" msgid "first argument to super() must be type" msgstr "" +#: extmod/ulab/code/scipy/linalg/linalg.c +msgid "first two arguments must be ndarrays" +msgstr "" + #: extmod/ulab/code/ndarray.c msgid "flattening order must be either 'C', or 'F'" msgstr "" @@ -3231,10 +3235,11 @@ msgid "input matrix is asymmetric" msgstr "" #: extmod/ulab/code/numpy/linalg/linalg.c +#: extmod/ulab/code/scipy/linalg/linalg.c msgid "input matrix is singular" msgstr "" -#: extmod/ulab/code/user/user.c +#: extmod/ulab/code/scipy/linalg/linalg.c extmod/ulab/code/user/user.c msgid "input must be a dense ndarray" msgstr "" @@ -3275,7 +3280,7 @@ msgid "integer required" msgstr "" #: extmod/ulab/code/numpy/approx/approx.c -msgid "interp is defined for 1D arrays of equal length" +msgid "interp is defined for 1D iterables of equal length" msgstr "" #: shared-bindings/_bleio/Adapter.c @@ -3819,6 +3824,7 @@ msgstr "" #: ports/esp32s2/boards/artisense_rd00/mpconfigboard.h #: ports/esp32s2/boards/atmegazero_esp32s2/mpconfigboard.h #: ports/esp32s2/boards/electroniccats_bastwifi/mpconfigboard.h +#: ports/esp32s2/boards/espressif_kaluga_1.3/mpconfigboard.h #: ports/esp32s2/boards/espressif_kaluga_1/mpconfigboard.h #: ports/esp32s2/boards/espressif_saola_1_wroom/mpconfigboard.h #: ports/esp32s2/boards/espressif_saola_1_wrover/mpconfigboard.h @@ -3826,7 +3832,8 @@ msgstr "" #: ports/esp32s2/boards/franzininho_wifi_wrover/mpconfigboard.h #: ports/esp32s2/boards/lilygo_ttgo_t8_s2_st7789/mpconfigboard.h #: ports/esp32s2/boards/microdev_micro_s2/mpconfigboard.h -#: ports/esp32s2/boards/muselab_nanoesp32_s2/mpconfigboard.h +#: ports/esp32s2/boards/muselab_nanoesp32_s2_wroom/mpconfigboard.h +#: ports/esp32s2/boards/muselab_nanoesp32_s2_wrover/mpconfigboard.h #: ports/esp32s2/boards/targett_module_clip_wroom/mpconfigboard.h #: ports/esp32s2/boards/targett_module_clip_wrover/mpconfigboard.h #: ports/esp32s2/boards/unexpectedmaker_feathers2/mpconfigboard.h @@ -4129,11 +4136,11 @@ msgid "too many values to unpack (expected %d)" msgstr "" #: extmod/ulab/code/numpy/approx/approx.c -msgid "trapz is defined for 1D arrays" +msgid "trapz is defined for 1D arrays of equal length" msgstr "" #: extmod/ulab/code/numpy/approx/approx.c -msgid "trapz is defined for 1D arrays of equal length" +msgid "trapz is defined for 1D iterables" msgstr "" #: py/obj.c @@ -4316,10 +4323,6 @@ msgstr "" msgid "wrong number of values to unpack" msgstr "" -#: extmod/ulab/code/ndarray.c -msgid "wrong operand type" -msgstr "" - #: extmod/ulab/code/numpy/vector/vector.c msgid "wrong output type" msgstr "" From 1a06d064680f0bf47d485484f3a6608da2e329d5 Mon Sep 17 00:00:00 2001 From: Jeff Epler Date: Fri, 11 Jun 2021 07:46:21 -0500 Subject: [PATCH 19/27] ulab: disable on several stm boards with constrained flash storage --- ports/stm/boards/espruino_wifi/mpconfigboard.mk | 1 + ports/stm/boards/stm32f411ce_blackpill/mpconfigboard.mk | 1 + 2 files changed, 2 insertions(+) diff --git a/ports/stm/boards/espruino_wifi/mpconfigboard.mk b/ports/stm/boards/espruino_wifi/mpconfigboard.mk index a2ceb1ae38..2caa609d07 100644 --- a/ports/stm/boards/espruino_wifi/mpconfigboard.mk +++ b/ports/stm/boards/espruino_wifi/mpconfigboard.mk @@ -15,3 +15,4 @@ LD_FILE = boards/STM32F411_fs.ld # Too big for the flash CIRCUITPY_AUDIOCORE = 0 CIRCUITPY_AUDIOPWMIO = 0 +CIRCUITPY_ULAB = 0 diff --git a/ports/stm/boards/stm32f411ce_blackpill/mpconfigboard.mk b/ports/stm/boards/stm32f411ce_blackpill/mpconfigboard.mk index bfb88ab0ea..dc1dfad0d6 100644 --- a/ports/stm/boards/stm32f411ce_blackpill/mpconfigboard.mk +++ b/ports/stm/boards/stm32f411ce_blackpill/mpconfigboard.mk @@ -19,3 +19,4 @@ LD_FILE = boards/STM32F411_fs.ld # Too big for the flash CIRCUITPY_AUDIOCORE = 0 CIRCUITPY_AUDIOPWMIO = 0 +CIRCUITPY_ULAB = 0 From 75da0b9b3e20ee9f1ed6c1378c47c1890f0cb7c8 Mon Sep 17 00:00:00 2001 From: Hosted Weblate Date: Fri, 11 Jun 2021 18:18:01 +0200 Subject: [PATCH 20/27] Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Translation: CircuitPython/main Translate-URL: https://hosted.weblate.org/projects/circuitpython/main/ --- locale/ID.po | 21 ++++++++++++--------- locale/cs.po | 21 ++++++++++++--------- locale/de_DE.po | 24 +++++++++++++++--------- locale/el.po | 21 ++++++++++++--------- locale/en_GB.po | 36 ++++++++++++++++++++++++------------ locale/es.po | 36 ++++++++++++++++++++++++------------ locale/fil.po | 21 ++++++++++++--------- locale/fr.po | 36 ++++++++++++++++++++++++------------ locale/hi.po | 21 ++++++++++++--------- locale/it_IT.po | 21 ++++++++++++--------- locale/ja.po | 25 ++++++++++++++----------- locale/ko.po | 21 ++++++++++++--------- locale/nl.po | 34 ++++++++++++++++++++++------------ locale/pl.po | 24 +++++++++++++++--------- locale/pt_BR.po | 36 ++++++++++++++++++++++++------------ locale/sv.po | 36 ++++++++++++++++++++++++------------ locale/zh_Latn_pinyin.po | 36 ++++++++++++++++++++++++------------ 17 files changed, 294 insertions(+), 176 deletions(-) diff --git a/locale/ID.po b/locale/ID.po index f8ea996124..37014ecd4a 100644 --- a/locale/ID.po +++ b/locale/ID.po @@ -3094,6 +3094,10 @@ msgstr "" msgid "first argument to super() must be type" msgstr "" +#: extmod/ulab/code/scipy/linalg/linalg.c +msgid "first two arguments must be ndarrays" +msgstr "" + #: extmod/ulab/code/ndarray.c msgid "flattening order must be either 'C', or 'F'" msgstr "" @@ -3273,10 +3277,11 @@ msgid "input matrix is asymmetric" msgstr "" #: extmod/ulab/code/numpy/linalg/linalg.c +#: extmod/ulab/code/scipy/linalg/linalg.c msgid "input matrix is singular" msgstr "" -#: extmod/ulab/code/user/user.c +#: extmod/ulab/code/scipy/linalg/linalg.c extmod/ulab/code/user/user.c msgid "input must be a dense ndarray" msgstr "" @@ -3317,7 +3322,7 @@ msgid "integer required" msgstr "" #: extmod/ulab/code/numpy/approx/approx.c -msgid "interp is defined for 1D arrays of equal length" +msgid "interp is defined for 1D iterables of equal length" msgstr "" #: shared-bindings/_bleio/Adapter.c @@ -3862,6 +3867,7 @@ msgstr "" #: ports/esp32s2/boards/artisense_rd00/mpconfigboard.h #: ports/esp32s2/boards/atmegazero_esp32s2/mpconfigboard.h #: ports/esp32s2/boards/electroniccats_bastwifi/mpconfigboard.h +#: ports/esp32s2/boards/espressif_kaluga_1.3/mpconfigboard.h #: ports/esp32s2/boards/espressif_kaluga_1/mpconfigboard.h #: ports/esp32s2/boards/espressif_saola_1_wroom/mpconfigboard.h #: ports/esp32s2/boards/espressif_saola_1_wrover/mpconfigboard.h @@ -3869,7 +3875,8 @@ msgstr "" #: ports/esp32s2/boards/franzininho_wifi_wrover/mpconfigboard.h #: ports/esp32s2/boards/lilygo_ttgo_t8_s2_st7789/mpconfigboard.h #: ports/esp32s2/boards/microdev_micro_s2/mpconfigboard.h -#: ports/esp32s2/boards/muselab_nanoesp32_s2/mpconfigboard.h +#: ports/esp32s2/boards/muselab_nanoesp32_s2_wroom/mpconfigboard.h +#: ports/esp32s2/boards/muselab_nanoesp32_s2_wrover/mpconfigboard.h #: ports/esp32s2/boards/targett_module_clip_wroom/mpconfigboard.h #: ports/esp32s2/boards/targett_module_clip_wrover/mpconfigboard.h #: ports/esp32s2/boards/unexpectedmaker_feathers2/mpconfigboard.h @@ -4172,11 +4179,11 @@ msgid "too many values to unpack (expected %d)" msgstr "" #: extmod/ulab/code/numpy/approx/approx.c -msgid "trapz is defined for 1D arrays" +msgid "trapz is defined for 1D arrays of equal length" msgstr "" #: extmod/ulab/code/numpy/approx/approx.c -msgid "trapz is defined for 1D arrays of equal length" +msgid "trapz is defined for 1D iterables" msgstr "" #: py/obj.c @@ -4359,10 +4366,6 @@ msgstr "jumlah argumen salah" msgid "wrong number of values to unpack" msgstr "" -#: extmod/ulab/code/ndarray.c -msgid "wrong operand type" -msgstr "" - #: extmod/ulab/code/numpy/vector/vector.c msgid "wrong output type" msgstr "" diff --git a/locale/cs.po b/locale/cs.po index 902d0e9254..b887027573 100644 --- a/locale/cs.po +++ b/locale/cs.po @@ -3055,6 +3055,10 @@ msgstr "" msgid "first argument to super() must be type" msgstr "" +#: extmod/ulab/code/scipy/linalg/linalg.c +msgid "first two arguments must be ndarrays" +msgstr "" + #: extmod/ulab/code/ndarray.c msgid "flattening order must be either 'C', or 'F'" msgstr "" @@ -3234,10 +3238,11 @@ msgid "input matrix is asymmetric" msgstr "" #: extmod/ulab/code/numpy/linalg/linalg.c +#: extmod/ulab/code/scipy/linalg/linalg.c msgid "input matrix is singular" msgstr "" -#: extmod/ulab/code/user/user.c +#: extmod/ulab/code/scipy/linalg/linalg.c extmod/ulab/code/user/user.c msgid "input must be a dense ndarray" msgstr "" @@ -3278,7 +3283,7 @@ msgid "integer required" msgstr "" #: extmod/ulab/code/numpy/approx/approx.c -msgid "interp is defined for 1D arrays of equal length" +msgid "interp is defined for 1D iterables of equal length" msgstr "" #: shared-bindings/_bleio/Adapter.c @@ -3822,6 +3827,7 @@ msgstr "" #: ports/esp32s2/boards/artisense_rd00/mpconfigboard.h #: ports/esp32s2/boards/atmegazero_esp32s2/mpconfigboard.h #: ports/esp32s2/boards/electroniccats_bastwifi/mpconfigboard.h +#: ports/esp32s2/boards/espressif_kaluga_1.3/mpconfigboard.h #: ports/esp32s2/boards/espressif_kaluga_1/mpconfigboard.h #: ports/esp32s2/boards/espressif_saola_1_wroom/mpconfigboard.h #: ports/esp32s2/boards/espressif_saola_1_wrover/mpconfigboard.h @@ -3829,7 +3835,8 @@ msgstr "" #: ports/esp32s2/boards/franzininho_wifi_wrover/mpconfigboard.h #: ports/esp32s2/boards/lilygo_ttgo_t8_s2_st7789/mpconfigboard.h #: ports/esp32s2/boards/microdev_micro_s2/mpconfigboard.h -#: ports/esp32s2/boards/muselab_nanoesp32_s2/mpconfigboard.h +#: ports/esp32s2/boards/muselab_nanoesp32_s2_wroom/mpconfigboard.h +#: ports/esp32s2/boards/muselab_nanoesp32_s2_wrover/mpconfigboard.h #: ports/esp32s2/boards/targett_module_clip_wroom/mpconfigboard.h #: ports/esp32s2/boards/targett_module_clip_wrover/mpconfigboard.h #: ports/esp32s2/boards/unexpectedmaker_feathers2/mpconfigboard.h @@ -4132,11 +4139,11 @@ msgid "too many values to unpack (expected %d)" msgstr "" #: extmod/ulab/code/numpy/approx/approx.c -msgid "trapz is defined for 1D arrays" +msgid "trapz is defined for 1D arrays of equal length" msgstr "" #: extmod/ulab/code/numpy/approx/approx.c -msgid "trapz is defined for 1D arrays of equal length" +msgid "trapz is defined for 1D iterables" msgstr "" #: py/obj.c @@ -4319,10 +4326,6 @@ msgstr "" msgid "wrong number of values to unpack" msgstr "" -#: extmod/ulab/code/ndarray.c -msgid "wrong operand type" -msgstr "" - #: extmod/ulab/code/numpy/vector/vector.c msgid "wrong output type" msgstr "" diff --git a/locale/de_DE.po b/locale/de_DE.po index ea3fed6ea8..83c7e2d29c 100644 --- a/locale/de_DE.po +++ b/locale/de_DE.po @@ -3112,6 +3112,10 @@ msgstr "Das erste Argument muss ein Ndarray sein" msgid "first argument to super() must be type" msgstr "Das erste Argument für super() muss type sein" +#: extmod/ulab/code/scipy/linalg/linalg.c +msgid "first two arguments must be ndarrays" +msgstr "" + #: extmod/ulab/code/ndarray.c msgid "flattening order must be either 'C', or 'F'" msgstr "Die Abflachungsreihenfolge muss entweder \"C\" oder \"F\" sein" @@ -3293,10 +3297,11 @@ msgid "input matrix is asymmetric" msgstr "Eingabematrix ist asymmetrisch" #: extmod/ulab/code/numpy/linalg/linalg.c +#: extmod/ulab/code/scipy/linalg/linalg.c msgid "input matrix is singular" msgstr "Eingabematrix ist singulär" -#: extmod/ulab/code/user/user.c +#: extmod/ulab/code/scipy/linalg/linalg.c extmod/ulab/code/user/user.c msgid "input must be a dense ndarray" msgstr "" @@ -3337,7 +3342,7 @@ msgid "integer required" msgstr "integer erforderlich" #: extmod/ulab/code/numpy/approx/approx.c -msgid "interp is defined for 1D arrays of equal length" +msgid "interp is defined for 1D iterables of equal length" msgstr "" #: shared-bindings/_bleio/Adapter.c @@ -3891,6 +3896,7 @@ msgstr "pow () mit 3 Argumenten erfordert Integer" #: ports/esp32s2/boards/artisense_rd00/mpconfigboard.h #: ports/esp32s2/boards/atmegazero_esp32s2/mpconfigboard.h #: ports/esp32s2/boards/electroniccats_bastwifi/mpconfigboard.h +#: ports/esp32s2/boards/espressif_kaluga_1.3/mpconfigboard.h #: ports/esp32s2/boards/espressif_kaluga_1/mpconfigboard.h #: ports/esp32s2/boards/espressif_saola_1_wroom/mpconfigboard.h #: ports/esp32s2/boards/espressif_saola_1_wrover/mpconfigboard.h @@ -3898,7 +3904,8 @@ msgstr "pow () mit 3 Argumenten erfordert Integer" #: ports/esp32s2/boards/franzininho_wifi_wrover/mpconfigboard.h #: ports/esp32s2/boards/lilygo_ttgo_t8_s2_st7789/mpconfigboard.h #: ports/esp32s2/boards/microdev_micro_s2/mpconfigboard.h -#: ports/esp32s2/boards/muselab_nanoesp32_s2/mpconfigboard.h +#: ports/esp32s2/boards/muselab_nanoesp32_s2_wroom/mpconfigboard.h +#: ports/esp32s2/boards/muselab_nanoesp32_s2_wrover/mpconfigboard.h #: ports/esp32s2/boards/targett_module_clip_wroom/mpconfigboard.h #: ports/esp32s2/boards/targett_module_clip_wrover/mpconfigboard.h #: ports/esp32s2/boards/unexpectedmaker_feathers2/mpconfigboard.h @@ -4204,11 +4211,11 @@ msgid "too many values to unpack (expected %d)" msgstr "zu viele Werte zum Auspacken (erwartet %d)" #: extmod/ulab/code/numpy/approx/approx.c -msgid "trapz is defined for 1D arrays" +msgid "trapz is defined for 1D arrays of equal length" msgstr "" #: extmod/ulab/code/numpy/approx/approx.c -msgid "trapz is defined for 1D arrays of equal length" +msgid "trapz is defined for 1D iterables" msgstr "" #: py/obj.c @@ -4395,10 +4402,6 @@ msgstr "falsche Anzahl an Argumenten" msgid "wrong number of values to unpack" msgstr "falsche Anzahl zu entpackender Werte" -#: extmod/ulab/code/ndarray.c -msgid "wrong operand type" -msgstr "falscher Operandentyp" - #: extmod/ulab/code/numpy/vector/vector.c msgid "wrong output type" msgstr "Falscher Ausgabetyp" @@ -4435,6 +4438,9 @@ msgstr "" msgid "zi must be of shape (n_section, 2)" msgstr "" +#~ msgid "wrong operand type" +#~ msgstr "falscher Operandentyp" + #~ msgid "" #~ "CircuitPython is in safe mode because you pressed the reset button during " #~ "boot. Press again to exit safe mode.\n" diff --git a/locale/el.po b/locale/el.po index 5203a4d6a9..047e15f69f 100644 --- a/locale/el.po +++ b/locale/el.po @@ -3052,6 +3052,10 @@ msgstr "" msgid "first argument to super() must be type" msgstr "" +#: extmod/ulab/code/scipy/linalg/linalg.c +msgid "first two arguments must be ndarrays" +msgstr "" + #: extmod/ulab/code/ndarray.c msgid "flattening order must be either 'C', or 'F'" msgstr "" @@ -3231,10 +3235,11 @@ msgid "input matrix is asymmetric" msgstr "" #: extmod/ulab/code/numpy/linalg/linalg.c +#: extmod/ulab/code/scipy/linalg/linalg.c msgid "input matrix is singular" msgstr "" -#: extmod/ulab/code/user/user.c +#: extmod/ulab/code/scipy/linalg/linalg.c extmod/ulab/code/user/user.c msgid "input must be a dense ndarray" msgstr "" @@ -3275,7 +3280,7 @@ msgid "integer required" msgstr "" #: extmod/ulab/code/numpy/approx/approx.c -msgid "interp is defined for 1D arrays of equal length" +msgid "interp is defined for 1D iterables of equal length" msgstr "" #: shared-bindings/_bleio/Adapter.c @@ -3819,6 +3824,7 @@ msgstr "" #: ports/esp32s2/boards/artisense_rd00/mpconfigboard.h #: ports/esp32s2/boards/atmegazero_esp32s2/mpconfigboard.h #: ports/esp32s2/boards/electroniccats_bastwifi/mpconfigboard.h +#: ports/esp32s2/boards/espressif_kaluga_1.3/mpconfigboard.h #: ports/esp32s2/boards/espressif_kaluga_1/mpconfigboard.h #: ports/esp32s2/boards/espressif_saola_1_wroom/mpconfigboard.h #: ports/esp32s2/boards/espressif_saola_1_wrover/mpconfigboard.h @@ -3826,7 +3832,8 @@ msgstr "" #: ports/esp32s2/boards/franzininho_wifi_wrover/mpconfigboard.h #: ports/esp32s2/boards/lilygo_ttgo_t8_s2_st7789/mpconfigboard.h #: ports/esp32s2/boards/microdev_micro_s2/mpconfigboard.h -#: ports/esp32s2/boards/muselab_nanoesp32_s2/mpconfigboard.h +#: ports/esp32s2/boards/muselab_nanoesp32_s2_wroom/mpconfigboard.h +#: ports/esp32s2/boards/muselab_nanoesp32_s2_wrover/mpconfigboard.h #: ports/esp32s2/boards/targett_module_clip_wroom/mpconfigboard.h #: ports/esp32s2/boards/targett_module_clip_wrover/mpconfigboard.h #: ports/esp32s2/boards/unexpectedmaker_feathers2/mpconfigboard.h @@ -4129,11 +4136,11 @@ msgid "too many values to unpack (expected %d)" msgstr "" #: extmod/ulab/code/numpy/approx/approx.c -msgid "trapz is defined for 1D arrays" +msgid "trapz is defined for 1D arrays of equal length" msgstr "" #: extmod/ulab/code/numpy/approx/approx.c -msgid "trapz is defined for 1D arrays of equal length" +msgid "trapz is defined for 1D iterables" msgstr "" #: py/obj.c @@ -4316,10 +4323,6 @@ msgstr "" msgid "wrong number of values to unpack" msgstr "" -#: extmod/ulab/code/ndarray.c -msgid "wrong operand type" -msgstr "" - #: extmod/ulab/code/numpy/vector/vector.c msgid "wrong output type" msgstr "" diff --git a/locale/en_GB.po b/locale/en_GB.po index 8eff40108e..b20d669d46 100644 --- a/locale/en_GB.po +++ b/locale/en_GB.po @@ -3090,6 +3090,10 @@ msgstr "first argument must be an ndarray" msgid "first argument to super() must be type" msgstr "first argument to super() must be type" +#: extmod/ulab/code/scipy/linalg/linalg.c +msgid "first two arguments must be ndarrays" +msgstr "" + #: extmod/ulab/code/ndarray.c msgid "flattening order must be either 'C', or 'F'" msgstr "flattening order must be either 'C', or 'F'" @@ -3269,10 +3273,11 @@ msgid "input matrix is asymmetric" msgstr "input matrix is asymmetric" #: extmod/ulab/code/numpy/linalg/linalg.c +#: extmod/ulab/code/scipy/linalg/linalg.c msgid "input matrix is singular" msgstr "input matrix is singular" -#: extmod/ulab/code/user/user.c +#: extmod/ulab/code/scipy/linalg/linalg.c extmod/ulab/code/user/user.c msgid "input must be a dense ndarray" msgstr "input must be a dense ndarray" @@ -3313,8 +3318,8 @@ msgid "integer required" msgstr "integer required" #: extmod/ulab/code/numpy/approx/approx.c -msgid "interp is defined for 1D arrays of equal length" -msgstr "interp is defined for 1D arrays of equal length" +msgid "interp is defined for 1D iterables of equal length" +msgstr "" #: shared-bindings/_bleio/Adapter.c #, c-format @@ -3858,6 +3863,7 @@ msgstr "pow() with 3 arguments requires integers" #: ports/esp32s2/boards/artisense_rd00/mpconfigboard.h #: ports/esp32s2/boards/atmegazero_esp32s2/mpconfigboard.h #: ports/esp32s2/boards/electroniccats_bastwifi/mpconfigboard.h +#: ports/esp32s2/boards/espressif_kaluga_1.3/mpconfigboard.h #: ports/esp32s2/boards/espressif_kaluga_1/mpconfigboard.h #: ports/esp32s2/boards/espressif_saola_1_wroom/mpconfigboard.h #: ports/esp32s2/boards/espressif_saola_1_wrover/mpconfigboard.h @@ -3865,7 +3871,8 @@ msgstr "pow() with 3 arguments requires integers" #: ports/esp32s2/boards/franzininho_wifi_wrover/mpconfigboard.h #: ports/esp32s2/boards/lilygo_ttgo_t8_s2_st7789/mpconfigboard.h #: ports/esp32s2/boards/microdev_micro_s2/mpconfigboard.h -#: ports/esp32s2/boards/muselab_nanoesp32_s2/mpconfigboard.h +#: ports/esp32s2/boards/muselab_nanoesp32_s2_wroom/mpconfigboard.h +#: ports/esp32s2/boards/muselab_nanoesp32_s2_wrover/mpconfigboard.h #: ports/esp32s2/boards/targett_module_clip_wroom/mpconfigboard.h #: ports/esp32s2/boards/targett_module_clip_wrover/mpconfigboard.h #: ports/esp32s2/boards/unexpectedmaker_feathers2/mpconfigboard.h @@ -4169,14 +4176,14 @@ msgstr "" msgid "too many values to unpack (expected %d)" msgstr "too many values to unpack (expected %d)" -#: extmod/ulab/code/numpy/approx/approx.c -msgid "trapz is defined for 1D arrays" -msgstr "trapz is defined for 1D arrays" - #: extmod/ulab/code/numpy/approx/approx.c msgid "trapz is defined for 1D arrays of equal length" msgstr "trapz is defined for 1D arrays of equal length" +#: extmod/ulab/code/numpy/approx/approx.c +msgid "trapz is defined for 1D iterables" +msgstr "" + #: py/obj.c msgid "tuple/list has wrong length" msgstr "tuple/list has wrong length" @@ -4357,10 +4364,6 @@ msgstr "wrong number of arguments" msgid "wrong number of values to unpack" msgstr "wrong number of values to unpack" -#: extmod/ulab/code/ndarray.c -msgid "wrong operand type" -msgstr "wrong operand type" - #: extmod/ulab/code/numpy/vector/vector.c msgid "wrong output type" msgstr "wrong output type" @@ -4397,6 +4400,15 @@ msgstr "zi must be of float type" msgid "zi must be of shape (n_section, 2)" msgstr "zi must be of shape (n_section, 2)" +#~ msgid "interp is defined for 1D arrays of equal length" +#~ msgstr "interp is defined for 1D arrays of equal length" + +#~ msgid "trapz is defined for 1D arrays" +#~ msgstr "trapz is defined for 1D arrays" + +#~ msgid "wrong operand type" +#~ msgstr "wrong operand type" + #~ msgid "Only raw int supported for ip" #~ msgstr "Only raw int supported for ip" diff --git a/locale/es.po b/locale/es.po index 973a94b284..b6f135a9df 100644 --- a/locale/es.po +++ b/locale/es.po @@ -3138,6 +3138,10 @@ msgstr "el primer argumento debe ser ndarray" msgid "first argument to super() must be type" msgstr "primer argumento para super() debe ser de tipo" +#: extmod/ulab/code/scipy/linalg/linalg.c +msgid "first two arguments must be ndarrays" +msgstr "" + #: extmod/ulab/code/ndarray.c msgid "flattening order must be either 'C', or 'F'" msgstr "el orden de aplanamiento debe ser 'C' o 'F'" @@ -3317,10 +3321,11 @@ msgid "input matrix is asymmetric" msgstr "la matriz de entrada es asimétrica" #: extmod/ulab/code/numpy/linalg/linalg.c +#: extmod/ulab/code/scipy/linalg/linalg.c msgid "input matrix is singular" msgstr "la matriz de entrada es singular" -#: extmod/ulab/code/user/user.c +#: extmod/ulab/code/scipy/linalg/linalg.c extmod/ulab/code/user/user.c msgid "input must be a dense ndarray" msgstr "Entrada tiene que ser un ndarray denso" @@ -3361,8 +3366,8 @@ msgid "integer required" msgstr "Entero requerido" #: extmod/ulab/code/numpy/approx/approx.c -msgid "interp is defined for 1D arrays of equal length" -msgstr "interp está definido para arreglos de 1D del mismo tamaño" +msgid "interp is defined for 1D iterables of equal length" +msgstr "" #: shared-bindings/_bleio/Adapter.c #, c-format @@ -3912,6 +3917,7 @@ msgstr "pow() con 3 argumentos requiere enteros" #: ports/esp32s2/boards/artisense_rd00/mpconfigboard.h #: ports/esp32s2/boards/atmegazero_esp32s2/mpconfigboard.h #: ports/esp32s2/boards/electroniccats_bastwifi/mpconfigboard.h +#: ports/esp32s2/boards/espressif_kaluga_1.3/mpconfigboard.h #: ports/esp32s2/boards/espressif_kaluga_1/mpconfigboard.h #: ports/esp32s2/boards/espressif_saola_1_wroom/mpconfigboard.h #: ports/esp32s2/boards/espressif_saola_1_wrover/mpconfigboard.h @@ -3919,7 +3925,8 @@ msgstr "pow() con 3 argumentos requiere enteros" #: ports/esp32s2/boards/franzininho_wifi_wrover/mpconfigboard.h #: ports/esp32s2/boards/lilygo_ttgo_t8_s2_st7789/mpconfigboard.h #: ports/esp32s2/boards/microdev_micro_s2/mpconfigboard.h -#: ports/esp32s2/boards/muselab_nanoesp32_s2/mpconfigboard.h +#: ports/esp32s2/boards/muselab_nanoesp32_s2_wroom/mpconfigboard.h +#: ports/esp32s2/boards/muselab_nanoesp32_s2_wrover/mpconfigboard.h #: ports/esp32s2/boards/targett_module_clip_wroom/mpconfigboard.h #: ports/esp32s2/boards/targett_module_clip_wrover/mpconfigboard.h #: ports/esp32s2/boards/unexpectedmaker_feathers2/mpconfigboard.h @@ -4224,14 +4231,14 @@ msgstr "muchas llamadas locales para método nativo" msgid "too many values to unpack (expected %d)" msgstr "demasiados valores para descomprimir (%d esperado)" -#: extmod/ulab/code/numpy/approx/approx.c -msgid "trapz is defined for 1D arrays" -msgstr "trapz esta definido para matrices 1D" - #: extmod/ulab/code/numpy/approx/approx.c msgid "trapz is defined for 1D arrays of equal length" msgstr "trapz está definido para arreglos 1D de igual tamaño" +#: extmod/ulab/code/numpy/approx/approx.c +msgid "trapz is defined for 1D iterables" +msgstr "" + #: py/obj.c msgid "tuple/list has wrong length" msgstr "tupla/lista tiene una longitud incorrecta" @@ -4412,10 +4419,6 @@ msgstr "numero erroneo de argumentos" msgid "wrong number of values to unpack" msgstr "numero erroneo de valores a descomprimir" -#: extmod/ulab/code/ndarray.c -msgid "wrong operand type" -msgstr "tipo de operando incorrecto" - #: extmod/ulab/code/numpy/vector/vector.c msgid "wrong output type" msgstr "tipo de salida incorrecta" @@ -4452,6 +4455,15 @@ msgstr "zi debe ser de tipo flotante" msgid "zi must be of shape (n_section, 2)" msgstr "zi debe ser una forma (n_section,2)" +#~ msgid "interp is defined for 1D arrays of equal length" +#~ msgstr "interp está definido para arreglos de 1D del mismo tamaño" + +#~ msgid "trapz is defined for 1D arrays" +#~ msgstr "trapz esta definido para matrices 1D" + +#~ msgid "wrong operand type" +#~ msgstr "tipo de operando incorrecto" + #~ msgid "%q must be None or 1-255" #~ msgstr "%q debe ser None o 1-255" diff --git a/locale/fil.po b/locale/fil.po index 748886d42b..68914b7a4b 100644 --- a/locale/fil.po +++ b/locale/fil.po @@ -3092,6 +3092,10 @@ msgstr "" msgid "first argument to super() must be type" msgstr "unang argument ng super() ay dapat type" +#: extmod/ulab/code/scipy/linalg/linalg.c +msgid "first two arguments must be ndarrays" +msgstr "" + #: extmod/ulab/code/ndarray.c msgid "flattening order must be either 'C', or 'F'" msgstr "" @@ -3272,10 +3276,11 @@ msgid "input matrix is asymmetric" msgstr "" #: extmod/ulab/code/numpy/linalg/linalg.c +#: extmod/ulab/code/scipy/linalg/linalg.c msgid "input matrix is singular" msgstr "" -#: extmod/ulab/code/user/user.c +#: extmod/ulab/code/scipy/linalg/linalg.c extmod/ulab/code/user/user.c msgid "input must be a dense ndarray" msgstr "" @@ -3316,7 +3321,7 @@ msgid "integer required" msgstr "kailangan ng int" #: extmod/ulab/code/numpy/approx/approx.c -msgid "interp is defined for 1D arrays of equal length" +msgid "interp is defined for 1D iterables of equal length" msgstr "" #: shared-bindings/_bleio/Adapter.c @@ -3866,6 +3871,7 @@ msgstr "pow() na may 3 argumento kailangan ng integers" #: ports/esp32s2/boards/artisense_rd00/mpconfigboard.h #: ports/esp32s2/boards/atmegazero_esp32s2/mpconfigboard.h #: ports/esp32s2/boards/electroniccats_bastwifi/mpconfigboard.h +#: ports/esp32s2/boards/espressif_kaluga_1.3/mpconfigboard.h #: ports/esp32s2/boards/espressif_kaluga_1/mpconfigboard.h #: ports/esp32s2/boards/espressif_saola_1_wroom/mpconfigboard.h #: ports/esp32s2/boards/espressif_saola_1_wrover/mpconfigboard.h @@ -3873,7 +3879,8 @@ msgstr "pow() na may 3 argumento kailangan ng integers" #: ports/esp32s2/boards/franzininho_wifi_wrover/mpconfigboard.h #: ports/esp32s2/boards/lilygo_ttgo_t8_s2_st7789/mpconfigboard.h #: ports/esp32s2/boards/microdev_micro_s2/mpconfigboard.h -#: ports/esp32s2/boards/muselab_nanoesp32_s2/mpconfigboard.h +#: ports/esp32s2/boards/muselab_nanoesp32_s2_wroom/mpconfigboard.h +#: ports/esp32s2/boards/muselab_nanoesp32_s2_wrover/mpconfigboard.h #: ports/esp32s2/boards/targett_module_clip_wroom/mpconfigboard.h #: ports/esp32s2/boards/targett_module_clip_wrover/mpconfigboard.h #: ports/esp32s2/boards/unexpectedmaker_feathers2/mpconfigboard.h @@ -4180,11 +4187,11 @@ msgid "too many values to unpack (expected %d)" msgstr "masyadong maraming values para i-unpact (umaasa ng %d)" #: extmod/ulab/code/numpy/approx/approx.c -msgid "trapz is defined for 1D arrays" +msgid "trapz is defined for 1D arrays of equal length" msgstr "" #: extmod/ulab/code/numpy/approx/approx.c -msgid "trapz is defined for 1D arrays of equal length" +msgid "trapz is defined for 1D iterables" msgstr "" #: py/obj.c @@ -4367,10 +4374,6 @@ msgstr "mali ang bilang ng argumento" msgid "wrong number of values to unpack" msgstr "maling number ng value na i-unpack" -#: extmod/ulab/code/ndarray.c -msgid "wrong operand type" -msgstr "" - #: extmod/ulab/code/numpy/vector/vector.c msgid "wrong output type" msgstr "" diff --git a/locale/fr.po b/locale/fr.po index 902821ca1d..cd8be6e129 100644 --- a/locale/fr.po +++ b/locale/fr.po @@ -3146,6 +3146,10 @@ msgstr "le premier paramêtre doit être un ndarray" msgid "first argument to super() must be type" msgstr "le premier argument de super() doit être un type" +#: extmod/ulab/code/scipy/linalg/linalg.c +msgid "first two arguments must be ndarrays" +msgstr "" + #: extmod/ulab/code/ndarray.c msgid "flattening order must be either 'C', or 'F'" msgstr "l'ordre d'aplatissement doit être «C» ou «F»" @@ -3326,10 +3330,11 @@ msgid "input matrix is asymmetric" msgstr "la matrice d'entrée est asymétrique" #: extmod/ulab/code/numpy/linalg/linalg.c +#: extmod/ulab/code/scipy/linalg/linalg.c msgid "input matrix is singular" msgstr "la matrice d'entrée est singulière" -#: extmod/ulab/code/user/user.c +#: extmod/ulab/code/scipy/linalg/linalg.c extmod/ulab/code/user/user.c msgid "input must be a dense ndarray" msgstr "l'entrée doit être un ndarray dense" @@ -3370,8 +3375,8 @@ msgid "integer required" msgstr "entier requis" #: extmod/ulab/code/numpy/approx/approx.c -msgid "interp is defined for 1D arrays of equal length" -msgstr "interp est défini pour les matrices 1D de longueur égale" +msgid "interp is defined for 1D iterables of equal length" +msgstr "" #: shared-bindings/_bleio/Adapter.c #, c-format @@ -3923,6 +3928,7 @@ msgstr "pow() avec 3 arguments nécessite des entiers" #: ports/esp32s2/boards/artisense_rd00/mpconfigboard.h #: ports/esp32s2/boards/atmegazero_esp32s2/mpconfigboard.h #: ports/esp32s2/boards/electroniccats_bastwifi/mpconfigboard.h +#: ports/esp32s2/boards/espressif_kaluga_1.3/mpconfigboard.h #: ports/esp32s2/boards/espressif_kaluga_1/mpconfigboard.h #: ports/esp32s2/boards/espressif_saola_1_wroom/mpconfigboard.h #: ports/esp32s2/boards/espressif_saola_1_wrover/mpconfigboard.h @@ -3930,7 +3936,8 @@ msgstr "pow() avec 3 arguments nécessite des entiers" #: ports/esp32s2/boards/franzininho_wifi_wrover/mpconfigboard.h #: ports/esp32s2/boards/lilygo_ttgo_t8_s2_st7789/mpconfigboard.h #: ports/esp32s2/boards/microdev_micro_s2/mpconfigboard.h -#: ports/esp32s2/boards/muselab_nanoesp32_s2/mpconfigboard.h +#: ports/esp32s2/boards/muselab_nanoesp32_s2_wroom/mpconfigboard.h +#: ports/esp32s2/boards/muselab_nanoesp32_s2_wrover/mpconfigboard.h #: ports/esp32s2/boards/targett_module_clip_wroom/mpconfigboard.h #: ports/esp32s2/boards/targett_module_clip_wrover/mpconfigboard.h #: ports/esp32s2/boards/unexpectedmaker_feathers2/mpconfigboard.h @@ -4235,14 +4242,14 @@ msgstr "" msgid "too many values to unpack (expected %d)" msgstr "trop de valeur à dégrouper (%d attendues)" -#: extmod/ulab/code/numpy/approx/approx.c -msgid "trapz is defined for 1D arrays" -msgstr "trapz est définie pour matrices à une dimension" - #: extmod/ulab/code/numpy/approx/approx.c msgid "trapz is defined for 1D arrays of equal length" msgstr "trapz n'est défini que pour des matrices 1D de longueur égales" +#: extmod/ulab/code/numpy/approx/approx.c +msgid "trapz is defined for 1D iterables" +msgstr "" + #: py/obj.c msgid "tuple/list has wrong length" msgstr "tuple/liste a une mauvaise longueur" @@ -4423,10 +4430,6 @@ msgstr "mauvais nombres d'arguments" msgid "wrong number of values to unpack" msgstr "mauvais nombre de valeurs à dégrouper" -#: extmod/ulab/code/ndarray.c -msgid "wrong operand type" -msgstr "type d'opérande incorrect" - #: extmod/ulab/code/numpy/vector/vector.c msgid "wrong output type" msgstr "type de sortie incorrect" @@ -4463,6 +4466,15 @@ msgstr "zi doit être de type float" msgid "zi must be of shape (n_section, 2)" msgstr "zi doit être de forme (n_section, 2)" +#~ msgid "interp is defined for 1D arrays of equal length" +#~ msgstr "interp est défini pour les matrices 1D de longueur égale" + +#~ msgid "trapz is defined for 1D arrays" +#~ msgstr "trapz est définie pour matrices à une dimension" + +#~ msgid "wrong operand type" +#~ msgstr "type d'opérande incorrect" + #~ msgid "%q must be None or 1-255" #~ msgstr "%q doit être None ou compris entre 1 et 255" diff --git a/locale/hi.po b/locale/hi.po index 604cb4ca56..d709cbf79d 100644 --- a/locale/hi.po +++ b/locale/hi.po @@ -3052,6 +3052,10 @@ msgstr "" msgid "first argument to super() must be type" msgstr "" +#: extmod/ulab/code/scipy/linalg/linalg.c +msgid "first two arguments must be ndarrays" +msgstr "" + #: extmod/ulab/code/ndarray.c msgid "flattening order must be either 'C', or 'F'" msgstr "" @@ -3231,10 +3235,11 @@ msgid "input matrix is asymmetric" msgstr "" #: extmod/ulab/code/numpy/linalg/linalg.c +#: extmod/ulab/code/scipy/linalg/linalg.c msgid "input matrix is singular" msgstr "" -#: extmod/ulab/code/user/user.c +#: extmod/ulab/code/scipy/linalg/linalg.c extmod/ulab/code/user/user.c msgid "input must be a dense ndarray" msgstr "" @@ -3275,7 +3280,7 @@ msgid "integer required" msgstr "" #: extmod/ulab/code/numpy/approx/approx.c -msgid "interp is defined for 1D arrays of equal length" +msgid "interp is defined for 1D iterables of equal length" msgstr "" #: shared-bindings/_bleio/Adapter.c @@ -3819,6 +3824,7 @@ msgstr "" #: ports/esp32s2/boards/artisense_rd00/mpconfigboard.h #: ports/esp32s2/boards/atmegazero_esp32s2/mpconfigboard.h #: ports/esp32s2/boards/electroniccats_bastwifi/mpconfigboard.h +#: ports/esp32s2/boards/espressif_kaluga_1.3/mpconfigboard.h #: ports/esp32s2/boards/espressif_kaluga_1/mpconfigboard.h #: ports/esp32s2/boards/espressif_saola_1_wroom/mpconfigboard.h #: ports/esp32s2/boards/espressif_saola_1_wrover/mpconfigboard.h @@ -3826,7 +3832,8 @@ msgstr "" #: ports/esp32s2/boards/franzininho_wifi_wrover/mpconfigboard.h #: ports/esp32s2/boards/lilygo_ttgo_t8_s2_st7789/mpconfigboard.h #: ports/esp32s2/boards/microdev_micro_s2/mpconfigboard.h -#: ports/esp32s2/boards/muselab_nanoesp32_s2/mpconfigboard.h +#: ports/esp32s2/boards/muselab_nanoesp32_s2_wroom/mpconfigboard.h +#: ports/esp32s2/boards/muselab_nanoesp32_s2_wrover/mpconfigboard.h #: ports/esp32s2/boards/targett_module_clip_wroom/mpconfigboard.h #: ports/esp32s2/boards/targett_module_clip_wrover/mpconfigboard.h #: ports/esp32s2/boards/unexpectedmaker_feathers2/mpconfigboard.h @@ -4129,11 +4136,11 @@ msgid "too many values to unpack (expected %d)" msgstr "" #: extmod/ulab/code/numpy/approx/approx.c -msgid "trapz is defined for 1D arrays" +msgid "trapz is defined for 1D arrays of equal length" msgstr "" #: extmod/ulab/code/numpy/approx/approx.c -msgid "trapz is defined for 1D arrays of equal length" +msgid "trapz is defined for 1D iterables" msgstr "" #: py/obj.c @@ -4316,10 +4323,6 @@ msgstr "" msgid "wrong number of values to unpack" msgstr "" -#: extmod/ulab/code/ndarray.c -msgid "wrong operand type" -msgstr "" - #: extmod/ulab/code/numpy/vector/vector.c msgid "wrong output type" msgstr "" diff --git a/locale/it_IT.po b/locale/it_IT.po index 416ad5e94a..ab70a23bb1 100644 --- a/locale/it_IT.po +++ b/locale/it_IT.po @@ -3105,6 +3105,10 @@ msgstr "" msgid "first argument to super() must be type" msgstr "" +#: extmod/ulab/code/scipy/linalg/linalg.c +msgid "first two arguments must be ndarrays" +msgstr "" + #: extmod/ulab/code/ndarray.c msgid "flattening order must be either 'C', or 'F'" msgstr "" @@ -3285,10 +3289,11 @@ msgid "input matrix is asymmetric" msgstr "" #: extmod/ulab/code/numpy/linalg/linalg.c +#: extmod/ulab/code/scipy/linalg/linalg.c msgid "input matrix is singular" msgstr "" -#: extmod/ulab/code/user/user.c +#: extmod/ulab/code/scipy/linalg/linalg.c extmod/ulab/code/user/user.c msgid "input must be a dense ndarray" msgstr "" @@ -3329,7 +3334,7 @@ msgid "integer required" msgstr "intero richiesto" #: extmod/ulab/code/numpy/approx/approx.c -msgid "interp is defined for 1D arrays of equal length" +msgid "interp is defined for 1D iterables of equal length" msgstr "" #: shared-bindings/_bleio/Adapter.c @@ -3885,6 +3890,7 @@ msgstr "pow() con 3 argomenti richiede interi" #: ports/esp32s2/boards/artisense_rd00/mpconfigboard.h #: ports/esp32s2/boards/atmegazero_esp32s2/mpconfigboard.h #: ports/esp32s2/boards/electroniccats_bastwifi/mpconfigboard.h +#: ports/esp32s2/boards/espressif_kaluga_1.3/mpconfigboard.h #: ports/esp32s2/boards/espressif_kaluga_1/mpconfigboard.h #: ports/esp32s2/boards/espressif_saola_1_wroom/mpconfigboard.h #: ports/esp32s2/boards/espressif_saola_1_wrover/mpconfigboard.h @@ -3892,7 +3898,8 @@ msgstr "pow() con 3 argomenti richiede interi" #: ports/esp32s2/boards/franzininho_wifi_wrover/mpconfigboard.h #: ports/esp32s2/boards/lilygo_ttgo_t8_s2_st7789/mpconfigboard.h #: ports/esp32s2/boards/microdev_micro_s2/mpconfigboard.h -#: ports/esp32s2/boards/muselab_nanoesp32_s2/mpconfigboard.h +#: ports/esp32s2/boards/muselab_nanoesp32_s2_wroom/mpconfigboard.h +#: ports/esp32s2/boards/muselab_nanoesp32_s2_wrover/mpconfigboard.h #: ports/esp32s2/boards/targett_module_clip_wroom/mpconfigboard.h #: ports/esp32s2/boards/targett_module_clip_wrover/mpconfigboard.h #: ports/esp32s2/boards/unexpectedmaker_feathers2/mpconfigboard.h @@ -4199,11 +4206,11 @@ msgid "too many values to unpack (expected %d)" msgstr "troppi valori da scompattare (%d attesi)" #: extmod/ulab/code/numpy/approx/approx.c -msgid "trapz is defined for 1D arrays" +msgid "trapz is defined for 1D arrays of equal length" msgstr "" #: extmod/ulab/code/numpy/approx/approx.c -msgid "trapz is defined for 1D arrays of equal length" +msgid "trapz is defined for 1D iterables" msgstr "" #: py/obj.c @@ -4386,10 +4393,6 @@ msgstr "numero di argomenti errato" msgid "wrong number of values to unpack" msgstr "numero di valori da scompattare non corretto" -#: extmod/ulab/code/ndarray.c -msgid "wrong operand type" -msgstr "" - #: extmod/ulab/code/numpy/vector/vector.c msgid "wrong output type" msgstr "" diff --git a/locale/ja.po b/locale/ja.po index fd825e7bd1..17f4b5e0d9 100644 --- a/locale/ja.po +++ b/locale/ja.po @@ -3071,6 +3071,10 @@ msgstr "1つ目の引数はndarrayでなければなりません" msgid "first argument to super() must be type" msgstr "superの第1引数は型でなければなりません" +#: extmod/ulab/code/scipy/linalg/linalg.c +msgid "first two arguments must be ndarrays" +msgstr "" + #: extmod/ulab/code/ndarray.c msgid "flattening order must be either 'C', or 'F'" msgstr "" @@ -3251,10 +3255,11 @@ msgid "input matrix is asymmetric" msgstr "入力行列が非対称" #: extmod/ulab/code/numpy/linalg/linalg.c +#: extmod/ulab/code/scipy/linalg/linalg.c msgid "input matrix is singular" msgstr "入力が非正則行列" -#: extmod/ulab/code/user/user.c +#: extmod/ulab/code/scipy/linalg/linalg.c extmod/ulab/code/user/user.c msgid "input must be a dense ndarray" msgstr "" @@ -3295,7 +3300,7 @@ msgid "integer required" msgstr "整数が必要" #: extmod/ulab/code/numpy/approx/approx.c -msgid "interp is defined for 1D arrays of equal length" +msgid "interp is defined for 1D iterables of equal length" msgstr "" #: shared-bindings/_bleio/Adapter.c @@ -3841,6 +3846,7 @@ msgstr "pow()の第3引数には整数が必要" #: ports/esp32s2/boards/artisense_rd00/mpconfigboard.h #: ports/esp32s2/boards/atmegazero_esp32s2/mpconfigboard.h #: ports/esp32s2/boards/electroniccats_bastwifi/mpconfigboard.h +#: ports/esp32s2/boards/espressif_kaluga_1.3/mpconfigboard.h #: ports/esp32s2/boards/espressif_kaluga_1/mpconfigboard.h #: ports/esp32s2/boards/espressif_saola_1_wroom/mpconfigboard.h #: ports/esp32s2/boards/espressif_saola_1_wrover/mpconfigboard.h @@ -3848,7 +3854,8 @@ msgstr "pow()の第3引数には整数が必要" #: ports/esp32s2/boards/franzininho_wifi_wrover/mpconfigboard.h #: ports/esp32s2/boards/lilygo_ttgo_t8_s2_st7789/mpconfigboard.h #: ports/esp32s2/boards/microdev_micro_s2/mpconfigboard.h -#: ports/esp32s2/boards/muselab_nanoesp32_s2/mpconfigboard.h +#: ports/esp32s2/boards/muselab_nanoesp32_s2_wroom/mpconfigboard.h +#: ports/esp32s2/boards/muselab_nanoesp32_s2_wrover/mpconfigboard.h #: ports/esp32s2/boards/targett_module_clip_wroom/mpconfigboard.h #: ports/esp32s2/boards/targett_module_clip_wrover/mpconfigboard.h #: ports/esp32s2/boards/unexpectedmaker_feathers2/mpconfigboard.h @@ -4151,14 +4158,14 @@ msgstr "" msgid "too many values to unpack (expected %d)" msgstr "アンパックする値が多すぎます (%d個を期待)" -#: extmod/ulab/code/numpy/approx/approx.c -msgid "trapz is defined for 1D arrays" -msgstr "" - #: extmod/ulab/code/numpy/approx/approx.c msgid "trapz is defined for 1D arrays of equal length" msgstr "trapzは同じ長さの1次元arrayに対して定義されています" +#: extmod/ulab/code/numpy/approx/approx.c +msgid "trapz is defined for 1D iterables" +msgstr "" + #: py/obj.c msgid "tuple/list has wrong length" msgstr "タプル/リストの長さが正しくありません" @@ -4339,10 +4346,6 @@ msgstr "" msgid "wrong number of values to unpack" msgstr "アンパックする値の個数が不正です" -#: extmod/ulab/code/ndarray.c -msgid "wrong operand type" -msgstr "" - #: extmod/ulab/code/numpy/vector/vector.c msgid "wrong output type" msgstr "" diff --git a/locale/ko.po b/locale/ko.po index 064e69704f..a15d1e0a2b 100644 --- a/locale/ko.po +++ b/locale/ko.po @@ -3056,6 +3056,10 @@ msgstr "" msgid "first argument to super() must be type" msgstr "" +#: extmod/ulab/code/scipy/linalg/linalg.c +msgid "first two arguments must be ndarrays" +msgstr "" + #: extmod/ulab/code/ndarray.c msgid "flattening order must be either 'C', or 'F'" msgstr "" @@ -3235,10 +3239,11 @@ msgid "input matrix is asymmetric" msgstr "" #: extmod/ulab/code/numpy/linalg/linalg.c +#: extmod/ulab/code/scipy/linalg/linalg.c msgid "input matrix is singular" msgstr "" -#: extmod/ulab/code/user/user.c +#: extmod/ulab/code/scipy/linalg/linalg.c extmod/ulab/code/user/user.c msgid "input must be a dense ndarray" msgstr "" @@ -3279,7 +3284,7 @@ msgid "integer required" msgstr "정수가 필요합니다" #: extmod/ulab/code/numpy/approx/approx.c -msgid "interp is defined for 1D arrays of equal length" +msgid "interp is defined for 1D iterables of equal length" msgstr "" #: shared-bindings/_bleio/Adapter.c @@ -3823,6 +3828,7 @@ msgstr "" #: ports/esp32s2/boards/artisense_rd00/mpconfigboard.h #: ports/esp32s2/boards/atmegazero_esp32s2/mpconfigboard.h #: ports/esp32s2/boards/electroniccats_bastwifi/mpconfigboard.h +#: ports/esp32s2/boards/espressif_kaluga_1.3/mpconfigboard.h #: ports/esp32s2/boards/espressif_kaluga_1/mpconfigboard.h #: ports/esp32s2/boards/espressif_saola_1_wroom/mpconfigboard.h #: ports/esp32s2/boards/espressif_saola_1_wrover/mpconfigboard.h @@ -3830,7 +3836,8 @@ msgstr "" #: ports/esp32s2/boards/franzininho_wifi_wrover/mpconfigboard.h #: ports/esp32s2/boards/lilygo_ttgo_t8_s2_st7789/mpconfigboard.h #: ports/esp32s2/boards/microdev_micro_s2/mpconfigboard.h -#: ports/esp32s2/boards/muselab_nanoesp32_s2/mpconfigboard.h +#: ports/esp32s2/boards/muselab_nanoesp32_s2_wroom/mpconfigboard.h +#: ports/esp32s2/boards/muselab_nanoesp32_s2_wrover/mpconfigboard.h #: ports/esp32s2/boards/targett_module_clip_wroom/mpconfigboard.h #: ports/esp32s2/boards/targett_module_clip_wrover/mpconfigboard.h #: ports/esp32s2/boards/unexpectedmaker_feathers2/mpconfigboard.h @@ -4133,11 +4140,11 @@ msgid "too many values to unpack (expected %d)" msgstr "" #: extmod/ulab/code/numpy/approx/approx.c -msgid "trapz is defined for 1D arrays" +msgid "trapz is defined for 1D arrays of equal length" msgstr "" #: extmod/ulab/code/numpy/approx/approx.c -msgid "trapz is defined for 1D arrays of equal length" +msgid "trapz is defined for 1D iterables" msgstr "" #: py/obj.c @@ -4320,10 +4327,6 @@ msgstr "" msgid "wrong number of values to unpack" msgstr "" -#: extmod/ulab/code/ndarray.c -msgid "wrong operand type" -msgstr "" - #: extmod/ulab/code/numpy/vector/vector.c msgid "wrong output type" msgstr "" diff --git a/locale/nl.po b/locale/nl.po index 0a9f7f331a..3ff4328828 100644 --- a/locale/nl.po +++ b/locale/nl.po @@ -3097,6 +3097,10 @@ msgstr "eerst argument moet een ndarray zijn" msgid "first argument to super() must be type" msgstr "eerste argument voor super() moet een type zijn" +#: extmod/ulab/code/scipy/linalg/linalg.c +msgid "first two arguments must be ndarrays" +msgstr "" + #: extmod/ulab/code/ndarray.c msgid "flattening order must be either 'C', or 'F'" msgstr "De afvlakkingsvolgorde moet ofwel \"C\", ofwel \"F\" zijn" @@ -3277,10 +3281,11 @@ msgid "input matrix is asymmetric" msgstr "invoermatrix is asymmetrisch" #: extmod/ulab/code/numpy/linalg/linalg.c +#: extmod/ulab/code/scipy/linalg/linalg.c msgid "input matrix is singular" msgstr "invoermatrix is singulier" -#: extmod/ulab/code/user/user.c +#: extmod/ulab/code/scipy/linalg/linalg.c extmod/ulab/code/user/user.c msgid "input must be a dense ndarray" msgstr "invoer moet een gesloten ndarray zijn" @@ -3321,8 +3326,8 @@ msgid "integer required" msgstr "integer vereist" #: extmod/ulab/code/numpy/approx/approx.c -msgid "interp is defined for 1D arrays of equal length" -msgstr "interp is gedefinieerd voor eendimensionale arrays van gelijke lengte" +msgid "interp is defined for 1D iterables of equal length" +msgstr "" #: shared-bindings/_bleio/Adapter.c #, c-format @@ -3869,6 +3874,7 @@ msgstr "pow() met 3 argumenten vereist integers" #: ports/esp32s2/boards/artisense_rd00/mpconfigboard.h #: ports/esp32s2/boards/atmegazero_esp32s2/mpconfigboard.h #: ports/esp32s2/boards/electroniccats_bastwifi/mpconfigboard.h +#: ports/esp32s2/boards/espressif_kaluga_1.3/mpconfigboard.h #: ports/esp32s2/boards/espressif_kaluga_1/mpconfigboard.h #: ports/esp32s2/boards/espressif_saola_1_wroom/mpconfigboard.h #: ports/esp32s2/boards/espressif_saola_1_wrover/mpconfigboard.h @@ -3876,7 +3882,8 @@ msgstr "pow() met 3 argumenten vereist integers" #: ports/esp32s2/boards/franzininho_wifi_wrover/mpconfigboard.h #: ports/esp32s2/boards/lilygo_ttgo_t8_s2_st7789/mpconfigboard.h #: ports/esp32s2/boards/microdev_micro_s2/mpconfigboard.h -#: ports/esp32s2/boards/muselab_nanoesp32_s2/mpconfigboard.h +#: ports/esp32s2/boards/muselab_nanoesp32_s2_wroom/mpconfigboard.h +#: ports/esp32s2/boards/muselab_nanoesp32_s2_wrover/mpconfigboard.h #: ports/esp32s2/boards/targett_module_clip_wroom/mpconfigboard.h #: ports/esp32s2/boards/targett_module_clip_wrover/mpconfigboard.h #: ports/esp32s2/boards/unexpectedmaker_feathers2/mpconfigboard.h @@ -4180,14 +4187,14 @@ msgstr "" msgid "too many values to unpack (expected %d)" msgstr "te veel waarden om uit te pakken (%d verwacht)" -#: extmod/ulab/code/numpy/approx/approx.c -msgid "trapz is defined for 1D arrays" -msgstr "" - #: extmod/ulab/code/numpy/approx/approx.c msgid "trapz is defined for 1D arrays of equal length" msgstr "trapz is gedefinieerd voor eendimensionale arrays van gelijke lengte" +#: extmod/ulab/code/numpy/approx/approx.c +msgid "trapz is defined for 1D iterables" +msgstr "" + #: py/obj.c msgid "tuple/list has wrong length" msgstr "tuple of lijst heeft onjuiste lengte" @@ -4368,10 +4375,6 @@ msgstr "onjuist aantal argumenten" msgid "wrong number of values to unpack" msgstr "verkeerd aantal waarden om uit te pakken" -#: extmod/ulab/code/ndarray.c -msgid "wrong operand type" -msgstr "verkeerd operandtype" - #: extmod/ulab/code/numpy/vector/vector.c msgid "wrong output type" msgstr "onjuist uitvoer type" @@ -4408,6 +4411,13 @@ msgstr "zi moet van type float zijn" msgid "zi must be of shape (n_section, 2)" msgstr "zi moet vorm (n_section, 2) hebben" +#~ msgid "interp is defined for 1D arrays of equal length" +#~ msgstr "" +#~ "interp is gedefinieerd voor eendimensionale arrays van gelijke lengte" + +#~ msgid "wrong operand type" +#~ msgstr "verkeerd operandtype" + #~ msgid "Only raw int supported for ip" #~ msgstr "Alleen raw int ondersteund voor IP" diff --git a/locale/pl.po b/locale/pl.po index 7e89641e28..905daa6123 100644 --- a/locale/pl.po +++ b/locale/pl.po @@ -3070,6 +3070,10 @@ msgstr "" msgid "first argument to super() must be type" msgstr "pierwszy argument super() musi być typem" +#: extmod/ulab/code/scipy/linalg/linalg.c +msgid "first two arguments must be ndarrays" +msgstr "" + #: extmod/ulab/code/ndarray.c msgid "flattening order must be either 'C', or 'F'" msgstr "" @@ -3249,10 +3253,11 @@ msgid "input matrix is asymmetric" msgstr "" #: extmod/ulab/code/numpy/linalg/linalg.c +#: extmod/ulab/code/scipy/linalg/linalg.c msgid "input matrix is singular" msgstr "" -#: extmod/ulab/code/user/user.c +#: extmod/ulab/code/scipy/linalg/linalg.c extmod/ulab/code/user/user.c msgid "input must be a dense ndarray" msgstr "" @@ -3293,7 +3298,7 @@ msgid "integer required" msgstr "wymagana liczba całkowita" #: extmod/ulab/code/numpy/approx/approx.c -msgid "interp is defined for 1D arrays of equal length" +msgid "interp is defined for 1D iterables of equal length" msgstr "" #: shared-bindings/_bleio/Adapter.c @@ -3838,6 +3843,7 @@ msgstr "trzyargumentowe pow() wymaga liczb całkowitych" #: ports/esp32s2/boards/artisense_rd00/mpconfigboard.h #: ports/esp32s2/boards/atmegazero_esp32s2/mpconfigboard.h #: ports/esp32s2/boards/electroniccats_bastwifi/mpconfigboard.h +#: ports/esp32s2/boards/espressif_kaluga_1.3/mpconfigboard.h #: ports/esp32s2/boards/espressif_kaluga_1/mpconfigboard.h #: ports/esp32s2/boards/espressif_saola_1_wroom/mpconfigboard.h #: ports/esp32s2/boards/espressif_saola_1_wrover/mpconfigboard.h @@ -3845,7 +3851,8 @@ msgstr "trzyargumentowe pow() wymaga liczb całkowitych" #: ports/esp32s2/boards/franzininho_wifi_wrover/mpconfigboard.h #: ports/esp32s2/boards/lilygo_ttgo_t8_s2_st7789/mpconfigboard.h #: ports/esp32s2/boards/microdev_micro_s2/mpconfigboard.h -#: ports/esp32s2/boards/muselab_nanoesp32_s2/mpconfigboard.h +#: ports/esp32s2/boards/muselab_nanoesp32_s2_wroom/mpconfigboard.h +#: ports/esp32s2/boards/muselab_nanoesp32_s2_wrover/mpconfigboard.h #: ports/esp32s2/boards/targett_module_clip_wroom/mpconfigboard.h #: ports/esp32s2/boards/targett_module_clip_wrover/mpconfigboard.h #: ports/esp32s2/boards/unexpectedmaker_feathers2/mpconfigboard.h @@ -4149,11 +4156,11 @@ msgid "too many values to unpack (expected %d)" msgstr "zbyt wiele wartości do rozpakowania (oczekiwano %d)" #: extmod/ulab/code/numpy/approx/approx.c -msgid "trapz is defined for 1D arrays" +msgid "trapz is defined for 1D arrays of equal length" msgstr "" #: extmod/ulab/code/numpy/approx/approx.c -msgid "trapz is defined for 1D arrays of equal length" +msgid "trapz is defined for 1D iterables" msgstr "" #: py/obj.c @@ -4336,10 +4343,6 @@ msgstr "zła liczba argumentów" msgid "wrong number of values to unpack" msgstr "zła liczba wartości do rozpakowania" -#: extmod/ulab/code/ndarray.c -msgid "wrong operand type" -msgstr "zły typ operandu" - #: extmod/ulab/code/numpy/vector/vector.c msgid "wrong output type" msgstr "nieprawidłowy typ wyjścia" @@ -4376,6 +4379,9 @@ msgstr "" msgid "zi must be of shape (n_section, 2)" msgstr "" +#~ msgid "wrong operand type" +#~ msgstr "zły typ operandu" + #~ msgid "" #~ "CircuitPython is in safe mode because you pressed the reset button during " #~ "boot. Press again to exit safe mode.\n" diff --git a/locale/pt_BR.po b/locale/pt_BR.po index 6c6c8064c6..55169f07b1 100644 --- a/locale/pt_BR.po +++ b/locale/pt_BR.po @@ -3145,6 +3145,10 @@ msgstr "o primeiro argumento deve ser um ndarray" msgid "first argument to super() must be type" msgstr "o primeiro argumento para super() deve ser um tipo" +#: extmod/ulab/code/scipy/linalg/linalg.c +msgid "first two arguments must be ndarrays" +msgstr "" + #: extmod/ulab/code/ndarray.c msgid "flattening order must be either 'C', or 'F'" msgstr "a ordem do nivelamento deve ser 'C' ou 'F'" @@ -3325,10 +3329,11 @@ msgid "input matrix is asymmetric" msgstr "a matriz da entrada é assimétrica" #: extmod/ulab/code/numpy/linalg/linalg.c +#: extmod/ulab/code/scipy/linalg/linalg.c msgid "input matrix is singular" msgstr "a matriz da entrada é singular" -#: extmod/ulab/code/user/user.c +#: extmod/ulab/code/scipy/linalg/linalg.c extmod/ulab/code/user/user.c msgid "input must be a dense ndarray" msgstr "a entrada deve ser um ndarray denso" @@ -3369,8 +3374,8 @@ msgid "integer required" msgstr "inteiro requerido" #: extmod/ulab/code/numpy/approx/approx.c -msgid "interp is defined for 1D arrays of equal length" -msgstr "o interp é definido para matrizes 1D de igual comprimento" +msgid "interp is defined for 1D iterables of equal length" +msgstr "" #: shared-bindings/_bleio/Adapter.c #, c-format @@ -3923,6 +3928,7 @@ msgstr "o pow() com 3 argumentos requer números inteiros" #: ports/esp32s2/boards/artisense_rd00/mpconfigboard.h #: ports/esp32s2/boards/atmegazero_esp32s2/mpconfigboard.h #: ports/esp32s2/boards/electroniccats_bastwifi/mpconfigboard.h +#: ports/esp32s2/boards/espressif_kaluga_1.3/mpconfigboard.h #: ports/esp32s2/boards/espressif_kaluga_1/mpconfigboard.h #: ports/esp32s2/boards/espressif_saola_1_wroom/mpconfigboard.h #: ports/esp32s2/boards/espressif_saola_1_wrover/mpconfigboard.h @@ -3930,7 +3936,8 @@ msgstr "o pow() com 3 argumentos requer números inteiros" #: ports/esp32s2/boards/franzininho_wifi_wrover/mpconfigboard.h #: ports/esp32s2/boards/lilygo_ttgo_t8_s2_st7789/mpconfigboard.h #: ports/esp32s2/boards/microdev_micro_s2/mpconfigboard.h -#: ports/esp32s2/boards/muselab_nanoesp32_s2/mpconfigboard.h +#: ports/esp32s2/boards/muselab_nanoesp32_s2_wroom/mpconfigboard.h +#: ports/esp32s2/boards/muselab_nanoesp32_s2_wrover/mpconfigboard.h #: ports/esp32s2/boards/targett_module_clip_wroom/mpconfigboard.h #: ports/esp32s2/boards/targett_module_clip_wrover/mpconfigboard.h #: ports/esp32s2/boards/unexpectedmaker_feathers2/mpconfigboard.h @@ -4234,14 +4241,14 @@ msgstr "locais demais para o método nativo" msgid "too many values to unpack (expected %d)" msgstr "valores demais para descompactar (esperado %d)" -#: extmod/ulab/code/numpy/approx/approx.c -msgid "trapz is defined for 1D arrays" -msgstr "Trapz está definido para arrays 1D" - #: extmod/ulab/code/numpy/approx/approx.c msgid "trapz is defined for 1D arrays of equal length" msgstr "o trapz está definido para 1D arrays de igual tamanho" +#: extmod/ulab/code/numpy/approx/approx.c +msgid "trapz is defined for 1D iterables" +msgstr "" + #: py/obj.c msgid "tuple/list has wrong length" msgstr "a tupla/lista está com tamanho incorreto" @@ -4422,10 +4429,6 @@ msgstr "quantidade errada dos argumentos" msgid "wrong number of values to unpack" msgstr "quantidade incorreta dos valores para descompressão" -#: extmod/ulab/code/ndarray.c -msgid "wrong operand type" -msgstr "tipo do operando errado" - #: extmod/ulab/code/numpy/vector/vector.c msgid "wrong output type" msgstr "tipo da saída incorreta" @@ -4462,6 +4465,15 @@ msgstr "zi deve ser de um tipo float" msgid "zi must be of shape (n_section, 2)" msgstr "zi deve estar na forma (n_section, 2)" +#~ msgid "interp is defined for 1D arrays of equal length" +#~ msgstr "o interp é definido para matrizes 1D de igual comprimento" + +#~ msgid "trapz is defined for 1D arrays" +#~ msgstr "Trapz está definido para arrays 1D" + +#~ msgid "wrong operand type" +#~ msgstr "tipo do operando errado" + #~ msgid "%q must be None or 1-255" #~ msgstr "%q deve ser Nenhum ou 1-255" diff --git a/locale/sv.po b/locale/sv.po index 21fb6da6c4..a370d50fef 100644 --- a/locale/sv.po +++ b/locale/sv.po @@ -3111,6 +3111,10 @@ msgstr "första argumentet måste vara en ndarray" msgid "first argument to super() must be type" msgstr "första argumentet till super() måste vara typ" +#: extmod/ulab/code/scipy/linalg/linalg.c +msgid "first two arguments must be ndarrays" +msgstr "" + #: extmod/ulab/code/ndarray.c msgid "flattening order must be either 'C', or 'F'" msgstr "förenklingsordningen måste vara antingen \"C\" eller \"F\"" @@ -3290,10 +3294,11 @@ msgid "input matrix is asymmetric" msgstr "indatamatrisen är asymmetrisk" #: extmod/ulab/code/numpy/linalg/linalg.c +#: extmod/ulab/code/scipy/linalg/linalg.c msgid "input matrix is singular" msgstr "indatamatrisen är singulär" -#: extmod/ulab/code/user/user.c +#: extmod/ulab/code/scipy/linalg/linalg.c extmod/ulab/code/user/user.c msgid "input must be a dense ndarray" msgstr "indata måste vara en dense ndarray" @@ -3334,8 +3339,8 @@ msgid "integer required" msgstr "heltal krävs" #: extmod/ulab/code/numpy/approx/approx.c -msgid "interp is defined for 1D arrays of equal length" -msgstr "interp är definierad för 1D-matriser med samma längd" +msgid "interp is defined for 1D iterables of equal length" +msgstr "" #: shared-bindings/_bleio/Adapter.c #, c-format @@ -3882,6 +3887,7 @@ msgstr "pow() med 3 argument kräver heltal" #: ports/esp32s2/boards/artisense_rd00/mpconfigboard.h #: ports/esp32s2/boards/atmegazero_esp32s2/mpconfigboard.h #: ports/esp32s2/boards/electroniccats_bastwifi/mpconfigboard.h +#: ports/esp32s2/boards/espressif_kaluga_1.3/mpconfigboard.h #: ports/esp32s2/boards/espressif_kaluga_1/mpconfigboard.h #: ports/esp32s2/boards/espressif_saola_1_wroom/mpconfigboard.h #: ports/esp32s2/boards/espressif_saola_1_wrover/mpconfigboard.h @@ -3889,7 +3895,8 @@ msgstr "pow() med 3 argument kräver heltal" #: ports/esp32s2/boards/franzininho_wifi_wrover/mpconfigboard.h #: ports/esp32s2/boards/lilygo_ttgo_t8_s2_st7789/mpconfigboard.h #: ports/esp32s2/boards/microdev_micro_s2/mpconfigboard.h -#: ports/esp32s2/boards/muselab_nanoesp32_s2/mpconfigboard.h +#: ports/esp32s2/boards/muselab_nanoesp32_s2_wroom/mpconfigboard.h +#: ports/esp32s2/boards/muselab_nanoesp32_s2_wrover/mpconfigboard.h #: ports/esp32s2/boards/targett_module_clip_wroom/mpconfigboard.h #: ports/esp32s2/boards/targett_module_clip_wrover/mpconfigboard.h #: ports/esp32s2/boards/unexpectedmaker_feathers2/mpconfigboard.h @@ -4193,14 +4200,14 @@ msgstr "för många locals för nativ metod" msgid "too many values to unpack (expected %d)" msgstr "för många värden att packa upp (förväntat %d)" -#: extmod/ulab/code/numpy/approx/approx.c -msgid "trapz is defined for 1D arrays" -msgstr "trapz är definierat för 1D-matriser" - #: extmod/ulab/code/numpy/approx/approx.c msgid "trapz is defined for 1D arrays of equal length" msgstr "trapz är definierad för 1D-matriser med samma längd" +#: extmod/ulab/code/numpy/approx/approx.c +msgid "trapz is defined for 1D iterables" +msgstr "" + #: py/obj.c msgid "tuple/list has wrong length" msgstr "tupel/lista har fel längd" @@ -4381,10 +4388,6 @@ msgstr "fel antal argument" msgid "wrong number of values to unpack" msgstr "fel antal värden för att packa upp" -#: extmod/ulab/code/ndarray.c -msgid "wrong operand type" -msgstr "fel operandtyp" - #: extmod/ulab/code/numpy/vector/vector.c msgid "wrong output type" msgstr "fel utdatatyp" @@ -4421,6 +4424,15 @@ msgstr "zi måste vara av typ float" msgid "zi must be of shape (n_section, 2)" msgstr "zi måste vara i formen (n_section, 2)" +#~ msgid "interp is defined for 1D arrays of equal length" +#~ msgstr "interp är definierad för 1D-matriser med samma längd" + +#~ msgid "trapz is defined for 1D arrays" +#~ msgstr "trapz är definierat för 1D-matriser" + +#~ msgid "wrong operand type" +#~ msgstr "fel operandtyp" + #~ msgid "%q must be None or 1-255" #~ msgstr "%q måste vara None eller 1-255" diff --git a/locale/zh_Latn_pinyin.po b/locale/zh_Latn_pinyin.po index 9a59f6236f..28715c683d 100644 --- a/locale/zh_Latn_pinyin.po +++ b/locale/zh_Latn_pinyin.po @@ -3111,6 +3111,10 @@ msgstr "dì yī gè cānshù bìxū shì ndarray" msgid "first argument to super() must be type" msgstr "chāojí () de dì yī gè cānshù bìxū shì lèixíng" +#: extmod/ulab/code/scipy/linalg/linalg.c +msgid "first two arguments must be ndarrays" +msgstr "" + #: extmod/ulab/code/ndarray.c msgid "flattening order must be either 'C', or 'F'" msgstr "īnhé shùnxù bìxū wèi 'C' huò 'F'" @@ -3290,10 +3294,11 @@ msgid "input matrix is asymmetric" msgstr "shūrù jǔzhèn bù duìchèn" #: extmod/ulab/code/numpy/linalg/linalg.c +#: extmod/ulab/code/scipy/linalg/linalg.c msgid "input matrix is singular" msgstr "shūrù jǔzhèn shì qíyì de" -#: extmod/ulab/code/user/user.c +#: extmod/ulab/code/scipy/linalg/linalg.c extmod/ulab/code/user/user.c msgid "input must be a dense ndarray" msgstr "shū rù bì xū shì mì jí de ndarray" @@ -3334,8 +3339,8 @@ msgid "integer required" msgstr "xūyào zhěngshù" #: extmod/ulab/code/numpy/approx/approx.c -msgid "interp is defined for 1D arrays of equal length" -msgstr "interp shì wèi děng zhǎng de 1D shùzǔ dìngyì de" +msgid "interp is defined for 1D iterables of equal length" +msgstr "" #: shared-bindings/_bleio/Adapter.c #, c-format @@ -3879,6 +3884,7 @@ msgstr "pow() yǒu 3 cānshù xūyào zhěngshù" #: ports/esp32s2/boards/artisense_rd00/mpconfigboard.h #: ports/esp32s2/boards/atmegazero_esp32s2/mpconfigboard.h #: ports/esp32s2/boards/electroniccats_bastwifi/mpconfigboard.h +#: ports/esp32s2/boards/espressif_kaluga_1.3/mpconfigboard.h #: ports/esp32s2/boards/espressif_kaluga_1/mpconfigboard.h #: ports/esp32s2/boards/espressif_saola_1_wroom/mpconfigboard.h #: ports/esp32s2/boards/espressif_saola_1_wrover/mpconfigboard.h @@ -3886,7 +3892,8 @@ msgstr "pow() yǒu 3 cānshù xūyào zhěngshù" #: ports/esp32s2/boards/franzininho_wifi_wrover/mpconfigboard.h #: ports/esp32s2/boards/lilygo_ttgo_t8_s2_st7789/mpconfigboard.h #: ports/esp32s2/boards/microdev_micro_s2/mpconfigboard.h -#: ports/esp32s2/boards/muselab_nanoesp32_s2/mpconfigboard.h +#: ports/esp32s2/boards/muselab_nanoesp32_s2_wroom/mpconfigboard.h +#: ports/esp32s2/boards/muselab_nanoesp32_s2_wrover/mpconfigboard.h #: ports/esp32s2/boards/targett_module_clip_wroom/mpconfigboard.h #: ports/esp32s2/boards/targett_module_clip_wrover/mpconfigboard.h #: ports/esp32s2/boards/unexpectedmaker_feathers2/mpconfigboard.h @@ -4190,14 +4197,14 @@ msgstr "běn de fāng fǎ de dāng dì rén tài duō" msgid "too many values to unpack (expected %d)" msgstr "dǎkāi tài duō zhí (yùqí %d)" -#: extmod/ulab/code/numpy/approx/approx.c -msgid "trapz is defined for 1D arrays" -msgstr "wéi 1D shù zǔ dìng yì xiàn jǐng" - #: extmod/ulab/code/numpy/approx/approx.c msgid "trapz is defined for 1D arrays of equal length" msgstr "Trapz shì wèi děng zhǎng de 1D shùzǔ dìngyì de" +#: extmod/ulab/code/numpy/approx/approx.c +msgid "trapz is defined for 1D iterables" +msgstr "" + #: py/obj.c msgid "tuple/list has wrong length" msgstr "yuán zǔ/lièbiǎo chángdù cuòwù" @@ -4378,10 +4385,6 @@ msgstr "cānshù shù cuòwù" msgid "wrong number of values to unpack" msgstr "wúfǎ jiě bāo de zhí shù" -#: extmod/ulab/code/ndarray.c -msgid "wrong operand type" -msgstr "cuòwù de cāozuò shù lèixíng" - #: extmod/ulab/code/numpy/vector/vector.c msgid "wrong output type" msgstr "cuòwù de shūchū lèixíng" @@ -4418,6 +4421,15 @@ msgstr "zi bìxū wèi fú diǎn xíng" msgid "zi must be of shape (n_section, 2)" msgstr "zi bìxū jùyǒu xíngzhuàng (n_section,2)" +#~ msgid "interp is defined for 1D arrays of equal length" +#~ msgstr "interp shì wèi děng zhǎng de 1D shùzǔ dìngyì de" + +#~ msgid "trapz is defined for 1D arrays" +#~ msgstr "wéi 1D shù zǔ dìng yì xiàn jǐng" + +#~ msgid "wrong operand type" +#~ msgstr "cuòwù de cāozuò shù lèixíng" + #~ msgid "%q must be None or 1-255" #~ msgstr "%q bì xū wéi wú huò 1-255" From e115d34ee188a2a7b4952edf17837b0e33dde9fd Mon Sep 17 00:00:00 2001 From: Alvaro Figueroa Date: Sat, 12 Jun 2021 02:36:34 +0000 Subject: [PATCH 21/27] Translated using Weblate (Spanish) Currently translated at 100.0% (994 of 994 strings) Translation: CircuitPython/main Translate-URL: https://hosted.weblate.org/projects/circuitpython/main/es/ --- locale/es.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/locale/es.po b/locale/es.po index b6f135a9df..2ba53ae1eb 100644 --- a/locale/es.po +++ b/locale/es.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-01-04 12:55-0600\n" -"PO-Revision-Date: 2021-05-30 13:32+0000\n" +"PO-Revision-Date: 2021-06-13 04:32+0000\n" "Last-Translator: Alvaro Figueroa \n" "Language-Team: \n" "Language: es\n" @@ -3140,7 +3140,7 @@ msgstr "primer argumento para super() debe ser de tipo" #: extmod/ulab/code/scipy/linalg/linalg.c msgid "first two arguments must be ndarrays" -msgstr "" +msgstr "los primeros dos argumentos deben ser ndarrays" #: extmod/ulab/code/ndarray.c msgid "flattening order must be either 'C', or 'F'" @@ -3367,7 +3367,7 @@ msgstr "Entero requerido" #: extmod/ulab/code/numpy/approx/approx.c msgid "interp is defined for 1D iterables of equal length" -msgstr "" +msgstr "interp está definido para iterables 1D de igual tamaño" #: shared-bindings/_bleio/Adapter.c #, c-format @@ -4237,7 +4237,7 @@ msgstr "trapz está definido para arreglos 1D de igual tamaño" #: extmod/ulab/code/numpy/approx/approx.c msgid "trapz is defined for 1D iterables" -msgstr "" +msgstr "trapz está definido para iterables 1D" #: py/obj.c msgid "tuple/list has wrong length" From b24c9694af743c9b6a2ccccd497679e5ce5db571 Mon Sep 17 00:00:00 2001 From: Wellington Terumi Uemura Date: Sat, 12 Jun 2021 04:13:59 +0000 Subject: [PATCH 22/27] Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (994 of 994 strings) Translation: CircuitPython/main Translate-URL: https://hosted.weblate.org/projects/circuitpython/main/pt_BR/ --- locale/pt_BR.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/locale/pt_BR.po b/locale/pt_BR.po index 55169f07b1..f0a0aa394e 100644 --- a/locale/pt_BR.po +++ b/locale/pt_BR.po @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-01-04 12:55-0600\n" -"PO-Revision-Date: 2021-05-30 13:32+0000\n" +"PO-Revision-Date: 2021-06-13 04:32+0000\n" "Last-Translator: Wellington Terumi Uemura \n" "Language-Team: \n" "Language: pt_BR\n" @@ -3147,7 +3147,7 @@ msgstr "o primeiro argumento para super() deve ser um tipo" #: extmod/ulab/code/scipy/linalg/linalg.c msgid "first two arguments must be ndarrays" -msgstr "" +msgstr "os dois primeiros argumentos devem ser ndarrays" #: extmod/ulab/code/ndarray.c msgid "flattening order must be either 'C', or 'F'" @@ -3375,7 +3375,7 @@ msgstr "inteiro requerido" #: extmod/ulab/code/numpy/approx/approx.c msgid "interp is defined for 1D iterables of equal length" -msgstr "" +msgstr "o interp é definido para iteráveis 1D com comprimento igual" #: shared-bindings/_bleio/Adapter.c #, c-format @@ -4247,7 +4247,7 @@ msgstr "o trapz está definido para 1D arrays de igual tamanho" #: extmod/ulab/code/numpy/approx/approx.c msgid "trapz is defined for 1D iterables" -msgstr "" +msgstr "o trapz é definido para iteráveis 1D" #: py/obj.c msgid "tuple/list has wrong length" From 4a4ec9e1eafef1ece4dcf507788a27dc5b901d12 Mon Sep 17 00:00:00 2001 From: Jonny Bergdahl Date: Fri, 11 Jun 2021 18:09:54 +0000 Subject: [PATCH 23/27] Translated using Weblate (Swedish) Currently translated at 100.0% (994 of 994 strings) Translation: CircuitPython/main Translate-URL: https://hosted.weblate.org/projects/circuitpython/main/sv/ --- locale/sv.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/locale/sv.po b/locale/sv.po index a370d50fef..582170b37c 100644 --- a/locale/sv.po +++ b/locale/sv.po @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-01-04 12:55-0600\n" -"PO-Revision-Date: 2021-05-30 13:32+0000\n" +"PO-Revision-Date: 2021-06-13 04:32+0000\n" "Last-Translator: Jonny Bergdahl \n" "Language-Team: LANGUAGE \n" "Language: sv\n" @@ -3113,7 +3113,7 @@ msgstr "första argumentet till super() måste vara typ" #: extmod/ulab/code/scipy/linalg/linalg.c msgid "first two arguments must be ndarrays" -msgstr "" +msgstr "De två första argumenten måste vara ndarray:er" #: extmod/ulab/code/ndarray.c msgid "flattening order must be either 'C', or 'F'" @@ -3340,7 +3340,7 @@ msgstr "heltal krävs" #: extmod/ulab/code/numpy/approx/approx.c msgid "interp is defined for 1D iterables of equal length" -msgstr "" +msgstr "interp är definierad för 1D-iterabla med samma längd" #: shared-bindings/_bleio/Adapter.c #, c-format @@ -4206,7 +4206,7 @@ msgstr "trapz är definierad för 1D-matriser med samma längd" #: extmod/ulab/code/numpy/approx/approx.c msgid "trapz is defined for 1D iterables" -msgstr "" +msgstr "trapz är definierat för 1D-iterabla" #: py/obj.c msgid "tuple/list has wrong length" From ceea6397a3fb73d0dfb502b1776071ebd7da8453 Mon Sep 17 00:00:00 2001 From: Mike Causer Date: Tue, 15 Jun 2021 01:17:39 +1000 Subject: [PATCH 24/27] Change TinyS2 default SPI pins --- ports/esp32s2/boards/unexpectedmaker_tinys2/mpconfigboard.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/esp32s2/boards/unexpectedmaker_tinys2/mpconfigboard.h b/ports/esp32s2/boards/unexpectedmaker_tinys2/mpconfigboard.h index 64ef084ccd..7662289b84 100644 --- a/ports/esp32s2/boards/unexpectedmaker_tinys2/mpconfigboard.h +++ b/ports/esp32s2/boards/unexpectedmaker_tinys2/mpconfigboard.h @@ -39,9 +39,9 @@ #define DEFAULT_I2C_BUS_SCL (&pin_GPIO9) #define DEFAULT_I2C_BUS_SDA (&pin_GPIO8) -#define DEFAULT_SPI_BUS_SCK (&pin_GPIO36) +#define DEFAULT_SPI_BUS_SCK (&pin_GPIO37) #define DEFAULT_SPI_BUS_MOSI (&pin_GPIO35) -#define DEFAULT_SPI_BUS_MISO (&pin_GPIO37) +#define DEFAULT_SPI_BUS_MISO (&pin_GPIO36) #define DEFAULT_UART_BUS_RX (&pin_GPIO44) #define DEFAULT_UART_BUS_TX (&pin_GPIO43) From f96642de25cc145286bc35825c3f4ecc4dcb248b Mon Sep 17 00:00:00 2001 From: Kattni Rembor Date: Mon, 14 Jun 2021 15:32:12 -0400 Subject: [PATCH 25/27] Add A0 as alias to pot pin. --- ports/atmel-samd/boards/adafruit_slide_trinkey_m0/pins.c | 1 + 1 file changed, 1 insertion(+) diff --git a/ports/atmel-samd/boards/adafruit_slide_trinkey_m0/pins.c b/ports/atmel-samd/boards/adafruit_slide_trinkey_m0/pins.c index a9b1c9eca0..2fad0be800 100644 --- a/ports/atmel-samd/boards/adafruit_slide_trinkey_m0/pins.c +++ b/ports/atmel-samd/boards/adafruit_slide_trinkey_m0/pins.c @@ -3,6 +3,7 @@ STATIC const mp_rom_map_elem_t board_global_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_NEOPIXEL), MP_ROM_PTR(&pin_PA04) }, { MP_ROM_QSTR(MP_QSTR_POTENTIOMETER), MP_ROM_PTR(&pin_PA02) }, + { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_PA02) }, { MP_ROM_QSTR(MP_QSTR_TOUCH), MP_ROM_PTR(&pin_PA07) }, }; MP_DEFINE_CONST_DICT(board_module_globals, board_global_dict_table); From 12d0e65a2ab08651b63c9e342733d1a8c071d2cd Mon Sep 17 00:00:00 2001 From: Kattni Rembor Date: Mon, 14 Jun 2021 15:37:02 -0400 Subject: [PATCH 26/27] Space out pin groups. --- ports/atmel-samd/boards/adafruit_slide_trinkey_m0/pins.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ports/atmel-samd/boards/adafruit_slide_trinkey_m0/pins.c b/ports/atmel-samd/boards/adafruit_slide_trinkey_m0/pins.c index 2fad0be800..e23b80d4c7 100644 --- a/ports/atmel-samd/boards/adafruit_slide_trinkey_m0/pins.c +++ b/ports/atmel-samd/boards/adafruit_slide_trinkey_m0/pins.c @@ -2,8 +2,10 @@ STATIC const mp_rom_map_elem_t board_global_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_NEOPIXEL), MP_ROM_PTR(&pin_PA04) }, + { MP_ROM_QSTR(MP_QSTR_POTENTIOMETER), MP_ROM_PTR(&pin_PA02) }, { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_PA02) }, + { MP_ROM_QSTR(MP_QSTR_TOUCH), MP_ROM_PTR(&pin_PA07) }, }; MP_DEFINE_CONST_DICT(board_module_globals, board_global_dict_table); From fd222dd066d74a05cd5e89e54df17484b681754a Mon Sep 17 00:00:00 2001 From: Tsutomu IKEGAMI Date: Tue, 15 Jun 2021 20:51:55 +0900 Subject: [PATCH 27/27] Fix typo in Wio Terminal pin board.I2S_BLCK to I2S_BCLK (bit clock) --- ports/atmel-samd/boards/seeeduino_wio_terminal/pins.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/atmel-samd/boards/seeeduino_wio_terminal/pins.c b/ports/atmel-samd/boards/seeeduino_wio_terminal/pins.c index 957c75db26..a5a8b088c3 100644 --- a/ports/atmel-samd/boards/seeeduino_wio_terminal/pins.c +++ b/ports/atmel-samd/boards/seeeduino_wio_terminal/pins.c @@ -91,7 +91,7 @@ STATIC const mp_rom_map_elem_t board_global_dict_table[] = { { MP_OBJ_NEW_QSTR(MP_QSTR_I2S_LRCLK), MP_ROM_PTR(&pin_PA20) }, { MP_OBJ_NEW_QSTR(MP_QSTR_I2S_SDIN), MP_ROM_PTR(&pin_PA21) }, { MP_OBJ_NEW_QSTR(MP_QSTR_I2S_SDOUT), MP_ROM_PTR(&pin_PA22) }, - { MP_OBJ_NEW_QSTR(MP_QSTR_I2S_BLCK), MP_ROM_PTR(&pin_PB16) }, + { MP_OBJ_NEW_QSTR(MP_QSTR_I2S_BCLK), MP_ROM_PTR(&pin_PB16) }, // RTL8720D { MP_OBJ_NEW_QSTR(MP_QSTR_RTL_PWR), MP_ROM_PTR(&pin_PA18) }, // CHIP_PU