From 86a482f5200d2f6bb55e73de831d214b70b6374c Mon Sep 17 00:00:00 2001 From: 0hotpotman0 Date: Mon, 10 Jan 2022 11:05:06 +0800 Subject: [PATCH 01/27] add ble stack 7.3.0 version for complie the uf2 flie --- ports/nrf/boards/Seeed_XIAO_nRF52840_Sense/mpconfigboard.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/nrf/boards/Seeed_XIAO_nRF52840_Sense/mpconfigboard.mk b/ports/nrf/boards/Seeed_XIAO_nRF52840_Sense/mpconfigboard.mk index d8bd45218a..c280246cc9 100644 --- a/ports/nrf/boards/Seeed_XIAO_nRF52840_Sense/mpconfigboard.mk +++ b/ports/nrf/boards/Seeed_XIAO_nRF52840_Sense/mpconfigboard.mk @@ -1,6 +1,6 @@ USB_VID = 0x2886 USB_PID = 0x0045 -USB_PRODUCT = "Seeed XIAO nRF52840 Sense" +USB_PRODUCT = "Seeed XIAO nRF52840 Sense SOFTDEV_VERSION=7.0.1" USB_MANUFACTURER = "Seeed" MCU_CHIP = nrf52840 From fb96c091182c97440b4e9b8db0772122b0615dfa Mon Sep 17 00:00:00 2001 From: Kattni Rembor Date: Wed, 12 Jan 2022 13:54:56 -0500 Subject: [PATCH 02/27] Add button pin to Feathers, fix pin order on QT Py. --- .../boards/adafruit_feather_esp32s2/pins.c | 2 ++ .../adafruit_feather_esp32s2_tft/pins.c | 3 ++ .../boards/adafruit_qtpy_esp32s2/pins.c | 29 ++++++++++--------- 3 files changed, 20 insertions(+), 14 deletions(-) diff --git a/ports/espressif/boards/adafruit_feather_esp32s2/pins.c b/ports/espressif/boards/adafruit_feather_esp32s2/pins.c index 06f294ff0f..5029d82231 100644 --- a/ports/espressif/boards/adafruit_feather_esp32s2/pins.c +++ b/ports/espressif/boards/adafruit_feather_esp32s2/pins.c @@ -3,6 +3,8 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS + { MP_ROM_QSTR(MP_QSTR_BUTTON), MP_ROM_PTR(&pin_GPIO0) }, + { MP_ROM_QSTR(MP_QSTR_BOOT0), MP_ROM_PTR(&pin_GPIO0) }, { MP_ROM_QSTR(MP_QSTR_D0), MP_ROM_PTR(&pin_GPIO0) }, { MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO3) }, diff --git a/ports/espressif/boards/adafruit_feather_esp32s2_tft/pins.c b/ports/espressif/boards/adafruit_feather_esp32s2_tft/pins.c index b82afd9376..cdb2f79f8e 100644 --- a/ports/espressif/boards/adafruit_feather_esp32s2_tft/pins.c +++ b/ports/espressif/boards/adafruit_feather_esp32s2_tft/pins.c @@ -65,6 +65,9 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR_TFT_RESET), MP_ROM_PTR(&pin_GPIO40) }, { MP_ROM_QSTR(MP_QSTR_TFT_BACKLIGHT), MP_ROM_PTR(&pin_GPIO45) }, + { MP_ROM_QSTR(MP_QSTR_BUTTON), MP_ROM_PTR(&pin_GPIO0) }, + { MP_ROM_QSTR(MP_QSTR_BOOT0), MP_ROM_PTR(&pin_GPIO0) }, + { MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) }, { MP_ROM_QSTR(MP_QSTR_SPI), MP_ROM_PTR(&board_spi_obj) }, { MP_ROM_QSTR(MP_QSTR_UART), MP_ROM_PTR(&board_uart_obj) }, diff --git a/ports/espressif/boards/adafruit_qtpy_esp32s2/pins.c b/ports/espressif/boards/adafruit_qtpy_esp32s2/pins.c index 302126a4ad..67bc486170 100644 --- a/ports/espressif/boards/adafruit_qtpy_esp32s2/pins.c +++ b/ports/espressif/boards/adafruit_qtpy_esp32s2/pins.c @@ -3,54 +3,55 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS - { MP_ROM_QSTR(MP_QSTR_D0), MP_ROM_PTR(&pin_GPIO0) }, { MP_ROM_QSTR(MP_QSTR_BUTTON), MP_ROM_PTR(&pin_GPIO0) }, + { MP_ROM_QSTR(MP_QSTR_BOOT0), MP_ROM_PTR(&pin_GPIO0) }, + { MP_ROM_QSTR(MP_QSTR_D0), MP_ROM_PTR(&pin_GPIO0) }, - { MP_ROM_QSTR(MP_QSTR_D18), MP_ROM_PTR(&pin_GPIO18) }, { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_GPIO18) }, + { MP_ROM_QSTR(MP_QSTR_D18), MP_ROM_PTR(&pin_GPIO18) }, - { MP_ROM_QSTR(MP_QSTR_D17), MP_ROM_PTR(&pin_GPIO17) }, { MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_GPIO17) }, + { MP_ROM_QSTR(MP_QSTR_D17), MP_ROM_PTR(&pin_GPIO17) }, - { MP_ROM_QSTR(MP_QSTR_D9), MP_ROM_PTR(&pin_GPIO9) }, { MP_ROM_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_GPIO9) }, + { MP_ROM_QSTR(MP_QSTR_D9), MP_ROM_PTR(&pin_GPIO9) }, - { MP_ROM_QSTR(MP_QSTR_D8), MP_ROM_PTR(&pin_GPIO8) }, { MP_ROM_QSTR(MP_QSTR_A3), MP_ROM_PTR(&pin_GPIO8) }, + { MP_ROM_QSTR(MP_QSTR_D8), MP_ROM_PTR(&pin_GPIO8) }, - { MP_ROM_QSTR(MP_QSTR_D7), MP_ROM_PTR(&pin_GPIO7) }, { MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO7) }, + { MP_ROM_QSTR(MP_QSTR_D7), MP_ROM_PTR(&pin_GPIO7) }, { MP_ROM_QSTR(MP_QSTR_A4), MP_ROM_PTR(&pin_GPIO7) }, - { MP_ROM_QSTR(MP_QSTR_D6), MP_ROM_PTR(&pin_GPIO6) }, { MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_GPIO6) }, + { MP_ROM_QSTR(MP_QSTR_D6), MP_ROM_PTR(&pin_GPIO6) }, { MP_ROM_QSTR(MP_QSTR_A5), MP_ROM_PTR(&pin_GPIO5) }, - { MP_ROM_QSTR(MP_QSTR_D5), MP_ROM_PTR(&pin_GPIO5) }, { MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO5) }, + { MP_ROM_QSTR(MP_QSTR_D5), MP_ROM_PTR(&pin_GPIO5) }, { MP_ROM_QSTR(MP_QSTR_A6), MP_ROM_PTR(&pin_GPIO5) }, - { MP_ROM_QSTR(MP_QSTR_D16), MP_ROM_PTR(&pin_GPIO16) }, { MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_GPIO16) }, + { MP_ROM_QSTR(MP_QSTR_D16), MP_ROM_PTR(&pin_GPIO16) }, { MP_ROM_QSTR(MP_QSTR_A7), MP_ROM_PTR(&pin_GPIO16) }, - { MP_ROM_QSTR(MP_QSTR_D35), MP_ROM_PTR(&pin_GPIO35) }, { MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_GPIO35) }, + { MP_ROM_QSTR(MP_QSTR_D35), MP_ROM_PTR(&pin_GPIO35) }, - { MP_ROM_QSTR(MP_QSTR_D36), MP_ROM_PTR(&pin_GPIO36) }, { MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_GPIO36) }, + { MP_ROM_QSTR(MP_QSTR_D36), MP_ROM_PTR(&pin_GPIO36) }, - { MP_ROM_QSTR(MP_QSTR_D37), MP_ROM_PTR(&pin_GPIO37) }, { MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_GPIO37) }, + { MP_ROM_QSTR(MP_QSTR_D37), MP_ROM_PTR(&pin_GPIO37) }, { MP_ROM_QSTR(MP_QSTR_NEOPIXEL_POWER), MP_ROM_PTR(&pin_GPIO38) }, { MP_ROM_QSTR(MP_QSTR_NEOPIXEL), MP_ROM_PTR(&pin_GPIO39) }, - { MP_ROM_QSTR(MP_QSTR_D40), MP_ROM_PTR(&pin_GPIO40) }, { MP_ROM_QSTR(MP_QSTR_SCL1), MP_ROM_PTR(&pin_GPIO40) }, + { MP_ROM_QSTR(MP_QSTR_D40), MP_ROM_PTR(&pin_GPIO40) }, - { MP_ROM_QSTR(MP_QSTR_D41), MP_ROM_PTR(&pin_GPIO41) }, { MP_ROM_QSTR(MP_QSTR_SDA1), MP_ROM_PTR(&pin_GPIO41) }, + { MP_ROM_QSTR(MP_QSTR_D41), MP_ROM_PTR(&pin_GPIO41) }, { MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) }, { MP_ROM_QSTR(MP_QSTR_SPI), MP_ROM_PTR(&board_spi_obj) }, From 8c8997f42a6ae780bfc133b071868ef71c2b4118 Mon Sep 17 00:00:00 2001 From: Dan Halbert Date: Wed, 12 Jan 2022 14:14:21 -0500 Subject: [PATCH 03/27] Push stubs to pypi only on a release --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 38d86bae0f..f37df27f45 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -241,7 +241,7 @@ jobs: zip -9r circuitpython-stubs.zip circuitpython-stubs [ -z "$AWS_ACCESS_KEY_ID" ] || aws s3 cp circuitpython-stubs/dist/*.tar.gz s3://adafruit-circuit-python/bin/stubs/circuitpython-stubs-${{ env.CP_VERSION }}.zip --no-progress --region us-east-1 - name: Upload stubs to PyPi - if: (github.event_name == 'push' && github.ref == 'refs/heads/main' && github.repository_owner == 'adafruit') || (github.event_name == 'release' && (github.event.action == 'published' || github.event.action == 'rerequested')) + if: github.event_name == 'release' && (github.event.action == 'published' || github.event.action == 'rerequested') env: TWINE_USERNAME: ${{ secrets.pypi_username }} TWINE_PASSWORD: ${{ secrets.pypi_password }} From 10c3836bc0ac0aa3051fa2787a4488c656b0cfe1 Mon Sep 17 00:00:00 2001 From: Jeff Epler Date: Tue, 11 Jan 2022 11:08:47 -0600 Subject: [PATCH 04/27] feather esp32s2 tft: fix sharing of main display bus --- .../boards/adafruit_feather_esp32s2_tft/board.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/ports/espressif/boards/adafruit_feather_esp32s2_tft/board.c b/ports/espressif/boards/adafruit_feather_esp32s2_tft/board.c index 346be34886..68e4171948 100644 --- a/ports/espressif/boards/adafruit_feather_esp32s2_tft/board.c +++ b/ports/espressif/boards/adafruit_feather_esp32s2_tft/board.c @@ -31,6 +31,7 @@ #include "shared-bindings/microcontroller/Pin.h" #include "shared-module/displayio/__init__.h" #include "shared-module/displayio/mipi_constants.h" +#include "shared-bindings/board/__init__.h" displayio_fourwire_obj_t board_display_obj; @@ -81,17 +82,7 @@ void board_init(void) { gpio_set_direction(21, GPIO_MODE_DEF_OUTPUT); gpio_set_level(21, true); - busio_spi_obj_t *spi = &displays[0].fourwire_bus.inline_bus; - - common_hal_busio_spi_construct( - spi, - &pin_GPIO36, // CLK - &pin_GPIO35, // MOSI - NULL // MISO not connected - ); - - common_hal_busio_spi_never_reset(spi); - + busio_spi_obj_t *spi = common_hal_board_create_spi(); displayio_fourwire_obj_t *bus = &displays[0].fourwire_bus; bus->base.type = &displayio_fourwire_type; From 7575cacdc502eca9c4e25e1c1cdd4e57cb50cea9 Mon Sep 17 00:00:00 2001 From: Michael Himing Date: Thu, 13 Jan 2022 13:21:39 +1100 Subject: [PATCH 05/27] Add espressif_esp32s3_devkitc_1_n8r8 --- .../espressif_esp32s3_devkitc_1_n8r8/board.c | 67 +++++++++++++++++++ .../mpconfigboard.h | 38 +++++++++++ .../mpconfigboard.mk | 17 +++++ .../espressif_esp32s3_devkitc_1_n8r8/pins.c | 45 +++++++++++++ .../sdkconfig | 38 +++++++++++ 5 files changed, 205 insertions(+) create mode 100644 ports/espressif/boards/espressif_esp32s3_devkitc_1_n8r8/board.c create mode 100644 ports/espressif/boards/espressif_esp32s3_devkitc_1_n8r8/mpconfigboard.h create mode 100644 ports/espressif/boards/espressif_esp32s3_devkitc_1_n8r8/mpconfigboard.mk create mode 100644 ports/espressif/boards/espressif_esp32s3_devkitc_1_n8r8/pins.c create mode 100644 ports/espressif/boards/espressif_esp32s3_devkitc_1_n8r8/sdkconfig diff --git a/ports/espressif/boards/espressif_esp32s3_devkitc_1_n8r8/board.c b/ports/espressif/boards/espressif_esp32s3_devkitc_1_n8r8/board.c new file mode 100644 index 0000000000..b9558bfbdf --- /dev/null +++ b/ports/espressif/boards/espressif_esp32s3_devkitc_1_n8r8/board.c @@ -0,0 +1,67 @@ +/* + * 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 + + + // SPI Flash and RAM + common_hal_never_reset_pin(&pin_GPIO26); + common_hal_never_reset_pin(&pin_GPIO27); + common_hal_never_reset_pin(&pin_GPIO28); + common_hal_never_reset_pin(&pin_GPIO29); + common_hal_never_reset_pin(&pin_GPIO30); + common_hal_never_reset_pin(&pin_GPIO31); + common_hal_never_reset_pin(&pin_GPIO32); + common_hal_never_reset_pin(&pin_GPIO33); + common_hal_never_reset_pin(&pin_GPIO34); + common_hal_never_reset_pin(&pin_GPIO35); + common_hal_never_reset_pin(&pin_GPIO36); + common_hal_never_reset_pin(&pin_GPIO37); +} + +bool board_requests_safe_mode(void) { + return false; +} + +void reset_board(void) { + +} + +void board_deinit(void) { +} diff --git a/ports/espressif/boards/espressif_esp32s3_devkitc_1_n8r8/mpconfigboard.h b/ports/espressif/boards/espressif_esp32s3_devkitc_1_n8r8/mpconfigboard.h new file mode 100644 index 0000000000..45fd3268b2 --- /dev/null +++ b/ports/espressif/boards/espressif_esp32s3_devkitc_1_n8r8/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 "ESP32-S3-DevKitC-1-N8R8" +#define MICROPY_HW_MCU_NAME "ESP32S3" + +#define MICROPY_HW_NEOPIXEL (&pin_GPIO48) + +#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/espressif/boards/espressif_esp32s3_devkitc_1_n8r8/mpconfigboard.mk b/ports/espressif/boards/espressif_esp32s3_devkitc_1_n8r8/mpconfigboard.mk new file mode 100644 index 0000000000..4e65fc940d --- /dev/null +++ b/ports/espressif/boards/espressif_esp32s3_devkitc_1_n8r8/mpconfigboard.mk @@ -0,0 +1,17 @@ +USB_VID = 0x303A +USB_PID = 0x7003 +USB_PRODUCT = "ESP32-S3-DevKitC-1-N8R8" +USB_MANUFACTURER = "Espressif" + +IDF_TARGET = esp32s3 + +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=8MB diff --git a/ports/espressif/boards/espressif_esp32s3_devkitc_1_n8r8/pins.c b/ports/espressif/boards/espressif_esp32s3_devkitc_1_n8r8/pins.c new file mode 100644 index 0000000000..b1d515c306 --- /dev/null +++ b/ports/espressif/boards/espressif_esp32s3_devkitc_1_n8r8/pins.c @@ -0,0 +1,45 @@ +#include "shared-bindings/board/__init__.h" + +STATIC const mp_rom_map_elem_t board_module_globals_table[] = { + CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS + + { 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_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_IO41), MP_ROM_PTR(&pin_GPIO41) }, + { MP_ROM_QSTR(MP_QSTR_IO42), MP_ROM_PTR(&pin_GPIO42) }, + { MP_ROM_QSTR(MP_QSTR_IO43), MP_ROM_PTR(&pin_GPIO43) }, + { MP_ROM_QSTR(MP_QSTR_TXD0), MP_ROM_PTR(&pin_GPIO43) }, + { MP_ROM_QSTR(MP_QSTR_IO44), MP_ROM_PTR(&pin_GPIO44) }, + { MP_ROM_QSTR(MP_QSTR_TXD1), 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_IO47), MP_ROM_PTR(&pin_GPIO47) }, + { MP_ROM_QSTR(MP_QSTR_IO48), MP_ROM_PTR(&pin_GPIO48) }, + { MP_ROM_QSTR(MP_QSTR_NEOPIXEL), MP_ROM_PTR(&pin_GPIO48) }, +}; +MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table); diff --git a/ports/espressif/boards/espressif_esp32s3_devkitc_1_n8r8/sdkconfig b/ports/espressif/boards/espressif_esp32s3_devkitc_1_n8r8/sdkconfig new file mode 100644 index 0000000000..1a602c9ebc --- /dev/null +++ b/ports/espressif/boards/espressif_esp32s3_devkitc_1_n8r8/sdkconfig @@ -0,0 +1,38 @@ +CONFIG_ESP32S3_SPIRAM_SUPPORT=y + +# +# SPI RAM config +# +CONFIG_SPIRAM_MODE_OCT=y +CONFIG_SPIRAM_TYPE_ESPPSRAM64=y +CONFIG_SPIRAM_SIZE=8388608 + +# +# PSRAM clock and cs IO for ESP32S3 +# +CONFIG_DEFAULT_PSRAM_CLK_IO=30 +CONFIG_DEFAULT_PSRAM_CS_IO=26 +# end of PSRAM clock and cs IO for ESP32S3 + +# CONFIG_SPIRAM_FETCH_INSTRUCTIONS is not set +# CONFIG_SPIRAM_RODATA is not set +CONFIG_SPIRAM_SPEED_80M=y +# CONFIG_SPIRAM_SPEED_40M is not set +# 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 + +# +# LWIP +# +CONFIG_LWIP_LOCAL_HOSTNAME="espressif-esp32s3" +# end of LWIP + From 212eedc42f6f93ec4b24dd87978161b00caf4d36 Mon Sep 17 00:00:00 2001 From: Michael Himing Date: Thu, 13 Jan 2022 13:01:26 +1100 Subject: [PATCH 06/27] Rename espressif_esp32s3_devkitc_1_nopsram to devkitc_1_n8 --- .../board.c | 0 .../mpconfigboard.h | 2 +- .../mpconfigboard.mk | 2 +- .../pins.c | 0 .../sdkconfig | 0 5 files changed, 2 insertions(+), 2 deletions(-) rename ports/espressif/boards/{espressif_esp32s3_devkitc_1_nopsram => espressif_esp32s3_devkitc_1_n8}/board.c (100%) rename ports/espressif/boards/{espressif_esp32s3_devkitc_1_nopsram => espressif_esp32s3_devkitc_1_n8}/mpconfigboard.h (95%) rename ports/espressif/boards/{espressif_esp32s3_devkitc_1_nopsram => espressif_esp32s3_devkitc_1_n8}/mpconfigboard.mk (89%) rename ports/espressif/boards/{espressif_esp32s3_devkitc_1_nopsram => espressif_esp32s3_devkitc_1_n8}/pins.c (100%) rename ports/espressif/boards/{espressif_esp32s3_devkitc_1_nopsram => espressif_esp32s3_devkitc_1_n8}/sdkconfig (100%) diff --git a/ports/espressif/boards/espressif_esp32s3_devkitc_1_nopsram/board.c b/ports/espressif/boards/espressif_esp32s3_devkitc_1_n8/board.c similarity index 100% rename from ports/espressif/boards/espressif_esp32s3_devkitc_1_nopsram/board.c rename to ports/espressif/boards/espressif_esp32s3_devkitc_1_n8/board.c diff --git a/ports/espressif/boards/espressif_esp32s3_devkitc_1_nopsram/mpconfigboard.h b/ports/espressif/boards/espressif_esp32s3_devkitc_1_n8/mpconfigboard.h similarity index 95% rename from ports/espressif/boards/espressif_esp32s3_devkitc_1_nopsram/mpconfigboard.h rename to ports/espressif/boards/espressif_esp32s3_devkitc_1_n8/mpconfigboard.h index c6df735975..b13ccd1ffe 100644 --- a/ports/espressif/boards/espressif_esp32s3_devkitc_1_nopsram/mpconfigboard.h +++ b/ports/espressif/boards/espressif_esp32s3_devkitc_1_n8/mpconfigboard.h @@ -26,7 +26,7 @@ // Micropython setup -#define MICROPY_HW_BOARD_NAME "ESP32-S3-DevKitC-1-nopsram" +#define MICROPY_HW_BOARD_NAME "ESP32-S3-DevKitC-1-N8" #define MICROPY_HW_MCU_NAME "ESP32S3" #define MICROPY_HW_NEOPIXEL (&pin_GPIO48) diff --git a/ports/espressif/boards/espressif_esp32s3_devkitc_1_nopsram/mpconfigboard.mk b/ports/espressif/boards/espressif_esp32s3_devkitc_1_n8/mpconfigboard.mk similarity index 89% rename from ports/espressif/boards/espressif_esp32s3_devkitc_1_nopsram/mpconfigboard.mk rename to ports/espressif/boards/espressif_esp32s3_devkitc_1_n8/mpconfigboard.mk index 58b2d2e85c..b6ead37eee 100644 --- a/ports/espressif/boards/espressif_esp32s3_devkitc_1_nopsram/mpconfigboard.mk +++ b/ports/espressif/boards/espressif_esp32s3_devkitc_1_n8/mpconfigboard.mk @@ -1,6 +1,6 @@ USB_VID = 0x303A USB_PID = 0x7003 -USB_PRODUCT = "ESP32-S3-DevKitC-1-nopsram" +USB_PRODUCT = "ESP32-S3-DevKitC-1-N8" USB_MANUFACTURER = "Espressif" IDF_TARGET = esp32s3 diff --git a/ports/espressif/boards/espressif_esp32s3_devkitc_1_nopsram/pins.c b/ports/espressif/boards/espressif_esp32s3_devkitc_1_n8/pins.c similarity index 100% rename from ports/espressif/boards/espressif_esp32s3_devkitc_1_nopsram/pins.c rename to ports/espressif/boards/espressif_esp32s3_devkitc_1_n8/pins.c diff --git a/ports/espressif/boards/espressif_esp32s3_devkitc_1_nopsram/sdkconfig b/ports/espressif/boards/espressif_esp32s3_devkitc_1_n8/sdkconfig similarity index 100% rename from ports/espressif/boards/espressif_esp32s3_devkitc_1_nopsram/sdkconfig rename to ports/espressif/boards/espressif_esp32s3_devkitc_1_n8/sdkconfig From a878e3377ca8759564ae4a65499b46c87c6d19ce Mon Sep 17 00:00:00 2001 From: Michael Himing Date: Thu, 13 Jan 2022 13:20:34 +1100 Subject: [PATCH 07/27] Rename espressif_esp32s3_devkitc_1 to devkitc_1_n8r2 --- .../board.c | 0 .../mpconfigboard.h | 2 +- .../mpconfigboard.mk | 2 +- .../pins.c | 0 .../sdkconfig | 0 5 files changed, 2 insertions(+), 2 deletions(-) rename ports/espressif/boards/{espressif_esp32s3_devkitc_1 => espressif_esp32s3_devkitc_1_n8r2}/board.c (100%) rename ports/espressif/boards/{espressif_esp32s3_devkitc_1 => espressif_esp32s3_devkitc_1_n8r2}/mpconfigboard.h (96%) rename ports/espressif/boards/{espressif_esp32s3_devkitc_1 => espressif_esp32s3_devkitc_1_n8r2}/mpconfigboard.mk (89%) rename ports/espressif/boards/{espressif_esp32s3_devkitc_1 => espressif_esp32s3_devkitc_1_n8r2}/pins.c (100%) rename ports/espressif/boards/{espressif_esp32s3_devkitc_1 => espressif_esp32s3_devkitc_1_n8r2}/sdkconfig (100%) diff --git a/ports/espressif/boards/espressif_esp32s3_devkitc_1/board.c b/ports/espressif/boards/espressif_esp32s3_devkitc_1_n8r2/board.c similarity index 100% rename from ports/espressif/boards/espressif_esp32s3_devkitc_1/board.c rename to ports/espressif/boards/espressif_esp32s3_devkitc_1_n8r2/board.c diff --git a/ports/espressif/boards/espressif_esp32s3_devkitc_1/mpconfigboard.h b/ports/espressif/boards/espressif_esp32s3_devkitc_1_n8r2/mpconfigboard.h similarity index 96% rename from ports/espressif/boards/espressif_esp32s3_devkitc_1/mpconfigboard.h rename to ports/espressif/boards/espressif_esp32s3_devkitc_1_n8r2/mpconfigboard.h index df83110453..514ca2e2bc 100644 --- a/ports/espressif/boards/espressif_esp32s3_devkitc_1/mpconfigboard.h +++ b/ports/espressif/boards/espressif_esp32s3_devkitc_1_n8r2/mpconfigboard.h @@ -26,7 +26,7 @@ // Micropython setup -#define MICROPY_HW_BOARD_NAME "ESP32-S3-DevKitC-1" +#define MICROPY_HW_BOARD_NAME "ESP32-S3-DevKitC-1-N8R2" #define MICROPY_HW_MCU_NAME "ESP32S3" #define MICROPY_HW_NEOPIXEL (&pin_GPIO48) diff --git a/ports/espressif/boards/espressif_esp32s3_devkitc_1/mpconfigboard.mk b/ports/espressif/boards/espressif_esp32s3_devkitc_1_n8r2/mpconfigboard.mk similarity index 89% rename from ports/espressif/boards/espressif_esp32s3_devkitc_1/mpconfigboard.mk rename to ports/espressif/boards/espressif_esp32s3_devkitc_1_n8r2/mpconfigboard.mk index b3c18a55fe..7fff66f5d8 100644 --- a/ports/espressif/boards/espressif_esp32s3_devkitc_1/mpconfigboard.mk +++ b/ports/espressif/boards/espressif_esp32s3_devkitc_1_n8r2/mpconfigboard.mk @@ -1,6 +1,6 @@ USB_VID = 0x303A USB_PID = 0x7003 -USB_PRODUCT = "ESP32-S3-DevKitC-1" +USB_PRODUCT = "ESP32-S3-DevKitC-1-N8R2" USB_MANUFACTURER = "Espressif" IDF_TARGET = esp32s3 diff --git a/ports/espressif/boards/espressif_esp32s3_devkitc_1/pins.c b/ports/espressif/boards/espressif_esp32s3_devkitc_1_n8r2/pins.c similarity index 100% rename from ports/espressif/boards/espressif_esp32s3_devkitc_1/pins.c rename to ports/espressif/boards/espressif_esp32s3_devkitc_1_n8r2/pins.c diff --git a/ports/espressif/boards/espressif_esp32s3_devkitc_1/sdkconfig b/ports/espressif/boards/espressif_esp32s3_devkitc_1_n8r2/sdkconfig similarity index 100% rename from ports/espressif/boards/espressif_esp32s3_devkitc_1/sdkconfig rename to ports/espressif/boards/espressif_esp32s3_devkitc_1_n8r2/sdkconfig From 1cd98fed2689ce94a9390b40414ebef93da6a295 Mon Sep 17 00:00:00 2001 From: Michael Himing Date: Thu, 13 Jan 2022 13:45:46 +1100 Subject: [PATCH 08/27] Add esp32s3 dev kits to USB ID ignore list --- tools/ci_check_duplicate_usb_vid_pid.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/ci_check_duplicate_usb_vid_pid.py b/tools/ci_check_duplicate_usb_vid_pid.py index d1bdb09979..dbd29ad872 100644 --- a/tools/ci_check_duplicate_usb_vid_pid.py +++ b/tools/ci_check_duplicate_usb_vid_pid.py @@ -51,8 +51,9 @@ DEFAULT_IGNORELIST = [ "unexpectedmaker_feathers2_prerelease", "espressif_kaluga_1", "espressif_kaluga_1.3", - "espressif_esp32s3_devkitc_1", - "espressif_esp32s3_devkitc_1_nopsram", + "espressif_esp32s3_devkitc_1_n8", + "espressif_esp32s3_devkitc_1_n8r2", + "espressif_esp32s3_devkitc_1_n8r8", "jpconstantineau_pykey18", "jpconstantineau_pykey44", "jpconstantineau_pykey60", From 5fe23317823b6ed2f61abd803cce1ad3dee29341 Mon Sep 17 00:00:00 2001 From: Andy Date: Wed, 12 Jan 2022 22:35:18 -0500 Subject: [PATCH 09/27] update regular expressions example the example uses ure instead of re --- docs/library/re.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/library/re.rst b/docs/library/re.rst index 12e640654e..d09ef59ba4 100644 --- a/docs/library/re.rst +++ b/docs/library/re.rst @@ -95,11 +95,11 @@ Supported operators and special sequences are: Example:: - import ure + import re - # As ure doesn't support escapes itself, use of r"" strings is not + # As re doesn't support escapes itself, use of r"" strings is not # recommended. - regex = ure.compile("[\r\n]") + regex = re.compile("[\r\n]") regex.split("line1\rline2\nline3\r\n") From da702b293fd8d8ccd214e27b4171d47dd7758f4a Mon Sep 17 00:00:00 2001 From: Dan Halbert Date: Tue, 11 Jan 2022 19:04:25 -0500 Subject: [PATCH 10/27] PDMIn: enable IRQ; need a volatile; call pdmin_reset() enable IRQ for PDMIn --- ports/atmel-samd/common-hal/audiobusio/PDMIn.c | 17 ++++++++++++++++- ports/atmel-samd/supervisor/port.c | 2 +- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/ports/atmel-samd/common-hal/audiobusio/PDMIn.c b/ports/atmel-samd/common-hal/audiobusio/PDMIn.c index e6363395a6..e7c00901bf 100644 --- a/ports/atmel-samd/common-hal/audiobusio/PDMIn.c +++ b/ports/atmel-samd/common-hal/audiobusio/PDMIn.c @@ -66,7 +66,7 @@ #endif // Set by interrupt handler when DMA block has finished transferring. -static bool pdmin_dma_block_done; +static volatile bool pdmin_dma_block_done; // Event channel used to trigger interrupt. Set to invalid value EVSYS_SYNCH_NUM when not in use. static uint8_t pdmin_event_channel; @@ -77,6 +77,7 @@ void pdmin_evsys_handler(void) { } void pdmin_reset(void) { + pdmin_dma_block_done = false; pdmin_event_channel = EVSYS_SYNCH_NUM; while (I2S->SYNCBUSY.reg & I2S_SYNCBUSY_ENABLE) {} @@ -409,6 +410,20 @@ uint32_t common_hal_audiobusio_pdmin_record_to_buffer(audiobusio_pdmin_obj_t* se init_event_channel_interrupt(pdmin_event_channel, CORE_GCLK, EVSYS_ID_GEN_DMAC_CH_0 + dma_channel); // Turn on serializer now to get it in sync with DMA. i2s_set_serializer_enable(self->serializer, true); + + #ifdef SAM_D5X_E5X + int irq = pdmin_event_channel < 4 ? EVSYS_0_IRQn + pdmin_event_channel : EVSYS_4_IRQn; + // Only disable and clear on SAMD51 because the SAMD21 shares EVSYS with ticks. + NVIC_DisableIRQ(irq); + NVIC_ClearPendingIRQ(irq); + #endif + + #ifdef SAMD21 + int irq = EVSYS_IRQn; + #endif + + // Don't bother to disable when done. It doesn't hurt to leave it on. + NVIC_EnableIRQ(irq); audio_dma_enable_channel(dma_channel); // Record diff --git a/ports/atmel-samd/supervisor/port.c b/ports/atmel-samd/supervisor/port.c index 3298e691ab..7ffe7f574f 100644 --- a/ports/atmel-samd/supervisor/port.c +++ b/ports/atmel-samd/supervisor/port.c @@ -386,7 +386,7 @@ void reset_port(void) { audioout_reset(); #endif #if CIRCUITPY_AUDIOBUSIO - // pdmin_reset(); + pdmin_reset(); #endif #if CIRCUITPY_AUDIOBUSIO_I2SOUT i2sout_reset(); From 39639ecd17d976416f1b5c0c89093ead708a867d Mon Sep 17 00:00:00 2001 From: Scott Shawcroft Date: Wed, 12 Jan 2022 11:36:51 -0800 Subject: [PATCH 11/27] Rework configs to take target into account New script will filter settings to different tiers. --- ports/espressif/Makefile | 3 +- .../boards/adafruit_feather_esp32s2/sdkconfig | 10 +- .../adafruit_feather_esp32s2_tft/sdkconfig | 10 +- .../sdkconfig | 6 + .../boards/adafruit_funhouse/sdkconfig | 10 +- .../adafruit_magtag_2.9_grayscale/sdkconfig | 10 +- .../boards/adafruit_metro_esp32s2/sdkconfig | 6 +- .../boards/adafruit_qtpy_esp32s2/sdkconfig | 10 +- .../ai_thinker_esp_12k_nodemcu/sdkconfig | 12 +- .../espressif/boards/artisense_rd00/sdkconfig | 6 +- .../boards/atmegazero_esp32s2/sdkconfig | 6 +- .../boards/crumpspace_crumps2/sdkconfig | 6 +- .../boards/electroniccats_bastwifi/sdkconfig | 6 + .../boards/espressif_esp32s3_box/sdkconfig | 38 +- .../espressif_esp32s3_devkitc_1_n8/sdkconfig | 4 +- .../sdkconfig | 23 +- .../sdkconfig | 18 +- .../boards/espressif_hmi_devkit_1/sdkconfig | 10 +- .../boards/espressif_kaluga_1.3/sdkconfig | 10 +- .../boards/espressif_kaluga_1/sdkconfig | 10 +- .../boards/espressif_saola_1_wroom/sdkconfig | 6 + .../boards/espressif_saola_1_wrover/sdkconfig | 10 +- .../boards/franzininho_wifi_wroom/sdkconfig | 6 + .../boards/franzininho_wifi_wrover/sdkconfig | 10 +- .../boards/gravitech_cucumber_m/sdkconfig | 1 + .../boards/gravitech_cucumber_ms/sdkconfig | 1 + .../boards/gravitech_cucumber_r/sdkconfig | 6 +- .../boards/gravitech_cucumber_rs/sdkconfig | 6 +- .../boards/lilygo_ttgo_t8_s2_st7789/sdkconfig | 20 +- .../espressif/boards/lolin_s2_mini/sdkconfig | 12 +- .../espressif/boards/lolin_s2_pico/sdkconfig | 12 +- .../boards/microdev_micro_s2/sdkconfig | 6 +- .../boards/morpheans_morphesp-240/sdkconfig | 4 +- .../muselab_nanoesp32_s2_wroom/sdkconfig | 6 + .../muselab_nanoesp32_s2_wrover/sdkconfig | 6 + .../boards/odt_pixelwing_esp32_s2/sdkconfig | 6 +- .../targett_module_clip_wroom/sdkconfig | 6 + .../targett_module_clip_wrover/sdkconfig | 10 +- .../unexpectedmaker_feathers2/sdkconfig | 6 +- .../unexpectedmaker_feathers2_neo/sdkconfig | 10 +- .../sdkconfig | 8 +- .../boards/unexpectedmaker_tinys2/sdkconfig | 12 +- .../esp-idf-config/sdkconfig-16MB.defaults | 13 +- .../esp-idf-config/sdkconfig-4MB.defaults | 13 +- .../esp-idf-config/sdkconfig-8MB.defaults | 13 +- .../esp-idf-config/sdkconfig-debug.defaults | 78 +- .../esp-idf-config/sdkconfig-esp32c3.defaults | 139 ++++ .../esp-idf-config/sdkconfig-esp32s2.defaults | 170 ++++ .../esp-idf-config/sdkconfig-esp32s3.defaults | 149 ++++ .../esp-idf-config/sdkconfig-opt.defaults | 88 ++- .../esp-idf-config/sdkconfig.defaults | 747 ++++++++++++++++-- .../espressif/tools/generate_all_sdkconfig.py | 25 + ports/espressif/tools/update_sdkconfig.py | 180 +++++ 53 files changed, 1774 insertions(+), 225 deletions(-) create mode 100644 ports/espressif/esp-idf-config/sdkconfig-esp32c3.defaults create mode 100644 ports/espressif/esp-idf-config/sdkconfig-esp32s2.defaults create mode 100644 ports/espressif/esp-idf-config/sdkconfig-esp32s3.defaults create mode 100644 ports/espressif/tools/generate_all_sdkconfig.py create mode 100644 ports/espressif/tools/update_sdkconfig.py diff --git a/ports/espressif/Makefile b/ports/espressif/Makefile index a1498a5d7c..825663d87b 100644 --- a/ports/espressif/Makefile +++ b/ports/espressif/Makefile @@ -295,7 +295,8 @@ ifeq ($(DEBUG), 1) else DEBUG_SDKCONFIG = esp-idf-config/sdkconfig-opt.defaults endif -SDKCONFIGS = esp-idf-config/sdkconfig.defaults;$(DEBUG_SDKCONFIG);$(FLASH_SDKCONFIG);boards/$(BOARD)/sdkconfig + +SDKCONFIGS = esp-idf-config/sdkconfig.defaults;$(DEBUG_SDKCONFIG);$(FLASH_SDKCONFIG);$(TARGET_SDKCONFIG);boards/$(BOARD)/sdkconfig # create the config headers $(BUILD)/esp-idf/config/sdkconfig.h: boards/$(BOARD)/sdkconfig | $(BUILD)/esp-idf diff --git a/ports/espressif/boards/adafruit_feather_esp32s2/sdkconfig b/ports/espressif/boards/adafruit_feather_esp32s2/sdkconfig index 9d8bbde967..f19afafa3d 100644 --- a/ports/espressif/boards/adafruit_feather_esp32s2/sdkconfig +++ b/ports/espressif/boards/adafruit_feather_esp32s2/sdkconfig @@ -1,5 +1,4 @@ CONFIG_ESP32S2_SPIRAM_SUPPORT=y - # # SPI RAM config # @@ -8,11 +7,12 @@ CONFIG_SPIRAM_TYPE_ESPPSRAM16=y # CONFIG_SPIRAM_TYPE_ESPPSRAM32 is not set # CONFIG_SPIRAM_TYPE_ESPPSRAM64 is not set CONFIG_SPIRAM_SIZE=2097152 +# end of SPI RAM config +CONFIG_DEFAULT_PSRAM_CLK_IO=30 # # 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 @@ -30,4 +30,8 @@ CONFIG_SPIRAM_USE_MEMMAP=y # 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 +# +# LWIP +# +CONFIG_LWIP_LOCAL_HOSTNAME="espressif" +# end of LWIP diff --git a/ports/espressif/boards/adafruit_feather_esp32s2_tft/sdkconfig b/ports/espressif/boards/adafruit_feather_esp32s2_tft/sdkconfig index 9d8bbde967..f19afafa3d 100644 --- a/ports/espressif/boards/adafruit_feather_esp32s2_tft/sdkconfig +++ b/ports/espressif/boards/adafruit_feather_esp32s2_tft/sdkconfig @@ -1,5 +1,4 @@ CONFIG_ESP32S2_SPIRAM_SUPPORT=y - # # SPI RAM config # @@ -8,11 +7,12 @@ CONFIG_SPIRAM_TYPE_ESPPSRAM16=y # CONFIG_SPIRAM_TYPE_ESPPSRAM32 is not set # CONFIG_SPIRAM_TYPE_ESPPSRAM64 is not set CONFIG_SPIRAM_SIZE=2097152 +# end of SPI RAM config +CONFIG_DEFAULT_PSRAM_CLK_IO=30 # # 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 @@ -30,4 +30,8 @@ CONFIG_SPIRAM_USE_MEMMAP=y # 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 +# +# LWIP +# +CONFIG_LWIP_LOCAL_HOSTNAME="espressif" +# end of LWIP diff --git a/ports/espressif/boards/adafruit_feather_esp32s2_tftback_nopsram/sdkconfig b/ports/espressif/boards/adafruit_feather_esp32s2_tftback_nopsram/sdkconfig index e69de29bb2..5b9c86dcc3 100644 --- a/ports/espressif/boards/adafruit_feather_esp32s2_tftback_nopsram/sdkconfig +++ b/ports/espressif/boards/adafruit_feather_esp32s2_tftback_nopsram/sdkconfig @@ -0,0 +1,6 @@ +# CONFIG_ESP32S2_SPIRAM_SUPPORT is not set +# +# LWIP +# +CONFIG_LWIP_LOCAL_HOSTNAME="espressif" +# end of LWIP diff --git a/ports/espressif/boards/adafruit_funhouse/sdkconfig b/ports/espressif/boards/adafruit_funhouse/sdkconfig index 9d8bbde967..f19afafa3d 100644 --- a/ports/espressif/boards/adafruit_funhouse/sdkconfig +++ b/ports/espressif/boards/adafruit_funhouse/sdkconfig @@ -1,5 +1,4 @@ CONFIG_ESP32S2_SPIRAM_SUPPORT=y - # # SPI RAM config # @@ -8,11 +7,12 @@ CONFIG_SPIRAM_TYPE_ESPPSRAM16=y # CONFIG_SPIRAM_TYPE_ESPPSRAM32 is not set # CONFIG_SPIRAM_TYPE_ESPPSRAM64 is not set CONFIG_SPIRAM_SIZE=2097152 +# end of SPI RAM config +CONFIG_DEFAULT_PSRAM_CLK_IO=30 # # 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 @@ -30,4 +30,8 @@ CONFIG_SPIRAM_USE_MEMMAP=y # 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 +# +# LWIP +# +CONFIG_LWIP_LOCAL_HOSTNAME="espressif" +# end of LWIP diff --git a/ports/espressif/boards/adafruit_magtag_2.9_grayscale/sdkconfig b/ports/espressif/boards/adafruit_magtag_2.9_grayscale/sdkconfig index 9d8bbde967..f19afafa3d 100644 --- a/ports/espressif/boards/adafruit_magtag_2.9_grayscale/sdkconfig +++ b/ports/espressif/boards/adafruit_magtag_2.9_grayscale/sdkconfig @@ -1,5 +1,4 @@ CONFIG_ESP32S2_SPIRAM_SUPPORT=y - # # SPI RAM config # @@ -8,11 +7,12 @@ CONFIG_SPIRAM_TYPE_ESPPSRAM16=y # CONFIG_SPIRAM_TYPE_ESPPSRAM32 is not set # CONFIG_SPIRAM_TYPE_ESPPSRAM64 is not set CONFIG_SPIRAM_SIZE=2097152 +# end of SPI RAM config +CONFIG_DEFAULT_PSRAM_CLK_IO=30 # # 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 @@ -30,4 +30,8 @@ CONFIG_SPIRAM_USE_MEMMAP=y # 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 +# +# LWIP +# +CONFIG_LWIP_LOCAL_HOSTNAME="espressif" +# end of LWIP diff --git a/ports/espressif/boards/adafruit_metro_esp32s2/sdkconfig b/ports/espressif/boards/adafruit_metro_esp32s2/sdkconfig index 80b9a2cf8e..9ad9e6c3bb 100644 --- a/ports/espressif/boards/adafruit_metro_esp32s2/sdkconfig +++ b/ports/espressif/boards/adafruit_metro_esp32s2/sdkconfig @@ -1,5 +1,4 @@ CONFIG_ESP32S2_SPIRAM_SUPPORT=y - # # SPI RAM config # @@ -8,11 +7,12 @@ CONFIG_SPIRAM_TYPE_ESPPSRAM16=y # CONFIG_SPIRAM_TYPE_ESPPSRAM32 is not set # CONFIG_SPIRAM_TYPE_ESPPSRAM64 is not set CONFIG_SPIRAM_SIZE=2097152 +# end of SPI RAM config +CONFIG_DEFAULT_PSRAM_CLK_IO=30 # # 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 @@ -30,8 +30,6 @@ CONFIG_SPIRAM_USE_MEMMAP=y # 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 - # # LWIP # diff --git a/ports/espressif/boards/adafruit_qtpy_esp32s2/sdkconfig b/ports/espressif/boards/adafruit_qtpy_esp32s2/sdkconfig index 9d8bbde967..f19afafa3d 100644 --- a/ports/espressif/boards/adafruit_qtpy_esp32s2/sdkconfig +++ b/ports/espressif/boards/adafruit_qtpy_esp32s2/sdkconfig @@ -1,5 +1,4 @@ CONFIG_ESP32S2_SPIRAM_SUPPORT=y - # # SPI RAM config # @@ -8,11 +7,12 @@ CONFIG_SPIRAM_TYPE_ESPPSRAM16=y # CONFIG_SPIRAM_TYPE_ESPPSRAM32 is not set # CONFIG_SPIRAM_TYPE_ESPPSRAM64 is not set CONFIG_SPIRAM_SIZE=2097152 +# end of SPI RAM config +CONFIG_DEFAULT_PSRAM_CLK_IO=30 # # 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 @@ -30,4 +30,8 @@ CONFIG_SPIRAM_USE_MEMMAP=y # 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 +# +# LWIP +# +CONFIG_LWIP_LOCAL_HOSTNAME="espressif" +# end of LWIP diff --git a/ports/espressif/boards/ai_thinker_esp_12k_nodemcu/sdkconfig b/ports/espressif/boards/ai_thinker_esp_12k_nodemcu/sdkconfig index 1a86435efc..49ee336ed4 100644 --- a/ports/espressif/boards/ai_thinker_esp_12k_nodemcu/sdkconfig +++ b/ports/espressif/boards/ai_thinker_esp_12k_nodemcu/sdkconfig @@ -1,5 +1,4 @@ CONFIG_ESP32S2_SPIRAM_SUPPORT=y - # # SPI RAM config # @@ -7,12 +6,13 @@ CONFIG_ESP32S2_SPIRAM_SUPPORT=y # CONFIG_SPIRAM_TYPE_ESPPSRAM16 is not set # CONFIG_SPIRAM_TYPE_ESPPSRAM32 is not set CONFIG_SPIRAM_TYPE_ESPPSRAM64=y -CONFIG_SPIRAM_SIZE=4194304 +CONFIG_SPIRAM_SIZE=8388608 +# end of SPI RAM config +CONFIG_DEFAULT_PSRAM_CLK_IO=30 # # 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 @@ -30,4 +30,8 @@ CONFIG_SPIRAM_USE_MEMMAP=y # 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 +# +# LWIP +# +CONFIG_LWIP_LOCAL_HOSTNAME="espressif" +# end of LWIP diff --git a/ports/espressif/boards/artisense_rd00/sdkconfig b/ports/espressif/boards/artisense_rd00/sdkconfig index b5bf2411f7..cd57f0d118 100644 --- a/ports/espressif/boards/artisense_rd00/sdkconfig +++ b/ports/espressif/boards/artisense_rd00/sdkconfig @@ -1,5 +1,4 @@ CONFIG_ESP32S2_SPIRAM_SUPPORT=y - # # SPI RAM config # @@ -8,11 +7,12 @@ CONFIG_SPIRAM_TYPE_ESPPSRAM16=y # CONFIG_SPIRAM_TYPE_ESPPSRAM32 is not set # CONFIG_SPIRAM_TYPE_ESPPSRAM64 is not set CONFIG_SPIRAM_SIZE=2097152 +# end of SPI RAM config +CONFIG_DEFAULT_PSRAM_CLK_IO=30 # # 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 @@ -30,8 +30,6 @@ CONFIG_SPIRAM_USE_MEMMAP=y # 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 - # # LWIP # diff --git a/ports/espressif/boards/atmegazero_esp32s2/sdkconfig b/ports/espressif/boards/atmegazero_esp32s2/sdkconfig index f42e0784c4..b528b9f343 100644 --- a/ports/espressif/boards/atmegazero_esp32s2/sdkconfig +++ b/ports/espressif/boards/atmegazero_esp32s2/sdkconfig @@ -1,5 +1,4 @@ CONFIG_ESP32S2_SPIRAM_SUPPORT=y - # # SPI RAM config # @@ -8,11 +7,12 @@ CONFIG_ESP32S2_SPIRAM_SUPPORT=y # CONFIG_SPIRAM_TYPE_ESPPSRAM32 is not set CONFIG_SPIRAM_TYPE_ESPPSRAM64=y CONFIG_SPIRAM_SIZE=8388608 +# end of SPI RAM config +CONFIG_DEFAULT_PSRAM_CLK_IO=30 # # 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 @@ -30,8 +30,6 @@ CONFIG_SPIRAM_USE_MEMMAP=y # 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 - # # LWIP # diff --git a/ports/espressif/boards/crumpspace_crumps2/sdkconfig b/ports/espressif/boards/crumpspace_crumps2/sdkconfig index 04b487625d..94158d85c5 100644 --- a/ports/espressif/boards/crumpspace_crumps2/sdkconfig +++ b/ports/espressif/boards/crumpspace_crumps2/sdkconfig @@ -1,5 +1,4 @@ CONFIG_ESP32S2_SPIRAM_SUPPORT=y - # # SPI RAM config # @@ -8,11 +7,12 @@ CONFIG_SPIRAM_TYPE_ESPPSRAM16=y # CONFIG_SPIRAM_TYPE_ESPPSRAM32 is not set # CONFIG_SPIRAM_TYPE_ESPPSRAM64 is not set CONFIG_SPIRAM_SIZE=2097152 +# end of SPI RAM config +CONFIG_DEFAULT_PSRAM_CLK_IO=30 # # 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 @@ -30,8 +30,6 @@ CONFIG_SPIRAM_USE_MEMMAP=y # 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 - # # LWIP # diff --git a/ports/espressif/boards/electroniccats_bastwifi/sdkconfig b/ports/espressif/boards/electroniccats_bastwifi/sdkconfig index e69de29bb2..5b9c86dcc3 100644 --- a/ports/espressif/boards/electroniccats_bastwifi/sdkconfig +++ b/ports/espressif/boards/electroniccats_bastwifi/sdkconfig @@ -0,0 +1,6 @@ +# CONFIG_ESP32S2_SPIRAM_SUPPORT is not set +# +# LWIP +# +CONFIG_LWIP_LOCAL_HOSTNAME="espressif" +# end of LWIP diff --git a/ports/espressif/boards/espressif_esp32s3_box/sdkconfig b/ports/espressif/boards/espressif_esp32s3_box/sdkconfig index 73661c9f92..7fcf8ef297 100644 --- a/ports/espressif/boards/espressif_esp32s3_box/sdkconfig +++ b/ports/espressif/boards/espressif_esp32s3_box/sdkconfig @@ -1,9 +1,37 @@ CONFIG_ESP32S3_SPIRAM_SUPPORT=y -CONFIG_LWIP_LOCAL_HOSTNAME="espressif-esp32s3" -CONFIG_SPIRAM_BOOT_INIT=y -CONFIG_SPIRAM_MEMTEST=y +# +# SPI RAM config +# +# CONFIG_SPIRAM_MODE_QUAD is not set CONFIG_SPIRAM_MODE_OCT=y -CONFIG_SPIRAM_SPEED_80M=y CONFIG_SPIRAM_TYPE_AUTO=y -CONFIG_SPIRAM_USE_MALLOC=n +# CONFIG_SPIRAM_TYPE_ESPPSRAM64 is not set +CONFIG_SPIRAM_SIZE=-1 +# end of SPI RAM config + +CONFIG_DEFAULT_PSRAM_CLK_IO=30 +# +# PSRAM Clock and CS IO for ESP32S3 +# +CONFIG_DEFAULT_PSRAM_CS_IO=26 +# end of PSRAM Clock and CS IO for ESP32S3 + +# CONFIG_SPIRAM_FETCH_INSTRUCTIONS is not set +# CONFIG_SPIRAM_RODATA is not set +CONFIG_SPIRAM_SPEED_80M=y +# CONFIG_SPIRAM_SPEED_40M is not set CONFIG_SPIRAM=y +CONFIG_SPIRAM_BOOT_INIT=y +# CONFIG_SPIRAM_IGNORE_NOTFOUND is not set +# CONFIG_SPIRAM_USE_MEMMAP is not set +# CONFIG_SPIRAM_USE_CAPS_ALLOC is not set +CONFIG_SPIRAM_USE_MALLOC=y +CONFIG_SPIRAM_MEMTEST=y +CONFIG_SPIRAM_MALLOC_ALWAYSINTERNAL=16384 +# CONFIG_SPIRAM_TRY_ALLOCATE_WIFI_LWIP is not set +CONFIG_SPIRAM_MALLOC_RESERVE_INTERNAL=32768 +# +# LWIP +# +CONFIG_LWIP_LOCAL_HOSTNAME="espressif-esp32s3" +# end of LWIP diff --git a/ports/espressif/boards/espressif_esp32s3_devkitc_1_n8/sdkconfig b/ports/espressif/boards/espressif_esp32s3_devkitc_1_n8/sdkconfig index a162344cfb..a0a61d8392 100644 --- a/ports/espressif/boards/espressif_esp32s3_devkitc_1_n8/sdkconfig +++ b/ports/espressif/boards/espressif_esp32s3_devkitc_1_n8/sdkconfig @@ -1,8 +1,6 @@ -CONFIG_ESP32S3_SPIRAM_SUPPORT=n - +# CONFIG_ESP32S3_SPIRAM_SUPPORT is not set # # LWIP # CONFIG_LWIP_LOCAL_HOSTNAME="espressif-esp32s3" # end of LWIP - diff --git a/ports/espressif/boards/espressif_esp32s3_devkitc_1_n8r2/sdkconfig b/ports/espressif/boards/espressif_esp32s3_devkitc_1_n8r2/sdkconfig index 085c832318..e3a4d6ce68 100644 --- a/ports/espressif/boards/espressif_esp32s3_devkitc_1_n8r2/sdkconfig +++ b/ports/espressif/boards/espressif_esp32s3_devkitc_1_n8r2/sdkconfig @@ -1,27 +1,28 @@ CONFIG_ESP32S3_SPIRAM_SUPPORT=y - # # SPI RAM config # +CONFIG_SPIRAM_MODE_QUAD=y +# CONFIG_SPIRAM_MODE_OCT is not set # CONFIG_SPIRAM_TYPE_AUTO is not set -# CONFIG_SPIRAM_TYPE_ESPPSRAM16 is not set -# CONFIG_SPIRAM_TYPE_ESPPSRAM32 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 +# end of SPI RAM config -# -# PSRAM clock and cs IO for ESP32S3 -# CONFIG_DEFAULT_PSRAM_CLK_IO=30 +# +# PSRAM Clock and CS IO for ESP32S3 +# CONFIG_DEFAULT_PSRAM_CS_IO=26 -# end of PSRAM clock and cs IO for ESP32S3 +# end of PSRAM Clock and CS IO for ESP32S3 # CONFIG_SPIRAM_FETCH_INSTRUCTIONS is not set # CONFIG_SPIRAM_RODATA is not set +# CONFIG_SPIRAM_SPEED_120M is not set CONFIG_SPIRAM_SPEED_80M=y # CONFIG_SPIRAM_SPEED_40M is not set -# 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 @@ -29,12 +30,8 @@ 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 - # # LWIP # CONFIG_LWIP_LOCAL_HOSTNAME="espressif-esp32s3" # end of LWIP - diff --git a/ports/espressif/boards/espressif_esp32s3_devkitc_1_n8r8/sdkconfig b/ports/espressif/boards/espressif_esp32s3_devkitc_1_n8r8/sdkconfig index 1a602c9ebc..f508f4a67c 100644 --- a/ports/espressif/boards/espressif_esp32s3_devkitc_1_n8r8/sdkconfig +++ b/ports/espressif/boards/espressif_esp32s3_devkitc_1_n8r8/sdkconfig @@ -1,25 +1,25 @@ CONFIG_ESP32S3_SPIRAM_SUPPORT=y - # # SPI RAM config # +# CONFIG_SPIRAM_MODE_QUAD is not set CONFIG_SPIRAM_MODE_OCT=y +# CONFIG_SPIRAM_TYPE_AUTO is not set CONFIG_SPIRAM_TYPE_ESPPSRAM64=y CONFIG_SPIRAM_SIZE=8388608 +# end of SPI RAM config -# -# PSRAM clock and cs IO for ESP32S3 -# CONFIG_DEFAULT_PSRAM_CLK_IO=30 +# +# PSRAM Clock and CS IO for ESP32S3 +# CONFIG_DEFAULT_PSRAM_CS_IO=26 -# end of PSRAM clock and cs IO for ESP32S3 +# end of PSRAM Clock and CS IO for ESP32S3 # CONFIG_SPIRAM_FETCH_INSTRUCTIONS is not set # CONFIG_SPIRAM_RODATA is not set CONFIG_SPIRAM_SPEED_80M=y # CONFIG_SPIRAM_SPEED_40M is not set -# 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 @@ -27,12 +27,8 @@ 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 - # # LWIP # CONFIG_LWIP_LOCAL_HOSTNAME="espressif-esp32s3" # end of LWIP - diff --git a/ports/espressif/boards/espressif_hmi_devkit_1/sdkconfig b/ports/espressif/boards/espressif_hmi_devkit_1/sdkconfig index 9d8bbde967..f19afafa3d 100644 --- a/ports/espressif/boards/espressif_hmi_devkit_1/sdkconfig +++ b/ports/espressif/boards/espressif_hmi_devkit_1/sdkconfig @@ -1,5 +1,4 @@ CONFIG_ESP32S2_SPIRAM_SUPPORT=y - # # SPI RAM config # @@ -8,11 +7,12 @@ CONFIG_SPIRAM_TYPE_ESPPSRAM16=y # CONFIG_SPIRAM_TYPE_ESPPSRAM32 is not set # CONFIG_SPIRAM_TYPE_ESPPSRAM64 is not set CONFIG_SPIRAM_SIZE=2097152 +# end of SPI RAM config +CONFIG_DEFAULT_PSRAM_CLK_IO=30 # # 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 @@ -30,4 +30,8 @@ CONFIG_SPIRAM_USE_MEMMAP=y # 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 +# +# LWIP +# +CONFIG_LWIP_LOCAL_HOSTNAME="espressif" +# end of LWIP diff --git a/ports/espressif/boards/espressif_kaluga_1.3/sdkconfig b/ports/espressif/boards/espressif_kaluga_1.3/sdkconfig index 9d8bbde967..f19afafa3d 100644 --- a/ports/espressif/boards/espressif_kaluga_1.3/sdkconfig +++ b/ports/espressif/boards/espressif_kaluga_1.3/sdkconfig @@ -1,5 +1,4 @@ CONFIG_ESP32S2_SPIRAM_SUPPORT=y - # # SPI RAM config # @@ -8,11 +7,12 @@ CONFIG_SPIRAM_TYPE_ESPPSRAM16=y # CONFIG_SPIRAM_TYPE_ESPPSRAM32 is not set # CONFIG_SPIRAM_TYPE_ESPPSRAM64 is not set CONFIG_SPIRAM_SIZE=2097152 +# end of SPI RAM config +CONFIG_DEFAULT_PSRAM_CLK_IO=30 # # 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 @@ -30,4 +30,8 @@ CONFIG_SPIRAM_USE_MEMMAP=y # 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 +# +# LWIP +# +CONFIG_LWIP_LOCAL_HOSTNAME="espressif" +# end of LWIP diff --git a/ports/espressif/boards/espressif_kaluga_1/sdkconfig b/ports/espressif/boards/espressif_kaluga_1/sdkconfig index 9d8bbde967..f19afafa3d 100644 --- a/ports/espressif/boards/espressif_kaluga_1/sdkconfig +++ b/ports/espressif/boards/espressif_kaluga_1/sdkconfig @@ -1,5 +1,4 @@ CONFIG_ESP32S2_SPIRAM_SUPPORT=y - # # SPI RAM config # @@ -8,11 +7,12 @@ CONFIG_SPIRAM_TYPE_ESPPSRAM16=y # CONFIG_SPIRAM_TYPE_ESPPSRAM32 is not set # CONFIG_SPIRAM_TYPE_ESPPSRAM64 is not set CONFIG_SPIRAM_SIZE=2097152 +# end of SPI RAM config +CONFIG_DEFAULT_PSRAM_CLK_IO=30 # # 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 @@ -30,4 +30,8 @@ CONFIG_SPIRAM_USE_MEMMAP=y # 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 +# +# LWIP +# +CONFIG_LWIP_LOCAL_HOSTNAME="espressif" +# end of LWIP diff --git a/ports/espressif/boards/espressif_saola_1_wroom/sdkconfig b/ports/espressif/boards/espressif_saola_1_wroom/sdkconfig index e69de29bb2..5b9c86dcc3 100644 --- a/ports/espressif/boards/espressif_saola_1_wroom/sdkconfig +++ b/ports/espressif/boards/espressif_saola_1_wroom/sdkconfig @@ -0,0 +1,6 @@ +# CONFIG_ESP32S2_SPIRAM_SUPPORT is not set +# +# LWIP +# +CONFIG_LWIP_LOCAL_HOSTNAME="espressif" +# end of LWIP diff --git a/ports/espressif/boards/espressif_saola_1_wrover/sdkconfig b/ports/espressif/boards/espressif_saola_1_wrover/sdkconfig index 9d8bbde967..f19afafa3d 100644 --- a/ports/espressif/boards/espressif_saola_1_wrover/sdkconfig +++ b/ports/espressif/boards/espressif_saola_1_wrover/sdkconfig @@ -1,5 +1,4 @@ CONFIG_ESP32S2_SPIRAM_SUPPORT=y - # # SPI RAM config # @@ -8,11 +7,12 @@ CONFIG_SPIRAM_TYPE_ESPPSRAM16=y # CONFIG_SPIRAM_TYPE_ESPPSRAM32 is not set # CONFIG_SPIRAM_TYPE_ESPPSRAM64 is not set CONFIG_SPIRAM_SIZE=2097152 +# end of SPI RAM config +CONFIG_DEFAULT_PSRAM_CLK_IO=30 # # 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 @@ -30,4 +30,8 @@ CONFIG_SPIRAM_USE_MEMMAP=y # 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 +# +# LWIP +# +CONFIG_LWIP_LOCAL_HOSTNAME="espressif" +# end of LWIP diff --git a/ports/espressif/boards/franzininho_wifi_wroom/sdkconfig b/ports/espressif/boards/franzininho_wifi_wroom/sdkconfig index e69de29bb2..5b9c86dcc3 100644 --- a/ports/espressif/boards/franzininho_wifi_wroom/sdkconfig +++ b/ports/espressif/boards/franzininho_wifi_wroom/sdkconfig @@ -0,0 +1,6 @@ +# CONFIG_ESP32S2_SPIRAM_SUPPORT is not set +# +# LWIP +# +CONFIG_LWIP_LOCAL_HOSTNAME="espressif" +# end of LWIP diff --git a/ports/espressif/boards/franzininho_wifi_wrover/sdkconfig b/ports/espressif/boards/franzininho_wifi_wrover/sdkconfig index 9d8bbde967..f19afafa3d 100644 --- a/ports/espressif/boards/franzininho_wifi_wrover/sdkconfig +++ b/ports/espressif/boards/franzininho_wifi_wrover/sdkconfig @@ -1,5 +1,4 @@ CONFIG_ESP32S2_SPIRAM_SUPPORT=y - # # SPI RAM config # @@ -8,11 +7,12 @@ CONFIG_SPIRAM_TYPE_ESPPSRAM16=y # CONFIG_SPIRAM_TYPE_ESPPSRAM32 is not set # CONFIG_SPIRAM_TYPE_ESPPSRAM64 is not set CONFIG_SPIRAM_SIZE=2097152 +# end of SPI RAM config +CONFIG_DEFAULT_PSRAM_CLK_IO=30 # # 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 @@ -30,4 +30,8 @@ CONFIG_SPIRAM_USE_MEMMAP=y # 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 +# +# LWIP +# +CONFIG_LWIP_LOCAL_HOSTNAME="espressif" +# end of LWIP diff --git a/ports/espressif/boards/gravitech_cucumber_m/sdkconfig b/ports/espressif/boards/gravitech_cucumber_m/sdkconfig index af73f6d885..7b07033d7b 100644 --- a/ports/espressif/boards/gravitech_cucumber_m/sdkconfig +++ b/ports/espressif/boards/gravitech_cucumber_m/sdkconfig @@ -1,3 +1,4 @@ +# CONFIG_ESP32S2_SPIRAM_SUPPORT is not set # # LWIP # diff --git a/ports/espressif/boards/gravitech_cucumber_ms/sdkconfig b/ports/espressif/boards/gravitech_cucumber_ms/sdkconfig index cbdd787aa7..b31dd447e1 100644 --- a/ports/espressif/boards/gravitech_cucumber_ms/sdkconfig +++ b/ports/espressif/boards/gravitech_cucumber_ms/sdkconfig @@ -1,3 +1,4 @@ +# CONFIG_ESP32S2_SPIRAM_SUPPORT is not set # # LWIP # diff --git a/ports/espressif/boards/gravitech_cucumber_r/sdkconfig b/ports/espressif/boards/gravitech_cucumber_r/sdkconfig index 3862b27003..fe0857c4fb 100644 --- a/ports/espressif/boards/gravitech_cucumber_r/sdkconfig +++ b/ports/espressif/boards/gravitech_cucumber_r/sdkconfig @@ -1,5 +1,4 @@ CONFIG_ESP32S2_SPIRAM_SUPPORT=y - # # SPI RAM config # @@ -8,11 +7,12 @@ CONFIG_SPIRAM_TYPE_ESPPSRAM16=y # CONFIG_SPIRAM_TYPE_ESPPSRAM32 is not set # CONFIG_SPIRAM_TYPE_ESPPSRAM64 is not set CONFIG_SPIRAM_SIZE=2097152 +# end of SPI RAM config +CONFIG_DEFAULT_PSRAM_CLK_IO=30 # # 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 @@ -30,8 +30,6 @@ CONFIG_SPIRAM_USE_MEMMAP=y # 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 - # # LWIP # diff --git a/ports/espressif/boards/gravitech_cucumber_rs/sdkconfig b/ports/espressif/boards/gravitech_cucumber_rs/sdkconfig index bc8328d1f1..23b3eea78d 100644 --- a/ports/espressif/boards/gravitech_cucumber_rs/sdkconfig +++ b/ports/espressif/boards/gravitech_cucumber_rs/sdkconfig @@ -1,5 +1,4 @@ CONFIG_ESP32S2_SPIRAM_SUPPORT=y - # # SPI RAM config # @@ -8,11 +7,12 @@ CONFIG_SPIRAM_TYPE_ESPPSRAM16=y # CONFIG_SPIRAM_TYPE_ESPPSRAM32 is not set # CONFIG_SPIRAM_TYPE_ESPPSRAM64 is not set CONFIG_SPIRAM_SIZE=2097152 +# end of SPI RAM config +CONFIG_DEFAULT_PSRAM_CLK_IO=30 # # 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 @@ -30,8 +30,6 @@ CONFIG_SPIRAM_USE_MEMMAP=y # 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 - # # LWIP # diff --git a/ports/espressif/boards/lilygo_ttgo_t8_s2_st7789/sdkconfig b/ports/espressif/boards/lilygo_ttgo_t8_s2_st7789/sdkconfig index 5d52cbff44..8c401a6ff3 100644 --- a/ports/espressif/boards/lilygo_ttgo_t8_s2_st7789/sdkconfig +++ b/ports/espressif/boards/lilygo_ttgo_t8_s2_st7789/sdkconfig @@ -1,29 +1,37 @@ CONFIG_ESP32S2_SPIRAM_SUPPORT=y - # # SPI RAM config # +# CONFIG_SPIRAM_TYPE_AUTO is not set +# CONFIG_SPIRAM_TYPE_ESPPSRAM16 is not set +# CONFIG_SPIRAM_TYPE_ESPPSRAM32 is not set CONFIG_SPIRAM_TYPE_ESPPSRAM64=y CONFIG_SPIRAM_SIZE=8388608 +# end of SPI RAM config +CONFIG_DEFAULT_PSRAM_CLK_IO=30 # # 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_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_USE_MALLOC=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 -# end of SPI RAM config - +# CONFIG_SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY is not set # # LWIP # CONFIG_LWIP_LOCAL_HOSTNAME="TTGO-T8-ESP32-S2" -CONFIG_LWIP_DNS_SUPPORT_MDNS_QUERIES=y # end of LWIP diff --git a/ports/espressif/boards/lolin_s2_mini/sdkconfig b/ports/espressif/boards/lolin_s2_mini/sdkconfig index 126ae31312..deb0dadcb9 100644 --- a/ports/espressif/boards/lolin_s2_mini/sdkconfig +++ b/ports/espressif/boards/lolin_s2_mini/sdkconfig @@ -1,24 +1,24 @@ CONFIG_ESP32S2_SPIRAM_SUPPORT=y - # # SPI RAM config # -# CONFIG_SPIRAM_TYPE_AUTO=y +# CONFIG_SPIRAM_TYPE_AUTO is not set CONFIG_SPIRAM_TYPE_ESPPSRAM16=y # CONFIG_SPIRAM_TYPE_ESPPSRAM32 is not set -# CONFIG_SPIRAM_TYPE_ESPPSRAM64=y +# CONFIG_SPIRAM_TYPE_ESPPSRAM64 is not set CONFIG_SPIRAM_SIZE=2097152 +# end of SPI RAM config +CONFIG_DEFAULT_PSRAM_CLK_IO=30 # # 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_SPEED_80M=y +# 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 @@ -30,8 +30,6 @@ CONFIG_SPIRAM_USE_MEMMAP=y # 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 - # # LWIP # diff --git a/ports/espressif/boards/lolin_s2_pico/sdkconfig b/ports/espressif/boards/lolin_s2_pico/sdkconfig index 36e83d7fb5..5ce352a98d 100644 --- a/ports/espressif/boards/lolin_s2_pico/sdkconfig +++ b/ports/espressif/boards/lolin_s2_pico/sdkconfig @@ -1,24 +1,24 @@ CONFIG_ESP32S2_SPIRAM_SUPPORT=y - # # SPI RAM config # -# CONFIG_SPIRAM_TYPE_AUTO=y +# CONFIG_SPIRAM_TYPE_AUTO is not set CONFIG_SPIRAM_TYPE_ESPPSRAM16=y # CONFIG_SPIRAM_TYPE_ESPPSRAM32 is not set -# CONFIG_SPIRAM_TYPE_ESPPSRAM64=y +# CONFIG_SPIRAM_TYPE_ESPPSRAM64 is not set CONFIG_SPIRAM_SIZE=2097152 +# end of SPI RAM config +CONFIG_DEFAULT_PSRAM_CLK_IO=30 # # 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_SPEED_80M=y +# 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 @@ -30,8 +30,6 @@ CONFIG_SPIRAM_USE_MEMMAP=y # 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 - # # LWIP # diff --git a/ports/espressif/boards/microdev_micro_s2/sdkconfig b/ports/espressif/boards/microdev_micro_s2/sdkconfig index b3c5219972..4b617fee71 100644 --- a/ports/espressif/boards/microdev_micro_s2/sdkconfig +++ b/ports/espressif/boards/microdev_micro_s2/sdkconfig @@ -1,5 +1,4 @@ CONFIG_ESP32S2_SPIRAM_SUPPORT=y - # # SPI RAM config # @@ -8,11 +7,12 @@ CONFIG_ESP32S2_SPIRAM_SUPPORT=y # CONFIG_SPIRAM_TYPE_ESPPSRAM32 is not set CONFIG_SPIRAM_TYPE_ESPPSRAM64=y CONFIG_SPIRAM_SIZE=8388608 +# end of SPI RAM config +CONFIG_DEFAULT_PSRAM_CLK_IO=30 # # 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 @@ -30,8 +30,6 @@ CONFIG_SPIRAM_USE_MEMMAP=y # 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 - # # LWIP # diff --git a/ports/espressif/boards/morpheans_morphesp-240/sdkconfig b/ports/espressif/boards/morpheans_morphesp-240/sdkconfig index 36ada0b0c7..6de15d1556 100644 --- a/ports/espressif/boards/morpheans_morphesp-240/sdkconfig +++ b/ports/espressif/boards/morpheans_morphesp-240/sdkconfig @@ -1,6 +1,6 @@ +# CONFIG_ESP32S2_SPIRAM_SUPPORT is not set # # LWIP # CONFIG_LWIP_LOCAL_HOSTNAME="MORPHESP-240" -CONFIG_LWIP_DNS_SUPPORT_MDNS_QUERIES=y -# end of LWIP \ No newline at end of file +# end of LWIP diff --git a/ports/espressif/boards/muselab_nanoesp32_s2_wroom/sdkconfig b/ports/espressif/boards/muselab_nanoesp32_s2_wroom/sdkconfig index e69de29bb2..5b9c86dcc3 100644 --- a/ports/espressif/boards/muselab_nanoesp32_s2_wroom/sdkconfig +++ b/ports/espressif/boards/muselab_nanoesp32_s2_wroom/sdkconfig @@ -0,0 +1,6 @@ +# CONFIG_ESP32S2_SPIRAM_SUPPORT is not set +# +# LWIP +# +CONFIG_LWIP_LOCAL_HOSTNAME="espressif" +# end of LWIP diff --git a/ports/espressif/boards/muselab_nanoesp32_s2_wrover/sdkconfig b/ports/espressif/boards/muselab_nanoesp32_s2_wrover/sdkconfig index e69de29bb2..5b9c86dcc3 100644 --- a/ports/espressif/boards/muselab_nanoesp32_s2_wrover/sdkconfig +++ b/ports/espressif/boards/muselab_nanoesp32_s2_wrover/sdkconfig @@ -0,0 +1,6 @@ +# CONFIG_ESP32S2_SPIRAM_SUPPORT is not set +# +# LWIP +# +CONFIG_LWIP_LOCAL_HOSTNAME="espressif" +# end of LWIP diff --git a/ports/espressif/boards/odt_pixelwing_esp32_s2/sdkconfig b/ports/espressif/boards/odt_pixelwing_esp32_s2/sdkconfig index f67a257854..17c1995cd3 100644 --- a/ports/espressif/boards/odt_pixelwing_esp32_s2/sdkconfig +++ b/ports/espressif/boards/odt_pixelwing_esp32_s2/sdkconfig @@ -1,5 +1,4 @@ CONFIG_ESP32S2_SPIRAM_SUPPORT=y - # # SPI RAM config # @@ -8,11 +7,12 @@ CONFIG_SPIRAM_TYPE_ESPPSRAM16=y # CONFIG_SPIRAM_TYPE_ESPPSRAM32 is not set # CONFIG_SPIRAM_TYPE_ESPPSRAM64 is not set CONFIG_SPIRAM_SIZE=2097152 +# end of SPI RAM config +CONFIG_DEFAULT_PSRAM_CLK_IO=30 # # 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 @@ -30,8 +30,6 @@ CONFIG_SPIRAM_USE_MEMMAP=y # 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 - # # LWIP # diff --git a/ports/espressif/boards/targett_module_clip_wroom/sdkconfig b/ports/espressif/boards/targett_module_clip_wroom/sdkconfig index e69de29bb2..5b9c86dcc3 100644 --- a/ports/espressif/boards/targett_module_clip_wroom/sdkconfig +++ b/ports/espressif/boards/targett_module_clip_wroom/sdkconfig @@ -0,0 +1,6 @@ +# CONFIG_ESP32S2_SPIRAM_SUPPORT is not set +# +# LWIP +# +CONFIG_LWIP_LOCAL_HOSTNAME="espressif" +# end of LWIP diff --git a/ports/espressif/boards/targett_module_clip_wrover/sdkconfig b/ports/espressif/boards/targett_module_clip_wrover/sdkconfig index 9d8bbde967..f19afafa3d 100644 --- a/ports/espressif/boards/targett_module_clip_wrover/sdkconfig +++ b/ports/espressif/boards/targett_module_clip_wrover/sdkconfig @@ -1,5 +1,4 @@ CONFIG_ESP32S2_SPIRAM_SUPPORT=y - # # SPI RAM config # @@ -8,11 +7,12 @@ CONFIG_SPIRAM_TYPE_ESPPSRAM16=y # CONFIG_SPIRAM_TYPE_ESPPSRAM32 is not set # CONFIG_SPIRAM_TYPE_ESPPSRAM64 is not set CONFIG_SPIRAM_SIZE=2097152 +# end of SPI RAM config +CONFIG_DEFAULT_PSRAM_CLK_IO=30 # # 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 @@ -30,4 +30,8 @@ CONFIG_SPIRAM_USE_MEMMAP=y # 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 +# +# LWIP +# +CONFIG_LWIP_LOCAL_HOSTNAME="espressif" +# end of LWIP diff --git a/ports/espressif/boards/unexpectedmaker_feathers2/sdkconfig b/ports/espressif/boards/unexpectedmaker_feathers2/sdkconfig index c9d44460c5..8d785a6004 100644 --- a/ports/espressif/boards/unexpectedmaker_feathers2/sdkconfig +++ b/ports/espressif/boards/unexpectedmaker_feathers2/sdkconfig @@ -1,5 +1,4 @@ CONFIG_ESP32S2_SPIRAM_SUPPORT=y - # # SPI RAM config # @@ -8,11 +7,12 @@ CONFIG_ESP32S2_SPIRAM_SUPPORT=y # CONFIG_SPIRAM_TYPE_ESPPSRAM32 is not set CONFIG_SPIRAM_TYPE_ESPPSRAM64=y CONFIG_SPIRAM_SIZE=8388608 +# end of SPI RAM config +CONFIG_DEFAULT_PSRAM_CLK_IO=30 # # 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 @@ -30,8 +30,6 @@ CONFIG_SPIRAM_USE_MEMMAP=y # 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 - # # LWIP # diff --git a/ports/espressif/boards/unexpectedmaker_feathers2_neo/sdkconfig b/ports/espressif/boards/unexpectedmaker_feathers2_neo/sdkconfig index 453aeb1d2d..4a5990b91d 100644 --- a/ports/espressif/boards/unexpectedmaker_feathers2_neo/sdkconfig +++ b/ports/espressif/boards/unexpectedmaker_feathers2_neo/sdkconfig @@ -1,18 +1,18 @@ CONFIG_ESP32S2_SPIRAM_SUPPORT=y - # # SPI RAM config # -# CONFIG_SPIRAM_TYPE_AUTO=y +# CONFIG_SPIRAM_TYPE_AUTO is not set CONFIG_SPIRAM_TYPE_ESPPSRAM16=y # CONFIG_SPIRAM_TYPE_ESPPSRAM32 is not set -# CONFIG_SPIRAM_TYPE_ESPPSRAM64=y +# CONFIG_SPIRAM_TYPE_ESPPSRAM64 is not set CONFIG_SPIRAM_SIZE=2097152 +# end of SPI RAM config +CONFIG_DEFAULT_PSRAM_CLK_IO=30 # # 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 @@ -30,8 +30,6 @@ CONFIG_SPIRAM_USE_MEMMAP=y # 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 - # # LWIP # diff --git a/ports/espressif/boards/unexpectedmaker_feathers2_prerelease/sdkconfig b/ports/espressif/boards/unexpectedmaker_feathers2_prerelease/sdkconfig index 00e0bb2566..8d785a6004 100644 --- a/ports/espressif/boards/unexpectedmaker_feathers2_prerelease/sdkconfig +++ b/ports/espressif/boards/unexpectedmaker_feathers2_prerelease/sdkconfig @@ -1,5 +1,4 @@ CONFIG_ESP32S2_SPIRAM_SUPPORT=y - # # SPI RAM config # @@ -8,18 +7,17 @@ CONFIG_ESP32S2_SPIRAM_SUPPORT=y # CONFIG_SPIRAM_TYPE_ESPPSRAM32 is not set CONFIG_SPIRAM_TYPE_ESPPSRAM64=y CONFIG_SPIRAM_SIZE=8388608 +# end of SPI RAM config +CONFIG_DEFAULT_PSRAM_CLK_IO=30 # # 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_SPIWP_SD3_PIN=28 # 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 @@ -32,8 +30,6 @@ CONFIG_SPIRAM_USE_MEMMAP=y # 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 - # # LWIP # diff --git a/ports/espressif/boards/unexpectedmaker_tinys2/sdkconfig b/ports/espressif/boards/unexpectedmaker_tinys2/sdkconfig index 91447cdc2a..8539cb7519 100644 --- a/ports/espressif/boards/unexpectedmaker_tinys2/sdkconfig +++ b/ports/espressif/boards/unexpectedmaker_tinys2/sdkconfig @@ -1,24 +1,24 @@ CONFIG_ESP32S2_SPIRAM_SUPPORT=y - # # SPI RAM config # -# CONFIG_SPIRAM_TYPE_AUTO=y +# CONFIG_SPIRAM_TYPE_AUTO is not set CONFIG_SPIRAM_TYPE_ESPPSRAM16=y # CONFIG_SPIRAM_TYPE_ESPPSRAM32 is not set -# CONFIG_SPIRAM_TYPE_ESPPSRAM64=y +# CONFIG_SPIRAM_TYPE_ESPPSRAM64 is not set CONFIG_SPIRAM_SIZE=2097152 +# end of SPI RAM config +CONFIG_DEFAULT_PSRAM_CLK_IO=30 # # 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_SPEED_80M=y +# 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 @@ -30,8 +30,6 @@ CONFIG_SPIRAM_USE_MEMMAP=y # 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 - # # LWIP # diff --git a/ports/espressif/esp-idf-config/sdkconfig-16MB.defaults b/ports/espressif/esp-idf-config/sdkconfig-16MB.defaults index 2299feccd8..fac8ba1cad 100644 --- a/ports/espressif/esp-idf-config/sdkconfig-16MB.defaults +++ b/ports/espressif/esp-idf-config/sdkconfig-16MB.defaults @@ -1,9 +1,18 @@ -# No newlines in this file so they are preserved in the board sdkconfig. +# +# Serial flasher config +# # CONFIG_ESPTOOLPY_FLASHSIZE_1MB is not set # CONFIG_ESPTOOLPY_FLASHSIZE_2MB is not set # CONFIG_ESPTOOLPY_FLASHSIZE_4MB is not set # CONFIG_ESPTOOLPY_FLASHSIZE_8MB is not set CONFIG_ESPTOOLPY_FLASHSIZE_16MB=y CONFIG_ESPTOOLPY_FLASHSIZE="16MB" +CONFIG_ESPTOOLPY_FLASHSIZE_DETECT=y +# end of Serial flasher config + CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="esp-idf-config/partitions-16MB.csv" -CONFIG_PARTITION_TABLE_FILENAME="esp-idf-config/partitions-16MB.csv" \ No newline at end of file +# +# Partition Table +# +CONFIG_PARTITION_TABLE_FILENAME="esp-idf-config/partitions-16MB.csv" +# end of Partition Table diff --git a/ports/espressif/esp-idf-config/sdkconfig-4MB.defaults b/ports/espressif/esp-idf-config/sdkconfig-4MB.defaults index 4da90d1bcd..69f15ebe7b 100644 --- a/ports/espressif/esp-idf-config/sdkconfig-4MB.defaults +++ b/ports/espressif/esp-idf-config/sdkconfig-4MB.defaults @@ -1,9 +1,18 @@ -# No newlines in this file so they are preserved in the board sdkconfig. +# +# Serial flasher config +# # CONFIG_ESPTOOLPY_FLASHSIZE_1MB is not set # CONFIG_ESPTOOLPY_FLASHSIZE_2MB is not set CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y # CONFIG_ESPTOOLPY_FLASHSIZE_8MB is not set # CONFIG_ESPTOOLPY_FLASHSIZE_16MB is not set CONFIG_ESPTOOLPY_FLASHSIZE="4MB" +CONFIG_ESPTOOLPY_FLASHSIZE_DETECT=y +# end of Serial flasher config + CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="esp-idf-config/partitions-4MB.csv" -CONFIG_PARTITION_TABLE_FILENAME="esp-idf-config/partitions-4MB.csv" \ No newline at end of file +# +# Partition Table +# +CONFIG_PARTITION_TABLE_FILENAME="esp-idf-config/partitions-4MB.csv" +# end of Partition Table diff --git a/ports/espressif/esp-idf-config/sdkconfig-8MB.defaults b/ports/espressif/esp-idf-config/sdkconfig-8MB.defaults index af681c5ea8..b1506206df 100644 --- a/ports/espressif/esp-idf-config/sdkconfig-8MB.defaults +++ b/ports/espressif/esp-idf-config/sdkconfig-8MB.defaults @@ -1,9 +1,18 @@ -# No newlines in this file so they are preserved in the board sdkconfig. +# +# Serial flasher config +# # CONFIG_ESPTOOLPY_FLASHSIZE_1MB is not set # CONFIG_ESPTOOLPY_FLASHSIZE_2MB is not set # CONFIG_ESPTOOLPY_FLASHSIZE_4MB is not set CONFIG_ESPTOOLPY_FLASHSIZE_8MB=y # CONFIG_ESPTOOLPY_FLASHSIZE_16MB is not set CONFIG_ESPTOOLPY_FLASHSIZE="8MB" +CONFIG_ESPTOOLPY_FLASHSIZE_DETECT=y +# end of Serial flasher config + CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="esp-idf-config/partitions-8MB.csv" -CONFIG_PARTITION_TABLE_FILENAME="esp-idf-config/partitions-8MB.csv" \ No newline at end of file +# +# Partition Table +# +CONFIG_PARTITION_TABLE_FILENAME="esp-idf-config/partitions-8MB.csv" +# end of Partition Table diff --git a/ports/espressif/esp-idf-config/sdkconfig-debug.defaults b/ports/espressif/esp-idf-config/sdkconfig-debug.defaults index b108532aa2..381483a8b9 100644 --- a/ports/espressif/esp-idf-config/sdkconfig-debug.defaults +++ b/ports/espressif/esp-idf-config/sdkconfig-debug.defaults @@ -1,16 +1,78 @@ -# No newlines in this file so they are preserved in the board sdkconfig. +# +# Bootloader config +# +# CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_SIZE is not set +CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_DEBUG=y +# CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_PERF is not set +# CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_NONE is not set +# end of Bootloader config + +CONFIG_COMPILER_OPTIMIZATION_DEFAULT=y +# +# Compiler options +# +# CONFIG_COMPILER_OPTIMIZATION_SIZE is not set +# CONFIG_COMPILER_OPTIMIZATION_PERF is not set +# CONFIG_COMPILER_OPTIMIZATION_NONE is not set +CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_ENABLE=y +# CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_SILENT is not set +# CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_DISABLE is not set +CONFIG_COMPILER_OPTIMIZATION_ASSERTION_LEVEL=2 +# CONFIG_COMPILER_OPTIMIZATION_CHECKS_SILENT is not set +# end of Compiler options + CONFIG_ESP_ERR_TO_NAME_LOOKUP=y +# +# ESP System Settings +# +CONFIG_ESP_SYSTEM_PANIC_PRINT_HALT=y +# CONFIG_ESP_SYSTEM_PANIC_PRINT_REBOOT is not set +# CONFIG_ESP_SYSTEM_PANIC_SILENT_REBOOT is not set +# CONFIG_ESP_SYSTEM_PANIC_GDBSTUB is not set +# end of ESP System Settings + CONFIG_ESP_CONSOLE_UART_DEFAULT=y # CONFIG_ESP_CONSOLE_USB_CDC is not set # CONFIG_ESP_CONSOLE_UART_CUSTOM is not set # CONFIG_ESP_CONSOLE_NONE is not set CONFIG_ESP_CONSOLE_UART=y +CONFIG_ESP_CONSOLE_MULTIPLE_UART=y CONFIG_ESP_CONSOLE_UART_NUM=0 CONFIG_ESP_CONSOLE_UART_BAUDRATE=115200 -CONFIG_ESP_SYSTEM_PANIC_PRINT_HALT=y -# CONFIG_ESP_SYSTEM_PANIC_PRINT_REBOOT is not set -# CONFIG_ESP_SYSTEM_PANIC_SILENT_REBOOT is not set -# CONFIG_ESP_SYSTEM_PANIC_GDBSTUB is not set -CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_DEBUG=y -CONFIG_COMPILER_OPTIMIZATION_DEFAULT=y -CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_ENABLE=y \ No newline at end of file +# +# FreeRTOS +# +CONFIG_FREERTOS_ASSERT_ON_UNTESTED_FUNCTION=y +CONFIG_FREERTOS_ASSERT_FAIL_ABORT=y +# CONFIG_FREERTOS_ASSERT_FAIL_PRINT_CONTINUE is not set +# CONFIG_FREERTOS_ASSERT_DISABLE is not set +CONFIG_FREERTOS_TASK_FUNCTION_WRAPPER=y +CONFIG_FREERTOS_DEBUG_OCDAWARE=y +# end of FreeRTOS + +CONFIG_HAL_ASSERTION_EQUALS_SYSTEM=y +# +# Hardware Abstraction Layer (HAL) and Low Level (LL) +# +# CONFIG_HAL_ASSERTION_DISABLE is not set +# CONFIG_HAL_ASSERTION_SILIENT is not set +# CONFIG_HAL_ASSERTION_ENABLE is not set +CONFIG_HAL_DEFAULT_ASSERTION_LEVEL=2 +# end of Hardware Abstraction Layer (HAL) and Low Level (LL) + +CONFIG_LWIP_ESP_LWIP_ASSERT=y +# +# Deprecated options for backward compatibility +# +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_OPTIMIZATION_ASSERTIONS_DISABLED is not set +CONFIG_OPTIMIZATION_ASSERTION_LEVEL=2 +CONFIG_CONSOLE_UART_DEFAULT=y +# CONFIG_CONSOLE_UART_CUSTOM is not set +# CONFIG_ESP_CONSOLE_UART_NONE is not set +CONFIG_CONSOLE_UART_NUM=0 +CONFIG_CONSOLE_UART_BAUDRATE=115200 +# end of Deprecated options for backward compatibility diff --git a/ports/espressif/esp-idf-config/sdkconfig-esp32c3.defaults b/ports/espressif/esp-idf-config/sdkconfig-esp32c3.defaults new file mode 100644 index 0000000000..a39afeb505 --- /dev/null +++ b/ports/espressif/esp-idf-config/sdkconfig-esp32c3.defaults @@ -0,0 +1,139 @@ +# +# Espressif IoT Development Framework (ESP-IDF) Project Configuration +# +CONFIG_IDF_TARGET_ARCH_RISCV=y +CONFIG_IDF_TARGET="esp32c3" +CONFIG_IDF_TARGET_ESP32C3=y +CONFIG_IDF_FIRMWARE_CHIP_ID=0x0005 +# end of Espressif IoT Development Framework (ESP-IDF) Project Configuration + +CONFIG_SDK_TOOLPREFIX="riscv32-esp-elf-" +# +# Bootloader config +# +CONFIG_BOOTLOADER_OFFSET_IN_FLASH=0x0 +# end of Bootloader config + +# CONFIG_ESP32C3_DEFAULT_CPU_FREQ_80 is not set +# +# ESP32C3-Specific +# +CONFIG_ESP32C3_DEFAULT_CPU_FREQ_160=y +CONFIG_ESP32C3_DEFAULT_CPU_FREQ_MHZ=160 +# CONFIG_ESP32C3_REV_MIN_0 is not set +# CONFIG_ESP32C3_REV_MIN_1 is not set +# CONFIG_ESP32C3_REV_MIN_2 is not set +CONFIG_ESP32C3_REV_MIN_3=y +CONFIG_ESP32C3_REV_MIN=3 +CONFIG_ESP32C3_DEBUG_OCDAWARE=y +# CONFIG_ESP32C3_DEBUG_STUBS_ENABLE is not set +CONFIG_ESP32C3_BROWNOUT_DET=y +CONFIG_ESP32C3_BROWNOUT_DET_LVL_SEL_7=y +# CONFIG_ESP32C3_BROWNOUT_DET_LVL_SEL_6 is not set +# CONFIG_ESP32C3_BROWNOUT_DET_LVL_SEL_5 is not set +# CONFIG_ESP32C3_BROWNOUT_DET_LVL_SEL_4 is not set +# CONFIG_ESP32C3_BROWNOUT_DET_LVL_SEL_3 is not set +# CONFIG_ESP32C3_BROWNOUT_DET_LVL_SEL_2 is not set +CONFIG_ESP32C3_BROWNOUT_DET_LVL=7 +CONFIG_ESP32C3_TIME_SYSCALL_USE_RTC_SYSTIMER=y +# CONFIG_ESP32C3_TIME_SYSCALL_USE_RTC is not set +# CONFIG_ESP32C3_TIME_SYSCALL_USE_SYSTIMER is not set +# CONFIG_ESP32C3_TIME_SYSCALL_USE_NONE is not set +CONFIG_ESP32C3_RTC_CLK_SRC_INT_RC=y +# CONFIG_ESP32C3_RTC_CLK_SRC_EXT_CRYS is not set +# CONFIG_ESP32C3_RTC_CLK_SRC_EXT_OSC is not set +# CONFIG_ESP32C3_RTC_CLK_SRC_INT_8MD256 is not set +CONFIG_ESP32C3_RTC_CLK_CAL_CYCLES=1024 +# CONFIG_ESP32C3_NO_BLOBS is not set +# end of ESP32C3-Specific + +# CONFIG_ESP32C3_UNIVERSAL_MAC_ADDRESSES_TWO is not set +# +# MAC Config +# +CONFIG_ESP32C3_UNIVERSAL_MAC_ADDRESSES_FOUR=y +CONFIG_ESP32C3_UNIVERSAL_MAC_ADDRESSES=4 +# end of MAC Config + +CONFIG_ESP_SLEEP_POWER_DOWN_FLASH=y +# +# Sleep Config +# +CONFIG_ESP_SLEEP_GPIO_RESET_WORKAROUND=y +# end of Sleep Config + +CONFIG_ESP_SYSTEM_SINGLE_CORE_MODE=y +# +# Memory protection +# +CONFIG_ESP_SYSTEM_MEMPROT_DEPCHECK=y +CONFIG_ESP_SYSTEM_MEMPROT_FEATURE=y +CONFIG_ESP_SYSTEM_MEMPROT_FEATURE_LOCK=y +CONFIG_ESP_SYSTEM_MEMPROT_CPU_PREFETCH_PAD_SIZE=16 +CONFIG_ESP_SYSTEM_MEMPROT_MEM_ALIGN_SIZE=512 +# end of Memory protection + +CONFIG_ESP_MAIN_TASK_AFFINITY_CPU0=y +# CONFIG_ESP_MAIN_TASK_AFFINITY_NO_AFFINITY is not set +CONFIG_ESP_MAIN_TASK_AFFINITY=0x0 +# +# Wi-Fi +# +CONFIG_ESP32_WIFI_ENABLED=y +CONFIG_ESP32_WIFI_STATIC_RX_BUFFER_NUM=4 +CONFIG_ESP32_WIFI_DYNAMIC_RX_BUFFER_NUM=8 +# CONFIG_ESP32_WIFI_STATIC_TX_BUFFER is not set +CONFIG_ESP32_WIFI_DYNAMIC_TX_BUFFER=y +CONFIG_ESP32_WIFI_TX_BUFFER_TYPE=1 +CONFIG_ESP32_WIFI_DYNAMIC_TX_BUFFER_NUM=16 +# CONFIG_ESP32_WIFI_CSI_ENABLED is not set +CONFIG_ESP32_WIFI_AMPDU_TX_ENABLED=y +CONFIG_ESP32_WIFI_TX_BA_WIN=6 +CONFIG_ESP32_WIFI_AMPDU_RX_ENABLED=y +CONFIG_ESP32_WIFI_RX_BA_WIN=6 +# CONFIG_ESP32_WIFI_NVS_ENABLED is not set +CONFIG_ESP32_WIFI_SOFTAP_BEACON_MAX_LEN=752 +CONFIG_ESP32_WIFI_MGMT_SBUF_NUM=32 +CONFIG_ESP32_WIFI_IRAM_OPT=y +CONFIG_ESP32_WIFI_RX_IRAM_OPT=y +# CONFIG_ESP32_WIFI_ENABLE_WPA3_SAE is not set +# CONFIG_ESP_WIFI_EXTERNAL_COEXIST_ENABLE is not set +# end of Wi-Fi + +CONFIG_FREERTOS_UNICORE=y +# +# FreeRTOS +# +CONFIG_FREERTOS_OPTIMIZED_SCHEDULER=y +# end of FreeRTOS + +CONFIG_TOOLPREFIX="riscv32-esp-elf-" +# +# Deprecated options for backward compatibility +# +# CONFIG_ESP32_APPTRACE_DEST_TRAX is not set +CONFIG_ESP32_APPTRACE_DEST_NONE=y +CONFIG_ESP32_APPTRACE_LOCK_ENABLE=y +CONFIG_ESP_SYSTEM_PD_FLASH=y +CONFIG_ESP32C3_LIGHTSLEEP_GPIO_RESET_WORKAROUND=y +CONFIG_ESP32_PHY_CALIBRATION_AND_DATA_STORAGE=y +# CONFIG_ESP32_PHY_INIT_DATA_IN_PARTITION is not set +CONFIG_ESP32_PHY_MAX_WIFI_TX_POWER=20 +CONFIG_ESP32_PHY_MAX_TX_POWER=20 +# CONFIG_ESP32S2_PANIC_PRINT_HALT is not set +# CONFIG_ESP32S2_PANIC_PRINT_REBOOT is not set +CONFIG_ESP32S2_PANIC_SILENT_REBOOT=y +# CONFIG_ESP32S2_PANIC_GDBSTUB is not set +CONFIG_ESP32S2_ALLOW_RTC_FAST_MEM_AS_HEAP=y +CONFIG_ESP32H2_MEMPROT_FEATURE=y +CONFIG_ESP32H2_MEMPROT_FEATURE_LOCK=y +# CONFIG_EXTERNAL_COEX_ENABLE is not set +# CONFIG_ESP32_ENABLE_COREDUMP_TO_FLASH is not set +# CONFIG_ESP32_ENABLE_COREDUMP_TO_UART is not set +CONFIG_ESP32_ENABLE_COREDUMP_TO_NONE=y +CONFIG_ESP32_PTHREAD_TASK_PRIO_DEFAULT=5 +CONFIG_ESP32_PTHREAD_TASK_STACK_SIZE_DEFAULT=3072 +CONFIG_ESP32_PTHREAD_STACK_MIN=768 +CONFIG_ESP32_PTHREAD_TASK_CORE_DEFAULT=-1 +CONFIG_ESP32_PTHREAD_TASK_NAME_DEFAULT="pthread" +# end of Deprecated options for backward compatibility diff --git a/ports/espressif/esp-idf-config/sdkconfig-esp32s2.defaults b/ports/espressif/esp-idf-config/sdkconfig-esp32s2.defaults new file mode 100644 index 0000000000..9020572ccb --- /dev/null +++ b/ports/espressif/esp-idf-config/sdkconfig-esp32s2.defaults @@ -0,0 +1,170 @@ +# +# Espressif IoT Development Framework (ESP-IDF) Project Configuration +# +CONFIG_IDF_TARGET_ARCH_XTENSA=y +CONFIG_IDF_TARGET="esp32s2" +CONFIG_IDF_TARGET_ESP32S2=y +CONFIG_IDF_FIRMWARE_CHIP_ID=0x0002 +# end of Espressif IoT Development Framework (ESP-IDF) Project Configuration + +CONFIG_SDK_TOOLPREFIX="xtensa-esp32s2-elf-" +# +# Bootloader config +# +CONFIG_BOOTLOADER_OFFSET_IN_FLASH=0x1000 +# end of Bootloader config + +# CONFIG_ESP32S2_DEFAULT_CPU_FREQ_80 is not set +# +# ESP32S2-specific +# +# CONFIG_ESP32S2_DEFAULT_CPU_FREQ_160 is not set +CONFIG_ESP32S2_DEFAULT_CPU_FREQ_240=y +CONFIG_ESP32S2_DEFAULT_CPU_FREQ_MHZ=240 +# end of ESP32S2-specific + +# CONFIG_ESP32S2_INSTRUCTION_CACHE_8KB is not set +# +# Cache config +# +CONFIG_ESP32S2_INSTRUCTION_CACHE_16KB=y +# CONFIG_ESP32S2_INSTRUCTION_CACHE_LINE_16B is not set +CONFIG_ESP32S2_INSTRUCTION_CACHE_LINE_32B=y +# CONFIG_ESP32S2_DATA_CACHE_0KB is not set +# CONFIG_ESP32S2_DATA_CACHE_8KB is not set +CONFIG_ESP32S2_DATA_CACHE_16KB=y +# CONFIG_ESP32S2_DATA_CACHE_LINE_16B is not set +CONFIG_ESP32S2_DATA_CACHE_LINE_32B=y +# CONFIG_ESP32S2_INSTRUCTION_CACHE_WRAP is not set +# CONFIG_ESP32S2_DATA_CACHE_WRAP is not set +# end of Cache config + +# CONFIG_ESP32S2_TRAX is not set +CONFIG_ESP32S2_TRACEMEM_RESERVE_DRAM=0x0 +# CONFIG_ESP32S2_ULP_COPROC_ENABLED is not set +CONFIG_ESP32S2_ULP_COPROC_RESERVE_MEM=0 +CONFIG_ESP32S2_DEBUG_OCDAWARE=y +# CONFIG_ESP32S2_DEBUG_STUBS_ENABLE is not set +CONFIG_ESP32S2_BROWNOUT_DET=y +CONFIG_ESP32S2_BROWNOUT_DET_LVL_SEL_7=y +# CONFIG_ESP32S2_BROWNOUT_DET_LVL_SEL_6 is not set +# CONFIG_ESP32S2_BROWNOUT_DET_LVL_SEL_5 is not set +# CONFIG_ESP32S2_BROWNOUT_DET_LVL_SEL_4 is not set +# CONFIG_ESP32S2_BROWNOUT_DET_LVL_SEL_3 is not set +# CONFIG_ESP32S2_BROWNOUT_DET_LVL_SEL_2 is not set +# CONFIG_ESP32S2_BROWNOUT_DET_LVL_SEL_1 is not set +CONFIG_ESP32S2_BROWNOUT_DET_LVL=7 +CONFIG_ESP32S2_TIME_SYSCALL_USE_RTC_FRC1=y +# CONFIG_ESP32S2_TIME_SYSCALL_USE_RTC is not set +# CONFIG_ESP32S2_TIME_SYSCALL_USE_FRC1 is not set +# CONFIG_ESP32S2_TIME_SYSCALL_USE_NONE is not set +CONFIG_ESP32S2_RTC_CLK_SRC_INT_RC=y +# CONFIG_ESP32S2_RTC_CLK_SRC_EXT_CRYS is not set +# CONFIG_ESP32S2_RTC_CLK_SRC_EXT_OSC is not set +# CONFIG_ESP32S2_RTC_CLK_SRC_INT_8MD256 is not set +CONFIG_ESP32S2_RTC_CLK_CAL_CYCLES=576 +# CONFIG_ESP32S2_NO_BLOBS is not set +# CONFIG_ESP32S2_KEEP_USB_ALIVE is not set +# CONFIG_ESP32S2_RTCDATA_IN_FAST_MEM is not set +# CONFIG_ESP32S2_USE_FIXED_STATIC_RAM_SIZE is not set +# +# MAC Config +# +# CONFIG_ESP32S2_UNIVERSAL_MAC_ADDRESSES_ONE is not set +CONFIG_ESP32S2_UNIVERSAL_MAC_ADDRESSES_TWO=y +CONFIG_ESP32S2_UNIVERSAL_MAC_ADDRESSES=2 +# end of MAC Config + +CONFIG_ESP_SLEEP_POWER_DOWN_FLASH=y +# +# Sleep Config +# +# CONFIG_ESP_SLEEP_GPIO_RESET_WORKAROUND is not set +# end of Sleep Config + +# +# ESP System Settings +# +CONFIG_ESP_SYSTEM_SINGLE_CORE_MODE=y +# end of ESP System Settings + +CONFIG_ESP_SYSTEM_MEMPROT_DEPCHECK=y +# +# Memory protection +# +CONFIG_ESP_SYSTEM_MEMPROT_FEATURE=y +CONFIG_ESP_SYSTEM_MEMPROT_FEATURE_LOCK=y +CONFIG_ESP_SYSTEM_MEMPROT_CPU_PREFETCH_PAD_SIZE=16 +CONFIG_ESP_SYSTEM_MEMPROT_MEM_ALIGN_SIZE=4 +# end of Memory protection + +CONFIG_ESP_MAIN_TASK_AFFINITY_CPU0=y +# CONFIG_ESP_MAIN_TASK_AFFINITY_NO_AFFINITY is not set +CONFIG_ESP_MAIN_TASK_AFFINITY=0x0 +# +# Wi-Fi +# +CONFIG_ESP32_WIFI_ENABLED=y +CONFIG_ESP32_WIFI_STATIC_RX_BUFFER_NUM=4 +CONFIG_ESP32_WIFI_DYNAMIC_RX_BUFFER_NUM=8 +# CONFIG_ESP32_WIFI_STATIC_TX_BUFFER is not set +CONFIG_ESP32_WIFI_DYNAMIC_TX_BUFFER=y +CONFIG_ESP32_WIFI_TX_BUFFER_TYPE=1 +CONFIG_ESP32_WIFI_DYNAMIC_TX_BUFFER_NUM=16 +CONFIG_ESP32_WIFI_CACHE_TX_BUFFER_NUM=16 +# CONFIG_ESP32_WIFI_CSI_ENABLED is not set +CONFIG_ESP32_WIFI_AMPDU_TX_ENABLED=y +CONFIG_ESP32_WIFI_TX_BA_WIN=6 +CONFIG_ESP32_WIFI_AMPDU_RX_ENABLED=y +CONFIG_ESP32_WIFI_RX_BA_WIN=6 +# CONFIG_ESP32_WIFI_NVS_ENABLED is not set +CONFIG_ESP32_WIFI_SOFTAP_BEACON_MAX_LEN=752 +CONFIG_ESP32_WIFI_MGMT_SBUF_NUM=32 +CONFIG_ESP32_WIFI_IRAM_OPT=y +CONFIG_ESP32_WIFI_RX_IRAM_OPT=y +# CONFIG_ESP32_WIFI_ENABLE_WPA3_SAE is not set +# CONFIG_ESP_WIFI_EXTERNAL_COEXIST_ENABLE is not set +# end of Wi-Fi + +CONFIG_FREERTOS_UNICORE=y +# +# FreeRTOS +# +CONFIG_FREERTOS_TICK_SUPPORT_CORETIMER=y +CONFIG_FREERTOS_CORETIMER_0=y +# CONFIG_FREERTOS_CORETIMER_1 is not set +CONFIG_FREERTOS_SYSTICK_USES_CCOUNT=y +CONFIG_FREERTOS_OPTIMIZED_SCHEDULER=y +# end of FreeRTOS + +CONFIG_MBEDTLS_HARDWARE_GCM=y +# +# Deprecated options for backward compatibility +# +CONFIG_TOOLPREFIX="xtensa-esp32s2-elf-" +# CONFIG_ESP32_APPTRACE_DEST_TRAX is not set +CONFIG_ESP32_APPTRACE_DEST_NONE=y +CONFIG_ESP32_APPTRACE_LOCK_ENABLE=y +CONFIG_ESP_SYSTEM_PD_FLASH=y +# CONFIG_ESP32C3_LIGHTSLEEP_GPIO_RESET_WORKAROUND is not set +CONFIG_ESP32_PHY_CALIBRATION_AND_DATA_STORAGE=y +# CONFIG_ESP32_PHY_INIT_DATA_IN_PARTITION is not set +CONFIG_ESP32_PHY_MAX_WIFI_TX_POWER=20 +CONFIG_ESP32_PHY_MAX_TX_POWER=20 +CONFIG_ESP32S2_PANIC_PRINT_HALT=y +# CONFIG_ESP32S2_PANIC_PRINT_REBOOT is not set +# CONFIG_ESP32S2_PANIC_SILENT_REBOOT is not set +# CONFIG_ESP32S2_PANIC_GDBSTUB is not set +CONFIG_ESP32S2_ALLOW_RTC_FAST_MEM_AS_HEAP=y +CONFIG_ESP32H2_MEMPROT_FEATURE=y +CONFIG_ESP32H2_MEMPROT_FEATURE_LOCK=y +# CONFIG_EXTERNAL_COEX_ENABLE is not set +# CONFIG_ESP32_ENABLE_COREDUMP_TO_FLASH is not set +# CONFIG_ESP32_ENABLE_COREDUMP_TO_UART is not set +CONFIG_ESP32_ENABLE_COREDUMP_TO_NONE=y +CONFIG_ESP32_PTHREAD_TASK_PRIO_DEFAULT=5 +CONFIG_ESP32_PTHREAD_TASK_STACK_SIZE_DEFAULT=3072 +CONFIG_ESP32_PTHREAD_STACK_MIN=768 +CONFIG_ESP32_PTHREAD_TASK_CORE_DEFAULT=-1 +CONFIG_ESP32_PTHREAD_TASK_NAME_DEFAULT="pthread" +# end of Deprecated options for backward compatibility diff --git a/ports/espressif/esp-idf-config/sdkconfig-esp32s3.defaults b/ports/espressif/esp-idf-config/sdkconfig-esp32s3.defaults new file mode 100644 index 0000000000..d190f0b864 --- /dev/null +++ b/ports/espressif/esp-idf-config/sdkconfig-esp32s3.defaults @@ -0,0 +1,149 @@ +# +# Espressif IoT Development Framework (ESP-IDF) Project Configuration +# +CONFIG_IDF_TARGET_ARCH_XTENSA=y +CONFIG_IDF_TARGET="esp32s3" +CONFIG_IDF_TARGET_ESP32S3=y +CONFIG_IDF_FIRMWARE_CHIP_ID=0x0009 +# end of Espressif IoT Development Framework (ESP-IDF) Project Configuration + +CONFIG_SDK_TOOLPREFIX="xtensa-esp32s3-elf-" +# +# Bootloader config +# +CONFIG_BOOTLOADER_OFFSET_IN_FLASH=0x0 +# end of Bootloader config + +# CONFIG_ESP32S3_DEFAULT_CPU_FREQ_80 is not set +# +# ESP32S3-Specific +# +# CONFIG_ESP32S3_DEFAULT_CPU_FREQ_160 is not set +CONFIG_ESP32S3_DEFAULT_CPU_FREQ_240=y +CONFIG_ESP32S3_DEFAULT_CPU_FREQ_MHZ=240 +# end of ESP32S3-Specific + +CONFIG_ESP32S3_INSTRUCTION_CACHE_16KB=y +# +# Cache config +# +# CONFIG_ESP32S3_INSTRUCTION_CACHE_32KB is not set +CONFIG_ESP32S3_INSTRUCTION_CACHE_SIZE=0x4000 +# CONFIG_ESP32S3_INSTRUCTION_CACHE_4WAYS is not set +CONFIG_ESP32S3_INSTRUCTION_CACHE_8WAYS=y +CONFIG_ESP32S3_ICACHE_ASSOCIATED_WAYS=8 +# CONFIG_ESP32S3_INSTRUCTION_CACHE_LINE_16B is not set +CONFIG_ESP32S3_INSTRUCTION_CACHE_LINE_32B=y +CONFIG_ESP32S3_INSTRUCTION_CACHE_LINE_SIZE=32 +# CONFIG_ESP32S3_INSTRUCTION_CACHE_WRAP is not set +# CONFIG_ESP32S3_DATA_CACHE_16KB is not set +CONFIG_ESP32S3_DATA_CACHE_32KB=y +# CONFIG_ESP32S3_DATA_CACHE_64KB is not set +CONFIG_ESP32S3_DATA_CACHE_SIZE=0x8000 +# CONFIG_ESP32S3_DATA_CACHE_4WAYS is not set +CONFIG_ESP32S3_DATA_CACHE_8WAYS=y +CONFIG_ESP32S3_DCACHE_ASSOCIATED_WAYS=8 +# CONFIG_ESP32S3_DATA_CACHE_LINE_16B is not set +CONFIG_ESP32S3_DATA_CACHE_LINE_32B=y +# CONFIG_ESP32S3_DATA_CACHE_LINE_64B is not set +CONFIG_ESP32S3_DATA_CACHE_LINE_SIZE=32 +# CONFIG_ESP32S3_DATA_CACHE_WRAP is not set +# end of Cache config + +# CONFIG_ESP32S3_TRAX is not set +CONFIG_ESP32S3_TRACEMEM_RESERVE_DRAM=0x0 +# CONFIG_ESP32S3_ULP_COPROC_ENABLED is not set +CONFIG_ESP32S3_ULP_COPROC_RESERVE_MEM=0 +# CONFIG_ESP32S3_DEBUG_STUBS_ENABLE is not set +CONFIG_ESP32S3_BROWNOUT_DET=y +CONFIG_ESP32S3_BROWNOUT_DET_LVL_SEL_7=y +# CONFIG_ESP32S3_BROWNOUT_DET_LVL_SEL_6 is not set +# CONFIG_ESP32S3_BROWNOUT_DET_LVL_SEL_5 is not set +# CONFIG_ESP32S3_BROWNOUT_DET_LVL_SEL_4 is not set +# CONFIG_ESP32S3_BROWNOUT_DET_LVL_SEL_3 is not set +# CONFIG_ESP32S3_BROWNOUT_DET_LVL_SEL_2 is not set +# CONFIG_ESP32S3_BROWNOUT_DET_LVL_SEL_1 is not set +CONFIG_ESP32S3_BROWNOUT_DET_LVL=7 +CONFIG_ESP32S3_TIME_SYSCALL_USE_RTC_FRC1=y +# CONFIG_ESP32S3_TIME_SYSCALL_USE_RTC is not set +# CONFIG_ESP32S3_TIME_SYSCALL_USE_FRC1 is not set +# CONFIG_ESP32S3_TIME_SYSCALL_USE_NONE is not set +CONFIG_ESP32S3_RTC_CLK_SRC_INT_RC=y +# CONFIG_ESP32S3_RTC_CLK_SRC_EXT_CRYS is not set +# CONFIG_ESP32S3_RTC_CLK_SRC_EXT_OSC is not set +# CONFIG_ESP32S3_RTC_CLK_SRC_INT_8MD256 is not set +CONFIG_ESP32S3_RTC_CLK_CAL_CYCLES=1024 +CONFIG_ESP32S3_DEEP_SLEEP_WAKEUP_DELAY=2000 +# CONFIG_ESP32S3_NO_BLOBS is not set +# CONFIG_ESP32S3_RTCDATA_IN_FAST_MEM is not set +# CONFIG_ESP32S3_USE_FIXED_STATIC_RAM_SIZE is not set +# +# MAC Config +# +# CONFIG_ESP32S3_UNIVERSAL_MAC_ADDRESSES_TWO is not set +CONFIG_ESP32S3_UNIVERSAL_MAC_ADDRESSES_FOUR=y +CONFIG_ESP32S3_UNIVERSAL_MAC_ADDRESSES=4 +# end of MAC Config + +CONFIG_ESP_SLEEP_GPIO_RESET_WORKAROUND=y +CONFIG_ESP_MAIN_TASK_AFFINITY_CPU0=y +# CONFIG_ESP_MAIN_TASK_AFFINITY_CPU1 is not set +# CONFIG_ESP_MAIN_TASK_AFFINITY_NO_AFFINITY is not set +CONFIG_ESP_MAIN_TASK_AFFINITY=0x0 +# +# Wi-Fi +# +CONFIG_ESP32_WIFI_ENABLED=y +CONFIG_ESP32_WIFI_STATIC_RX_BUFFER_NUM=4 +CONFIG_ESP32_WIFI_DYNAMIC_RX_BUFFER_NUM=8 +# CONFIG_ESP32_WIFI_STATIC_TX_BUFFER is not set +CONFIG_ESP32_WIFI_DYNAMIC_TX_BUFFER=y +CONFIG_ESP32_WIFI_TX_BUFFER_TYPE=1 +CONFIG_ESP32_WIFI_CACHE_TX_BUFFER_NUM=16 +CONFIG_ESP32_WIFI_DYNAMIC_TX_BUFFER_NUM=16 +# CONFIG_ESP32_WIFI_CSI_ENABLED is not set +CONFIG_ESP32_WIFI_AMPDU_TX_ENABLED=y +CONFIG_ESP32_WIFI_TX_BA_WIN=6 +CONFIG_ESP32_WIFI_AMPDU_RX_ENABLED=y +CONFIG_ESP32_WIFI_RX_BA_WIN=6 +# CONFIG_ESP32_WIFI_AMSDU_TX_ENABLED is not set +# CONFIG_ESP32_WIFI_NVS_ENABLED is not set +CONFIG_ESP32_WIFI_TASK_PINNED_TO_CORE_0=y +# CONFIG_ESP32_WIFI_TASK_PINNED_TO_CORE_1 is not set +CONFIG_ESP32_WIFI_SOFTAP_BEACON_MAX_LEN=752 +CONFIG_ESP32_WIFI_MGMT_SBUF_NUM=32 +CONFIG_ESP32_WIFI_IRAM_OPT=y +CONFIG_ESP32_WIFI_RX_IRAM_OPT=y +# CONFIG_ESP32_WIFI_ENABLE_WPA3_SAE is not set +# end of Wi-Fi + +# CONFIG_FREERTOS_UNICORE is not set +# +# Deprecated options for backward compatibility +# +CONFIG_TOOLPREFIX="xtensa-esp32s3-elf-" +# CONFIG_ESP32_APPTRACE_DEST_TRAX is not set +CONFIG_ESP32_APPTRACE_DEST_NONE=y +CONFIG_ESP32_APPTRACE_LOCK_ENABLE=y +CONFIG_ESP32C3_LIGHTSLEEP_GPIO_RESET_WORKAROUND=y +CONFIG_ESP32_PHY_CALIBRATION_AND_DATA_STORAGE=y +# CONFIG_ESP32_PHY_INIT_DATA_IN_PARTITION is not set +CONFIG_ESP32_PHY_MAX_WIFI_TX_POWER=20 +CONFIG_ESP32_PHY_MAX_TX_POWER=20 +# CONFIG_ESP32S2_PANIC_PRINT_HALT is not set +# CONFIG_ESP32S2_PANIC_PRINT_REBOOT is not set +CONFIG_ESP32S2_PANIC_SILENT_REBOOT=y +# CONFIG_ESP32S2_PANIC_GDBSTUB is not set +CONFIG_ESP32S2_ALLOW_RTC_FAST_MEM_AS_HEAP=y +# CONFIG_ESP32_ENABLE_COREDUMP_TO_FLASH is not set +# CONFIG_ESP32_ENABLE_COREDUMP_TO_UART is not set +CONFIG_ESP32_ENABLE_COREDUMP_TO_NONE=y +CONFIG_ESP32_PTHREAD_TASK_PRIO_DEFAULT=5 +CONFIG_ESP32_PTHREAD_TASK_STACK_SIZE_DEFAULT=3072 +CONFIG_ESP32_PTHREAD_STACK_MIN=768 +CONFIG_ESP32_DEFAULT_PTHREAD_CORE_NO_AFFINITY=y +# CONFIG_ESP32_DEFAULT_PTHREAD_CORE_0 is not set +# CONFIG_ESP32_DEFAULT_PTHREAD_CORE_1 is not set +CONFIG_ESP32_PTHREAD_TASK_CORE_DEFAULT=-1 +CONFIG_ESP32_PTHREAD_TASK_NAME_DEFAULT="pthread" +# end of Deprecated options for backward compatibility diff --git a/ports/espressif/esp-idf-config/sdkconfig-opt.defaults b/ports/espressif/esp-idf-config/sdkconfig-opt.defaults index b24996c0f7..0d0e75af0e 100644 --- a/ports/espressif/esp-idf-config/sdkconfig-opt.defaults +++ b/ports/espressif/esp-idf-config/sdkconfig-opt.defaults @@ -1,10 +1,82 @@ -# No newlines in this file so they are preserved in the board sdkconfig. +# +# Bootloader config +# +CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_SIZE=y +# CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_DEBUG is not set +# CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_PERF is not set +# CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_NONE is not set +# end of Bootloader config + +# CONFIG_COMPILER_OPTIMIZATION_DEFAULT is not set +# +# Compiler options +# +CONFIG_COMPILER_OPTIMIZATION_SIZE=y +# CONFIG_COMPILER_OPTIMIZATION_PERF is not set +# CONFIG_COMPILER_OPTIMIZATION_NONE is not set +# CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_ENABLE is not set +CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_SILENT=y +# CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_DISABLE is not set +CONFIG_COMPILER_OPTIMIZATION_ASSERTION_LEVEL=1 +# CONFIG_COMPILER_OPTIMIZATION_CHECKS_SILENT is not set +# end of Compiler options + +CONFIG_ESP32S3_DEBUG_OCDAWARE=y +# +# Common ESP-related +# # CONFIG_ESP_ERR_TO_NAME_LOOKUP is not set -# CONFIG_ESP_CONSOLE_UART_DEFAULT is not set -# CONFIG_CONSOLE_UART_DEFAULT is not set -CONFIG_ESP_CONSOLE_UART_NONE=y -CONFIG_ESP_CONSOLE_NONE=y -CONFIG_ESP_CONSOLE_UART_NUM=-1 -CONFIG_CONSOLE_UART_NUM=-1 +# end of Common ESP-related + # CONFIG_ESP_SYSTEM_PANIC_PRINT_HALT is not set -CONFIG_ESP_SYSTEM_PANIC_SILENT_REBOOT=y \ No newline at end of file +# +# ESP System Settings +# +# CONFIG_ESP_SYSTEM_PANIC_PRINT_REBOOT is not set +CONFIG_ESP_SYSTEM_PANIC_SILENT_REBOOT=y +# CONFIG_ESP_SYSTEM_PANIC_GDBSTUB is not set +# end of ESP System Settings + +# CONFIG_ESP_CONSOLE_UART_DEFAULT is not set +# CONFIG_ESP_CONSOLE_USB_CDC is not set +# CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG is not set +# CONFIG_ESP_CONSOLE_UART_CUSTOM is not set +CONFIG_ESP_CONSOLE_NONE=y +# CONFIG_ESP_CONSOLE_SECONDARY_NONE is not set +CONFIG_ESP_CONSOLE_SECONDARY_USB_SERIAL_JTAG=y +CONFIG_ESP_CONSOLE_MULTIPLE_UART=y +CONFIG_ESP_CONSOLE_UART_NUM=-1 +# +# FreeRTOS +# +CONFIG_FREERTOS_ASSERT_ON_UNTESTED_FUNCTION=y +CONFIG_FREERTOS_ASSERT_FAIL_ABORT=y +# CONFIG_FREERTOS_ASSERT_FAIL_PRINT_CONTINUE is not set +# CONFIG_FREERTOS_ASSERT_DISABLE is not set +CONFIG_FREERTOS_DEBUG_OCDAWARE=y +# end of FreeRTOS + +CONFIG_HAL_ASSERTION_EQUALS_SYSTEM=y +# +# Hardware Abstraction Layer (HAL) and Low Level (LL) +# +# CONFIG_HAL_ASSERTION_DISABLE is not set +# CONFIG_HAL_ASSERTION_SILIENT is not set +CONFIG_HAL_DEFAULT_ASSERTION_LEVEL=1 +# end of Hardware Abstraction Layer (HAL) and Low Level (LL) + +CONFIG_LWIP_ESP_LWIP_ASSERT=y +# +# Deprecated options for backward compatibility +# +# CONFIG_COMPILER_OPTIMIZATION_LEVEL_DEBUG is not set +CONFIG_COMPILER_OPTIMIZATION_LEVEL_RELEASE=y +# CONFIG_OPTIMIZATION_ASSERTIONS_ENABLED is not set +CONFIG_OPTIMIZATION_ASSERTIONS_SILENT=y +# CONFIG_OPTIMIZATION_ASSERTIONS_DISABLED is not set +CONFIG_OPTIMIZATION_ASSERTION_LEVEL=1 +# CONFIG_CONSOLE_UART_DEFAULT is not set +# CONFIG_CONSOLE_UART_CUSTOM is not set +CONFIG_ESP_CONSOLE_UART_NONE=y +CONFIG_CONSOLE_UART_NUM=-1 +# end of Deprecated options for backward compatibility diff --git a/ports/espressif/esp-idf-config/sdkconfig.defaults b/ports/espressif/esp-idf-config/sdkconfig.defaults index 67e2594339..f4efac4063 100644 --- a/ports/espressif/esp-idf-config/sdkconfig.defaults +++ b/ports/espressif/esp-idf-config/sdkconfig.defaults @@ -1,127 +1,549 @@ # +# Espressif IoT Development Framework (ESP-IDF) Project Configuration +# +CONFIG_IDF_CMAKE=y +# end of Espressif IoT Development Framework (ESP-IDF) Project Configuration + +# CONFIG_SDK_TOOLCHAIN_SUPPORTS_TIME_WIDE_64_BITS is not set +# +# Build type +# +CONFIG_APP_BUILD_TYPE_APP_2NDBOOT=y +# CONFIG_APP_BUILD_TYPE_ELF_RAM is not set +CONFIG_APP_BUILD_GENERATE_BINARIES=y +CONFIG_APP_BUILD_BOOTLOADER=y +CONFIG_APP_BUILD_USE_FLASH_SECTIONS=y +# end of Build type + +CONFIG_APP_COMPILE_TIME_DATE=y +# +# Application manager +# +# CONFIG_APP_EXCLUDE_PROJECT_VER_VAR is not set +# CONFIG_APP_EXCLUDE_PROJECT_NAME_VAR is not set +# CONFIG_APP_PROJECT_VER_FROM_CONFIG is not set +CONFIG_APP_RETRIEVE_LEN_ELF_SHA=16 +# end of Application manager + +# CONFIG_BOOTLOADER_LOG_LEVEL_NONE is not set +# +# Bootloader config +# +# CONFIG_BOOTLOADER_LOG_LEVEL_ERROR is not set +# CONFIG_BOOTLOADER_LOG_LEVEL_WARN is not set +CONFIG_BOOTLOADER_LOG_LEVEL_INFO=y +# CONFIG_BOOTLOADER_LOG_LEVEL_DEBUG is not set +# CONFIG_BOOTLOADER_LOG_LEVEL_VERBOSE is not set +CONFIG_BOOTLOADER_LOG_LEVEL=3 +# CONFIG_BOOTLOADER_VDDSDIO_BOOST_1_8V is not set +CONFIG_BOOTLOADER_VDDSDIO_BOOST_1_9V=y +# CONFIG_BOOTLOADER_FACTORY_RESET is not set +# CONFIG_BOOTLOADER_APP_TEST is not set +CONFIG_BOOTLOADER_WDT_ENABLE=y +# CONFIG_BOOTLOADER_WDT_DISABLE_IN_USER_CODE is not set +CONFIG_BOOTLOADER_WDT_TIME_MS=9000 +# CONFIG_BOOTLOADER_APP_ROLLBACK_ENABLE is not set +# CONFIG_BOOTLOADER_SKIP_VALIDATE_IN_DEEP_SLEEP is not set +# CONFIG_BOOTLOADER_SKIP_VALIDATE_ON_POWER_ON is not set +# CONFIG_BOOTLOADER_SKIP_VALIDATE_ALWAYS is not set +CONFIG_BOOTLOADER_RESERVE_RTC_SIZE=0 +# CONFIG_BOOTLOADER_CUSTOM_RESERVE_RTC is not set +CONFIG_BOOTLOADER_FLASH_XMC_SUPPORT=y +# end of Bootloader config + +CONFIG_SECURE_BOOT_SUPPORTS_RSA=y +# +# Security features +# +CONFIG_SECURE_TARGET_HAS_SECURE_ROM_DL_MODE=y +# CONFIG_SECURE_SIGNED_APPS_NO_SECURE_BOOT is not set +# CONFIG_SECURE_BOOT is not set +# CONFIG_SECURE_FLASH_ENC_ENABLED is not set +# end of Security features + +CONFIG_BOOT_ROM_LOG_ALWAYS_ON=y +# +# Boot ROM Behavior +# +# CONFIG_BOOT_ROM_LOG_ALWAYS_OFF is not set +# CONFIG_BOOT_ROM_LOG_ON_GPIO_HIGH is not set +# CONFIG_BOOT_ROM_LOG_ON_GPIO_LOW is not set +# end of Boot ROM Behavior + +CONFIG_ESPTOOLPY_BAUD_OTHER_VAL=115200 +# # Serial flasher config # +# CONFIG_ESPTOOLPY_NO_STUB is not set +# CONFIG_ESPTOOLPY_OCT_FLASH is not set +# CONFIG_ESPTOOLPY_FLASHMODE_QIO is not set +# CONFIG_ESPTOOLPY_FLASHMODE_QOUT is not set +CONFIG_ESPTOOLPY_FLASHMODE_DIO=y +# CONFIG_ESPTOOLPY_FLASHMODE_DOUT is not set +CONFIG_ESPTOOLPY_FLASH_SAMPLE_MODE_STR=y +CONFIG_ESPTOOLPY_FLASHMODE="dio" +# CONFIG_ESPTOOLPY_FLASHFREQ_120M is not set # CONFIG_ESPTOOLPY_FLASHFREQ_80M is not set CONFIG_ESPTOOLPY_FLASHFREQ_40M=y +# CONFIG_ESPTOOLPY_FLASHFREQ_20M is not set CONFIG_ESPTOOLPY_FLASHFREQ="40m" +CONFIG_ESPTOOLPY_BEFORE_RESET=y +# CONFIG_ESPTOOLPY_BEFORE_NORESET is not set +CONFIG_ESPTOOLPY_BEFORE="default_reset" +CONFIG_ESPTOOLPY_AFTER_RESET=y +# CONFIG_ESPTOOLPY_AFTER_NORESET is not set +CONFIG_ESPTOOLPY_AFTER="hard_reset" +# CONFIG_ESPTOOLPY_MONITOR_BAUD_CONSOLE is not set +# CONFIG_ESPTOOLPY_MONITOR_BAUD_9600B is not set +# CONFIG_ESPTOOLPY_MONITOR_BAUD_57600B is not set +CONFIG_ESPTOOLPY_MONITOR_BAUD_115200B=y +# CONFIG_ESPTOOLPY_MONITOR_BAUD_230400B is not set +# CONFIG_ESPTOOLPY_MONITOR_BAUD_921600B is not set +# CONFIG_ESPTOOLPY_MONITOR_BAUD_2MB is not set +# CONFIG_ESPTOOLPY_MONITOR_BAUD_OTHER is not set +CONFIG_ESPTOOLPY_MONITOR_BAUD_OTHER_VAL=115200 +CONFIG_ESPTOOLPY_MONITOR_BAUD=115200 # end of Serial flasher config +# CONFIG_PARTITION_TABLE_SINGLE_APP is not set # # Partition Table # -# CONFIG_PARTITION_TABLE_SINGLE_APP is not set +# CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE is not set +# CONFIG_PARTITION_TABLE_TWO_OTA is not set CONFIG_PARTITION_TABLE_CUSTOM=y +CONFIG_PARTITION_TABLE_OFFSET=0x8000 +CONFIG_PARTITION_TABLE_MD5=y # end of Partition Table +CONFIG_COMPILER_HIDE_PATHS_MACROS=y # # Compiler options # -# CONFIG_COMPILER_OPTIMIZATION_DEFAULT is not set -CONFIG_COMPILER_OPTIMIZATION_SIZE=y -# CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_ENABLE is not set -CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_SILENT=y +# CONFIG_COMPILER_CXX_EXCEPTIONS is not set +# CONFIG_COMPILER_CXX_RTTI is not set +CONFIG_COMPILER_STACK_CHECK_MODE_NONE=y +# CONFIG_COMPILER_STACK_CHECK_MODE_NORM is not set +# CONFIG_COMPILER_STACK_CHECK_MODE_STRONG is not set +# CONFIG_COMPILER_STACK_CHECK_MODE_ALL is not set +# CONFIG_COMPILER_WARN_WRITE_STRINGS is not set +# CONFIG_COMPILER_DISABLE_GCC8_WARNINGS is not set +# CONFIG_COMPILER_DUMP_RTL_FILES is not set # end of Compiler options +# CONFIG_APPTRACE_DEST_JTAG is not set +# +# Application Level Tracing +# +CONFIG_APPTRACE_DEST_NONE=y +CONFIG_APPTRACE_LOCK_ENABLE=y +# end of Application Level Tracing + +# CONFIG_ADC_FORCE_XPD_FSM is not set +# +# ADC configuration +# +CONFIG_ADC_DISABLE_DAC=y +# end of ADC configuration + +# CONFIG_MCPWM_ISR_IN_IRAM is not set +# +# SPI configuration +# +# CONFIG_SPI_MASTER_IN_IRAM is not set +CONFIG_SPI_MASTER_ISR_IN_IRAM=y +# CONFIG_SPI_SLAVE_IN_IRAM is not set +CONFIG_SPI_SLAVE_ISR_IN_IRAM=y +# end of SPI configuration + +# CONFIG_TWAI_ISR_IN_IRAM is not set +# +# UART configuration +# +# CONFIG_UART_ISR_IN_IRAM is not set +# end of UART configuration + +# CONFIG_GDMA_CTRL_FUNC_IN_IRAM is not set +# +# GDMA Configuration +# +# CONFIG_GDMA_ISR_IRAM_SAFE is not set +# end of GDMA Configuration + +# CONFIG_EFUSE_CUSTOM_TABLE is not set +# +# eFuse Bit Manager +# +# CONFIG_EFUSE_VIRTUAL is not set +CONFIG_EFUSE_MAX_BLK_LEN=256 +# end of eFuse Bit Manager + +CONFIG_ESP_TLS_USING_MBEDTLS=y # # ESP-TLS # +CONFIG_ESP_TLS_USE_DS_PERIPHERAL=y CONFIG_ESP_TLS_SERVER=y +# CONFIG_ESP_TLS_CLIENT_SESSION_TICKETS is not set +# CONFIG_ESP_TLS_SERVER_SESSION_TICKETS is not set +# CONFIG_ESP_TLS_PSK_VERIFICATION is not set +# CONFIG_ESP_TLS_INSECURE is not set # end of ESP-TLS -# -# ESP32S2-specific -# -# CONFIG_ESP32S2_DEFAULT_CPU_FREQ_160 is not set -CONFIG_ESP32S2_DEFAULT_CPU_FREQ_240=y -CONFIG_ESP32S2_DEFAULT_CPU_FREQ_MHZ=240 -# -# Cache config -# -# CONFIG_ESP32S2_INSTRUCTION_CACHE_8KB is not set -CONFIG_ESP32S2_INSTRUCTION_CACHE_16KB=y -# CONFIG_ESP32S2_DATA_CACHE_8KB is not set -CONFIG_ESP32S2_DATA_CACHE_16KB=y -# end of Cache config -# end of ESP32S2-specific - -# -# ESP32S3-specific -# -# CONFIG_ESP32S3_DEFAULT_CPU_FREQ_160 is not set -CONFIG_ESP32S3_DEFAULT_CPU_FREQ_240=y -CONFIG_ESP32S3_DEFAULT_CPU_FREQ_MHZ=240 -# end of ESP32S3-specific - -# -# Common ESP-related -# -CONFIG_ESP_MAIN_TASK_STACK_SIZE=8192 -# CONFIG_ESP_TASK_WDT is not set -# end of Common ESP-related - +# CONFIG_ETH_USE_SPI_ETHERNET is not set # # Ethernet # -# CONFIG_ETH_USE_SPI_ETHERNET is not set +# CONFIG_ETH_USE_OPENETH is not set # end of Ethernet +# CONFIG_ESP_EVENT_LOOP_PROFILING is not set +# +# Event Loop Library +# +CONFIG_ESP_EVENT_POST_FROM_ISR=y +CONFIG_ESP_EVENT_POST_FROM_IRAM_ISR=y +# end of Event Loop Library + +CONFIG_ESP_MAC_ADDR_UNIVERSE_WIFI_STA=y +# +# MAC Config +# +CONFIG_ESP_MAC_ADDR_UNIVERSE_WIFI_AP=y +CONFIG_ESP_MAC_ADDR_UNIVERSE_BT=y +CONFIG_ESP_MAC_ADDR_UNIVERSE_ETH=y +# end of MAC Config + +CONFIG_ESP_SLEEP_RTC_BUS_ISO_WORKAROUND=y +# +# Sleep Config +# +# CONFIG_ESP_SLEEP_PSRAM_LEAKAGE_WORKAROUND is not set +# CONFIG_ESP_SLEEP_FLASH_LEAKAGE_WORKAROUND is not set +# end of Sleep Config + +CONFIG_ESP_IPC_TASK_STACK_SIZE=1536 +# +# IPC (Inter-Processor Call) +# +CONFIG_ESP_IPC_USES_CALLERS_PRIORITY=y +CONFIG_ESP_IPC_ISR_ENABLE=y +# end of IPC (Inter-Processor Call) + +CONFIG_ESP_NETIF_IP_LOST_TIMER_INTERVAL=120 # # ESP NETIF Adapter # +CONFIG_ESP_NETIF_TCPIP_LWIP=y +# CONFIG_ESP_NETIF_LOOPBACK is not set # CONFIG_ESP_NETIF_TCPIP_ADAPTER_COMPATIBLE_LAYER is not set # end of ESP NETIF Adapter +CONFIG_ESP_PHY_CALIBRATION_AND_DATA_STORAGE=y +# +# PHY +# +# CONFIG_ESP_PHY_INIT_DATA_IN_PARTITION is not set +CONFIG_ESP_PHY_MAX_WIFI_TX_POWER=20 +CONFIG_ESP_PHY_MAX_TX_POWER=20 +# end of PHY + +# CONFIG_PM_ENABLE is not set +# +# Power Management +# +CONFIG_PM_POWER_DOWN_CPU_IN_LIGHT_SLEEP=y +CONFIG_PM_POWER_DOWN_TAGMEM_IN_LIGHT_SLEEP=y +# end of Power Management + +# CONFIG_ESP_SYSTEM_GDBSTUB_RUNTIME is not set +# +# ESP System Settings +# +CONFIG_ESP_SYSTEM_RTC_FAST_MEM_AS_HEAP_DEPCHECK=y +CONFIG_ESP_SYSTEM_ALLOW_RTC_FAST_MEM_AS_HEAP=y +# end of ESP System Settings + +CONFIG_ESP_SYSTEM_EVENT_QUEUE_SIZE=32 +CONFIG_ESP_SYSTEM_EVENT_TASK_STACK_SIZE=2304 +CONFIG_ESP_MAIN_TASK_STACK_SIZE=8192 +CONFIG_ESP_MINIMAL_SHARED_STACK_SIZE=2048 +CONFIG_ESP_INT_WDT=y +CONFIG_ESP_INT_WDT_TIMEOUT_MS=300 +CONFIG_ESP_INT_WDT_CHECK_CPU1=y +# CONFIG_ESP_TASK_WDT is not set +# CONFIG_ESP_PANIC_HANDLER_IRAM is not set +CONFIG_ESP_SYSTEM_CHECK_INT_LEVEL_4=y +# +# High resolution timer (esp_timer) +# +# CONFIG_ESP_TIMER_PROFILING is not set +CONFIG_ESP_TIME_FUNCS_USE_RTC_TIMER=y +CONFIG_ESP_TIME_FUNCS_USE_ESP_TIMER=y +CONFIG_ESP_TIMER_TASK_STACK_SIZE=3584 +CONFIG_ESP_TIMER_INTERRUPT_LEVEL=1 +# CONFIG_ESP_TIMER_SUPPORTS_ISR_DISPATCH_METHOD is not set +CONFIG_ESP_TIMER_IMPL_SYSTIMER=y +# end of High resolution timer (esp_timer) + +# CONFIG_ESP_WIFI_SLP_IRAM_OPT is not set # # Wi-Fi # -CONFIG_ESP32_WIFI_STATIC_RX_BUFFER_NUM=4 -CONFIG_ESP32_WIFI_DYNAMIC_RX_BUFFER_NUM=8 -CONFIG_ESP32_WIFI_CACHE_TX_BUFFER_NUM=16 -CONFIG_ESP32_WIFI_DYNAMIC_TX_BUFFER_NUM=16 -# CONFIG_ESP32_WIFI_NVS_ENABLED is not set -# CONFIG_ESP32_WIFI_ENABLE_WPA3_SAE is not set +# CONFIG_ESP_WIFI_FTM_ENABLE is not set +# CONFIG_ESP_WIFI_STA_DISCONNECTED_PM_ENABLE is not set +# CONFIG_ESP_WIFI_GCMP_SUPPORT is not set +# CONFIG_ESP_WIFI_GMAC_SUPPORT is not set +CONFIG_ESP_WIFI_SOFTAP_SUPPORT=y # end of Wi-Fi +# CONFIG_ESP_COREDUMP_ENABLE_TO_FLASH is not set +# +# Core dump +# +# CONFIG_ESP_COREDUMP_ENABLE_TO_UART is not set +CONFIG_ESP_COREDUMP_ENABLE_TO_NONE=y +# end of Core dump + +CONFIG_FREERTOS_NO_AFFINITY=0x7FFFFFFF # # FreeRTOS # +CONFIG_FREERTOS_TICK_SUPPORT_SYSTIMER=y +CONFIG_FREERTOS_CORETIMER_SYSTIMER_LVL1=y +# CONFIG_FREERTOS_CORETIMER_SYSTIMER_LVL3 is not set +CONFIG_FREERTOS_SYSTICK_USES_SYSTIMER=y +CONFIG_FREERTOS_HZ=100 +# CONFIG_FREERTOS_CHECK_STACKOVERFLOW_NONE is not set +# CONFIG_FREERTOS_CHECK_STACKOVERFLOW_PTRVAL is not set +CONFIG_FREERTOS_CHECK_STACKOVERFLOW_CANARY=y +# CONFIG_FREERTOS_WATCHPOINT_END_OF_STACK is not set +CONFIG_FREERTOS_INTERRUPT_BACKTRACE=y +CONFIG_FREERTOS_THREAD_LOCAL_STORAGE_POINTERS=1 CONFIG_FREERTOS_IDLE_TASK_STACKSIZE=1536 +CONFIG_FREERTOS_ISR_STACKSIZE=1536 +# CONFIG_FREERTOS_LEGACY_HOOKS is not set +CONFIG_FREERTOS_MAX_TASK_NAME_LEN=16 +CONFIG_FREERTOS_SUPPORT_STATIC_ALLOCATION=y +# CONFIG_FREERTOS_ENABLE_STATIC_TASK_CLEAN_UP is not set +CONFIG_FREERTOS_TIMER_TASK_PRIORITY=1 +CONFIG_FREERTOS_TIMER_TASK_STACK_DEPTH=2048 +CONFIG_FREERTOS_TIMER_QUEUE_LENGTH=10 +CONFIG_FREERTOS_QUEUE_REGISTRY_SIZE=0 +# CONFIG_FREERTOS_USE_TRACE_FACILITY is not set +# CONFIG_FREERTOS_GENERATE_RUN_TIME_STATS is not set +CONFIG_FREERTOS_CHECK_MUTEX_GIVEN_BY_OWNER=y +# CONFIG_FREERTOS_CHECK_PORT_CRITICAL_COMPLIANCE is not set +# CONFIG_FREERTOS_PLACE_FUNCTIONS_INTO_FLASH is not set +CONFIG_FREERTOS_ENABLE_TASK_SNAPSHOT=y +# CONFIG_FREERTOS_PLACE_SNAPSHOT_FUNS_INTO_FLASH is not set # end of FreeRTOS +CONFIG_HEAP_POISONING_DISABLED=y +# +# Heap memory debugging +# +# CONFIG_HEAP_POISONING_LIGHT is not set +# CONFIG_HEAP_POISONING_COMPREHENSIVE is not set +CONFIG_HEAP_TRACING_OFF=y +# CONFIG_HEAP_TRACING_STANDALONE is not set +# CONFIG_HEAP_TRACING_TOHOST is not set +# CONFIG_HEAP_ABORT_WHEN_ALLOCATION_FAILS is not set +# end of Heap memory debugging + +# CONFIG_LOG_DEFAULT_LEVEL_NONE is not set +# +# Log output +# +# CONFIG_LOG_DEFAULT_LEVEL_ERROR is not set +# CONFIG_LOG_DEFAULT_LEVEL_WARN is not set +CONFIG_LOG_DEFAULT_LEVEL_INFO=y +# CONFIG_LOG_DEFAULT_LEVEL_DEBUG is not set +# CONFIG_LOG_DEFAULT_LEVEL_VERBOSE is not set +CONFIG_LOG_DEFAULT_LEVEL=3 +CONFIG_LOG_MAXIMUM_EQUALS_DEFAULT=y +# CONFIG_LOG_MAXIMUM_LEVEL_DEBUG is not set +# CONFIG_LOG_MAXIMUM_LEVEL_VERBOSE is not set +CONFIG_LOG_MAXIMUM_LEVEL=3 +CONFIG_LOG_COLORS=y +CONFIG_LOG_TIMESTAMP_SOURCE_RTOS=y +# CONFIG_LOG_TIMESTAMP_SOURCE_SYSTEM is not set +# end of Log output + +# CONFIG_LWIP_NETIF_API is not set # # LWIP # +# CONFIG_LWIP_TCPIP_CORE_LOCKING is not set +CONFIG_LWIP_DNS_SUPPORT_MDNS_QUERIES=y +# CONFIG_LWIP_L2_TO_L3_COPY is not set +# CONFIG_LWIP_IRAM_OPTIMIZATION is not set +CONFIG_LWIP_TIMERS_ONDEMAND=y CONFIG_LWIP_MAX_SOCKETS=4 +# CONFIG_LWIP_USE_ONLY_LWIP_SELECT is not set +# CONFIG_LWIP_SO_LINGER is not set +CONFIG_LWIP_SO_REUSE=y +CONFIG_LWIP_SO_REUSE_RXTOALL=y CONFIG_LWIP_SO_RCVBUF=y +# CONFIG_LWIP_NETBUF_RECVINFO is not set +CONFIG_LWIP_IP4_FRAG=y +CONFIG_LWIP_IP6_FRAG=y +# CONFIG_LWIP_IP4_REASSEMBLY is not set +# CONFIG_LWIP_IP6_REASSEMBLY is not set +# CONFIG_LWIP_IP_FORWARD is not set +# CONFIG_LWIP_STATS is not set +# CONFIG_LWIP_ETHARP_TRUST_IP_MAC is not set +CONFIG_LWIP_ESP_GRATUITOUS_ARP=y +CONFIG_LWIP_GARP_TMR_INTERVAL=60 +CONFIG_LWIP_TCPIP_RECVMBOX_SIZE=32 +CONFIG_LWIP_DHCP_DOES_ARP_CHECK=y +# CONFIG_LWIP_DHCP_DISABLE_CLIENT_ID is not set +CONFIG_LWIP_DHCP_DISABLE_VENDOR_CLASS_ID=y +# CONFIG_LWIP_DHCP_RESTORE_LAST_IP is not set +CONFIG_LWIP_DHCP_OPTIONS_LEN=68 +# end of LWIP + +CONFIG_LWIP_DHCPS=y +# +# DHCP server +# +CONFIG_LWIP_DHCPS_LEASE_UNIT=60 +CONFIG_LWIP_DHCPS_MAX_STATION_NUM=8 +# end of DHCP server + +# CONFIG_LWIP_AUTOIP is not set +CONFIG_LWIP_IPV6=y +# CONFIG_LWIP_IPV6_AUTOCONFIG is not set +CONFIG_LWIP_IPV6_NUM_ADDRESSES=3 +# CONFIG_LWIP_IPV6_FORWARD is not set +# CONFIG_LWIP_NETIF_STATUS_CALLBACK is not set +CONFIG_LWIP_NETIF_LOOPBACK=y +CONFIG_LWIP_LOOPBACK_MAX_PBUFS=8 # # TCP # CONFIG_LWIP_MAX_ACTIVE_TCP=4 CONFIG_LWIP_MAX_LISTENING_TCP=4 +CONFIG_LWIP_TCP_HIGH_SPEED_RETRANSMISSION=y +CONFIG_LWIP_TCP_MAXRTX=12 CONFIG_LWIP_TCP_SYNMAXRTX=6 +CONFIG_LWIP_TCP_MSS=1440 +CONFIG_LWIP_TCP_TMR_INTERVAL=250 +CONFIG_LWIP_TCP_MSL=60000 CONFIG_LWIP_TCP_SND_BUF_DEFAULT=2880 CONFIG_LWIP_TCP_WND_DEFAULT=2880 +CONFIG_LWIP_TCP_RECVMBOX_SIZE=6 +CONFIG_LWIP_TCP_QUEUE_OOSEQ=y +# CONFIG_LWIP_TCP_SACK_OUT is not set +# CONFIG_LWIP_TCP_KEEP_CONNECTION_WHEN_IP_CHANGES is not set +CONFIG_LWIP_TCP_OVERSIZE_MSS=y +# CONFIG_LWIP_TCP_OVERSIZE_QUARTER_MSS is not set +# CONFIG_LWIP_TCP_OVERSIZE_DISABLE is not set CONFIG_LWIP_TCP_RTO_TIME=3000 # end of TCP -# end of LWIP +CONFIG_LWIP_MAX_UDP_PCBS=16 +# +# UDP +# +CONFIG_LWIP_UDP_RECVMBOX_SIZE=6 +# end of UDP + +# CONFIG_LWIP_CHECKSUM_CHECK_IP is not set +# +# Checksums +# +# CONFIG_LWIP_CHECKSUM_CHECK_UDP is not set +CONFIG_LWIP_CHECKSUM_CHECK_ICMP=y +# end of Checksums + +CONFIG_LWIP_TCPIP_TASK_STACK_SIZE=3072 +CONFIG_LWIP_TCPIP_TASK_AFFINITY_NO_AFFINITY=y +# CONFIG_LWIP_TCPIP_TASK_AFFINITY_CPU0 is not set +# CONFIG_LWIP_TCPIP_TASK_AFFINITY_CPU1 is not set +CONFIG_LWIP_TCPIP_TASK_AFFINITY=0x7FFFFFFF +# CONFIG_LWIP_PPP_SUPPORT is not set +CONFIG_LWIP_IPV6_MEMP_NUM_ND6_QUEUE=3 +CONFIG_LWIP_IPV6_ND6_NUM_NEIGHBORS=5 +# CONFIG_LWIP_SLIP_SUPPORT is not set +# +# ICMP +# +CONFIG_LWIP_ICMP=y +# CONFIG_LWIP_MULTICAST_PING is not set +# CONFIG_LWIP_BROADCAST_PING is not set +# end of ICMP + +CONFIG_LWIP_MAX_RAW_PCBS=16 +# +# SNTP +# +CONFIG_LWIP_SNTP_MAX_SERVERS=1 +# CONFIG_LWIP_DHCP_GET_NTP_SRV is not set +CONFIG_LWIP_SNTP_UPDATE_DELAY=3600000 +# end of SNTP + +# CONFIG_LWIP_HOOK_TCP_ISN_NONE is not set +# +# Hooks +# +CONFIG_LWIP_HOOK_TCP_ISN_DEFAULT=y +# CONFIG_LWIP_HOOK_TCP_ISN_CUSTOM is not set +CONFIG_LWIP_HOOK_IP6_ROUTE_NONE=y +# CONFIG_LWIP_HOOK_IP6_ROUTE_DEFAULT is not set +# CONFIG_LWIP_HOOK_IP6_ROUTE_CUSTOM is not set +CONFIG_LWIP_HOOK_ND6_GET_GW_NONE=y +# CONFIG_LWIP_HOOK_ND6_GET_GW_DEFAULT is not set +# CONFIG_LWIP_HOOK_ND6_GET_GW_CUSTOM is not set +CONFIG_LWIP_HOOK_NETCONN_EXT_RESOLVE_NONE=y +# CONFIG_LWIP_HOOK_NETCONN_EXT_RESOLVE_DEFAULT is not set +# CONFIG_LWIP_HOOK_NETCONN_EXT_RESOLVE_CUSTOM is not set +# end of Hooks + +# CONFIG_LWIP_DEBUG is not set # # mbedTLS # +CONFIG_MBEDTLS_INTERNAL_MEM_ALLOC=y +# CONFIG_MBEDTLS_DEFAULT_MEM_ALLOC is not set +# CONFIG_MBEDTLS_CUSTOM_MEM_ALLOC is not set +CONFIG_MBEDTLS_ASYMMETRIC_CONTENT_LEN=y +CONFIG_MBEDTLS_SSL_IN_CONTENT_LEN=16384 CONFIG_MBEDTLS_SSL_OUT_CONTENT_LEN=2048 -CONFIG_MBEDTLS_DYNAMIC_BUFFER=y -CONFIG_MBEDTLS_DYNAMIC_FREE_PEER_CERT=y -CONFIG_MBEDTLS_DYNAMIC_FREE_CONFIG_DATA=y -CONFIG_MBEDTLS_DYNAMIC_FREE_CA_CERT=y +# CONFIG_MBEDTLS_DEBUG is not set +# end of mbedTLS + +CONFIG_MBEDTLS_CERTIFICATE_BUNDLE=y # # Certificate Bundle # -CONFIG_MBEDTLS_CERTIFICATE_BUNDLE=y # CONFIG_MBEDTLS_CERTIFICATE_BUNDLE_DEFAULT_FULL is not set +# CONFIG_MBEDTLS_CERTIFICATE_BUNDLE_DEFAULT_CMN is not set CONFIG_MBEDTLS_CERTIFICATE_BUNDLE_DEFAULT_NONE=y CONFIG_MBEDTLS_CUSTOM_CERTIFICATE_BUNDLE=y CONFIG_MBEDTLS_CUSTOM_CERTIFICATE_BUNDLE_PATH="certificates/nina-fw/data/roots.pem" # end of Certificate Bundle + +# CONFIG_MBEDTLS_ECP_RESTARTABLE is not set +# CONFIG_MBEDTLS_CMAC_C is not set +CONFIG_MBEDTLS_HARDWARE_AES=y +CONFIG_MBEDTLS_AES_USE_INTERRUPT=y +CONFIG_MBEDTLS_HARDWARE_MPI=y +CONFIG_MBEDTLS_HARDWARE_SHA=y +CONFIG_MBEDTLS_ROM_MD5=y +# CONFIG_MBEDTLS_ATCA_HW_ECDSA_SIGN is not set +# CONFIG_MBEDTLS_ATCA_HW_ECDSA_VERIFY is not set +CONFIG_MBEDTLS_HAVE_TIME=y +# CONFIG_MBEDTLS_HAVE_TIME_DATE is not set +CONFIG_MBEDTLS_ECDSA_DETERMINISTIC=y +CONFIG_MBEDTLS_SHA512_C=y +CONFIG_MBEDTLS_TLS_SERVER_AND_CLIENT=y +# CONFIG_MBEDTLS_TLS_SERVER_ONLY is not set +# CONFIG_MBEDTLS_TLS_CLIENT_ONLY is not set +# CONFIG_MBEDTLS_TLS_DISABLED is not set +CONFIG_MBEDTLS_TLS_SERVER=y +CONFIG_MBEDTLS_TLS_CLIENT=y +CONFIG_MBEDTLS_TLS_ENABLED=y # # TLS Key Exchange Methods # @@ -130,30 +552,243 @@ CONFIG_MBEDTLS_KEY_EXCHANGE_PSK=y CONFIG_MBEDTLS_KEY_EXCHANGE_DHE_PSK=y CONFIG_MBEDTLS_KEY_EXCHANGE_ECDHE_PSK=y CONFIG_MBEDTLS_KEY_EXCHANGE_RSA_PSK=y +CONFIG_MBEDTLS_KEY_EXCHANGE_RSA=y +CONFIG_MBEDTLS_KEY_EXCHANGE_DHE_RSA=y +CONFIG_MBEDTLS_KEY_EXCHANGE_ELLIPTIC_CURVE=y +CONFIG_MBEDTLS_KEY_EXCHANGE_ECDHE_RSA=y +CONFIG_MBEDTLS_KEY_EXCHANGE_ECDHE_ECDSA=y +CONFIG_MBEDTLS_KEY_EXCHANGE_ECDH_ECDSA=y +CONFIG_MBEDTLS_KEY_EXCHANGE_ECDH_RSA=y # end of TLS Key Exchange Methods + +CONFIG_MBEDTLS_SSL_RENEGOTIATION=y +# CONFIG_MBEDTLS_SSL_PROTO_SSL3 is not set # CONFIG_MBEDTLS_SSL_PROTO_TLS1 is not set # CONFIG_MBEDTLS_SSL_PROTO_TLS1_1 is not set +CONFIG_MBEDTLS_SSL_PROTO_TLS1_2=y +# CONFIG_MBEDTLS_SSL_PROTO_GMTSSL1_1 is not set CONFIG_MBEDTLS_SSL_PROTO_DTLS=y -# CONFIG_MBEDTLS_LARGE_KEY_SOFTWARE_MPI is not set -# end of mbedTLS +CONFIG_MBEDTLS_SSL_ALPN=y +CONFIG_MBEDTLS_CLIENT_SSL_SESSION_TICKETS=y +CONFIG_MBEDTLS_X509_CHECK_KEY_USAGE=y +CONFIG_MBEDTLS_X509_CHECK_EXTENDED_KEY_USAGE=y +CONFIG_MBEDTLS_SERVER_SSL_SESSION_TICKETS=y +# +# Symmetric Ciphers +# +CONFIG_MBEDTLS_AES_C=y +# CONFIG_MBEDTLS_CAMELLIA_C is not set +# CONFIG_MBEDTLS_DES_C is not set +CONFIG_MBEDTLS_RC4_DISABLED=y +# CONFIG_MBEDTLS_RC4_ENABLED_NO_DEFAULT is not set +# CONFIG_MBEDTLS_RC4_ENABLED is not set +# CONFIG_MBEDTLS_BLOWFISH_C is not set +# CONFIG_MBEDTLS_XTEA_C is not set +CONFIG_MBEDTLS_CCM_C=y +CONFIG_MBEDTLS_GCM_C=y +# CONFIG_MBEDTLS_NIST_KW_C is not set +# end of Symmetric Ciphers +# CONFIG_MBEDTLS_RIPEMD160_C is not set +# +# Certificates +# +CONFIG_MBEDTLS_PEM_PARSE_C=y +CONFIG_MBEDTLS_PEM_WRITE_C=y +CONFIG_MBEDTLS_X509_CRL_PARSE_C=y +CONFIG_MBEDTLS_X509_CSR_PARSE_C=y +# end of Certificates + +CONFIG_MBEDTLS_ECP_C=y +CONFIG_MBEDTLS_ECDH_C=y +CONFIG_MBEDTLS_ECDSA_C=y +# CONFIG_MBEDTLS_ECJPAKE_C is not set +CONFIG_MBEDTLS_ECP_DP_SECP192R1_ENABLED=y +CONFIG_MBEDTLS_ECP_DP_SECP224R1_ENABLED=y +CONFIG_MBEDTLS_ECP_DP_SECP256R1_ENABLED=y +CONFIG_MBEDTLS_ECP_DP_SECP384R1_ENABLED=y +CONFIG_MBEDTLS_ECP_DP_SECP521R1_ENABLED=y +CONFIG_MBEDTLS_ECP_DP_SECP192K1_ENABLED=y +CONFIG_MBEDTLS_ECP_DP_SECP224K1_ENABLED=y +CONFIG_MBEDTLS_ECP_DP_SECP256K1_ENABLED=y +CONFIG_MBEDTLS_ECP_DP_BP256R1_ENABLED=y +CONFIG_MBEDTLS_ECP_DP_BP384R1_ENABLED=y +CONFIG_MBEDTLS_ECP_DP_BP512R1_ENABLED=y +CONFIG_MBEDTLS_ECP_DP_CURVE25519_ENABLED=y +CONFIG_MBEDTLS_ECP_NIST_OPTIM=y +# CONFIG_MBEDTLS_POLY1305_C is not set +# CONFIG_MBEDTLS_CHACHA20_C is not set +# CONFIG_MBEDTLS_HKDF_C is not set +# CONFIG_MBEDTLS_THREADING_C is not set +# CONFIG_MBEDTLS_LARGE_KEY_SOFTWARE_MPI is not set +# CONFIG_MBEDTLS_SECURITY_RISKS is not set +# +# Newlib +# +CONFIG_NEWLIB_STDOUT_LINE_ENDING_CRLF=y +# CONFIG_NEWLIB_STDOUT_LINE_ENDING_LF is not set +# CONFIG_NEWLIB_STDOUT_LINE_ENDING_CR is not set +# CONFIG_NEWLIB_STDIN_LINE_ENDING_CRLF is not set +# CONFIG_NEWLIB_STDIN_LINE_ENDING_LF is not set +CONFIG_NEWLIB_STDIN_LINE_ENDING_CR=y +# CONFIG_NEWLIB_NANO_FORMAT is not set +# end of Newlib + +# CONFIG_OPENTHREAD_ENABLED is not set +# +# PThreads +# +CONFIG_PTHREAD_TASK_PRIO_DEFAULT=5 +CONFIG_PTHREAD_TASK_STACK_SIZE_DEFAULT=3072 +CONFIG_PTHREAD_STACK_MIN=768 +CONFIG_PTHREAD_DEFAULT_CORE_NO_AFFINITY=y +# CONFIG_PTHREAD_DEFAULT_CORE_0 is not set +# CONFIG_PTHREAD_DEFAULT_CORE_1 is not set +CONFIG_PTHREAD_TASK_CORE_DEFAULT=-1 +CONFIG_PTHREAD_TASK_NAME_DEFAULT="pthread" +# end of PThreads + +# CONFIG_SPI_FLASH_VERIFY_WRITE is not set # # SPI Flash driver # +# CONFIG_SPI_FLASH_ENABLE_COUNTERS is not set +CONFIG_SPI_FLASH_ROM_DRIVER_PATCH=y +# CONFIG_SPI_FLASH_ROM_IMPL is not set +CONFIG_SPI_FLASH_DANGEROUS_WRITE_ABORTS=y +# CONFIG_SPI_FLASH_DANGEROUS_WRITE_FAILS is not set +# CONFIG_SPI_FLASH_DANGEROUS_WRITE_ALLOWED is not set +# CONFIG_SPI_FLASH_USE_LEGACY_IMPL is not set +# CONFIG_SPI_FLASH_SHARE_SPI1_BUS is not set +# CONFIG_SPI_FLASH_BYPASS_BLOCK_ERASE is not set # CONFIG_SPI_FLASH_YIELD_DURING_ERASE is not set CONFIG_SPI_FLASH_WRITE_CHUNK_SIZE=4096 +# CONFIG_SPI_FLASH_SIZE_OVERRIDE is not set +# CONFIG_SPI_FLASH_CHECK_ERASE_TIMEOUT_DISABLED is not set +# CONFIG_SPI_FLASH_OVERRIDE_CHIP_DRIVER_LIST is not set # end of SPI Flash driver +CONFIG_SPI_FLASH_SUPPORT_ISSI_CHIP=y +# +# Auto-detect flash chips +# +CONFIG_SPI_FLASH_SUPPORT_MXIC_CHIP=y +CONFIG_SPI_FLASH_SUPPORT_GD_CHIP=y +CONFIG_SPI_FLASH_SUPPORT_WINBOND_CHIP=y +CONFIG_SPI_FLASH_SUPPORT_BOYA_CHIP=y +CONFIG_SPI_FLASH_SUPPORT_MXIC_OPI_CHIP=y +# end of Auto-detect flash chips + +CONFIG_SPI_FLASH_ENABLE_ENCRYPTED_READ_WRITE=y +# +# Virtual file system +# +CONFIG_VFS_SUPPORT_IO=y +CONFIG_VFS_SUPPORT_DIR=y +CONFIG_VFS_SUPPORT_SELECT=y +CONFIG_VFS_SUPPRESS_SELECT_DEBUG_OUTPUT=y +CONFIG_VFS_SUPPORT_TERMIOS=y +# end of Virtual file system + +CONFIG_VFS_SEMIHOSTFS_MAX_MOUNT_POINTS=1 +# +# Host File System I/O (Semihosting) +# +CONFIG_VFS_SEMIHOSTFS_HOST_PATH_MAX_LEN=128 +# end of Host File System I/O (Semihosting) + +CONFIG_WPA_MBEDTLS_CRYPTO=y +# +# Supplicant +# +# CONFIG_WPA_WAPI_PSK is not set +# CONFIG_WPA_SUITE_B_192 is not set +# CONFIG_WPA_DEBUG_PRINT is not set +# CONFIG_WPA_TESTING_OPTIONS is not set +# CONFIG_WPA_WPS_STRICT is not set +# CONFIG_WPA_11KV_SUPPORT is not set +# end of Supplicant + +# CONFIG_LEGACY_INCLUDE_COMMON_HEADERS is not set # # Deprecated options for backward compatibility # -# CONFIG_COMPILER_OPTIMIZATION_LEVEL_DEBUG is not set -CONFIG_COMPILER_OPTIMIZATION_LEVEL_RELEASE=y -# CONFIG_OPTIMIZATION_ASSERTIONS_ENABLED is not set -CONFIG_OPTIMIZATION_ASSERTIONS_SILENT=y +# CONFIG_LOG_BOOTLOADER_LEVEL_NONE is not set +# CONFIG_LOG_BOOTLOADER_LEVEL_ERROR is not set +# CONFIG_LOG_BOOTLOADER_LEVEL_WARN is not set +CONFIG_LOG_BOOTLOADER_LEVEL_INFO=y +# CONFIG_LOG_BOOTLOADER_LEVEL_DEBUG is not set +# CONFIG_LOG_BOOTLOADER_LEVEL_VERBOSE is not set +CONFIG_LOG_BOOTLOADER_LEVEL=3 +# CONFIG_APP_ROLLBACK_ENABLE is not set +# CONFIG_FLASH_ENCRYPTION_ENABLED is not set +# CONFIG_FLASHMODE_QIO is not set +# CONFIG_FLASHMODE_QOUT is not set +CONFIG_FLASHMODE_DIO=y +# CONFIG_FLASHMODE_DOUT is not set +# CONFIG_MONITOR_BAUD_9600B is not set +# CONFIG_MONITOR_BAUD_57600B is not set +CONFIG_MONITOR_BAUD_115200B=y +# CONFIG_MONITOR_BAUD_230400B is not set +# CONFIG_MONITOR_BAUD_921600B is not set +# CONFIG_MONITOR_BAUD_2MB is not set +# CONFIG_MONITOR_BAUD_OTHER is not set +CONFIG_MONITOR_BAUD_OTHER_VAL=115200 +CONFIG_MONITOR_BAUD=115200 +# CONFIG_CXX_EXCEPTIONS is not set +CONFIG_STACK_CHECK_NONE=y +# CONFIG_STACK_CHECK_NORM is not set +# CONFIG_STACK_CHECK_STRONG is not set +# CONFIG_STACK_CHECK_ALL is not set +# CONFIG_WARN_WRITE_STRINGS is not set +# CONFIG_DISABLE_GCC8_WARNINGS is not set +CONFIG_ADC2_DISABLE_DAC=y +# CONFIG_EVENT_LOOP_PROFILING is not set +CONFIG_POST_EVENTS_FROM_ISR=y +CONFIG_POST_EVENTS_FROM_IRAM_ISR=y +CONFIG_IPC_TASK_STACK_SIZE=1536 +CONFIG_ESP_SYSTEM_PM_POWER_DOWN_CPU=y +CONFIG_SYSTEM_EVENT_QUEUE_SIZE=32 +CONFIG_SYSTEM_EVENT_TASK_STACK_SIZE=2304 CONFIG_MAIN_TASK_STACK_SIZE=8192 +CONFIG_INT_WDT=y +CONFIG_INT_WDT_TIMEOUT_MS=300 +CONFIG_INT_WDT_CHECK_CPU1=y # CONFIG_TASK_WDT is not set +CONFIG_TIMER_TASK_STACK_SIZE=3584 +# CONFIG_ENABLE_STATIC_TASK_CLEAN_UP_HOOK is not set +CONFIG_TIMER_TASK_PRIORITY=1 +CONFIG_TIMER_TASK_STACK_DEPTH=2048 +CONFIG_TIMER_QUEUE_LENGTH=10 +# CONFIG_L2_TO_L3_COPY is not set +# CONFIG_USE_ONLY_LWIP_SELECT is not set +CONFIG_ESP_GRATUITOUS_ARP=y +CONFIG_GARP_TMR_INTERVAL=60 +CONFIG_TCPIP_RECVMBOX_SIZE=32 +CONFIG_TCP_MAXRTX=12 CONFIG_TCP_SYNMAXRTX=6 +CONFIG_TCP_MSS=1440 +CONFIG_TCP_MSL=60000 CONFIG_TCP_SND_BUF_DEFAULT=2880 CONFIG_TCP_WND_DEFAULT=2880 -# End of deprecated options +CONFIG_TCP_RECVMBOX_SIZE=6 +CONFIG_TCP_QUEUE_OOSEQ=y +# CONFIG_ESP_TCP_KEEP_CONNECTION_WHEN_IP_CHANGES is not set +CONFIG_TCP_OVERSIZE_MSS=y +# CONFIG_TCP_OVERSIZE_QUARTER_MSS is not set +# CONFIG_TCP_OVERSIZE_DISABLE is not set +CONFIG_UDP_RECVMBOX_SIZE=6 +CONFIG_TCPIP_TASK_STACK_SIZE=3072 +CONFIG_TCPIP_TASK_AFFINITY_NO_AFFINITY=y +# CONFIG_TCPIP_TASK_AFFINITY_CPU0 is not set +# CONFIG_TCPIP_TASK_AFFINITY_CPU1 is not set +CONFIG_TCPIP_TASK_AFFINITY=0x7FFFFFFF +# CONFIG_PPP_SUPPORT is not set +CONFIG_SPI_FLASH_WRITING_DANGEROUS_REGIONS_ABORTS=y +# CONFIG_SPI_FLASH_WRITING_DANGEROUS_REGIONS_FAILS is not set +# CONFIG_SPI_FLASH_WRITING_DANGEROUS_REGIONS_ALLOWED is not set +CONFIG_SUPPRESS_SELECT_DEBUG_OUTPUT=y +CONFIG_SUPPORT_TERMIOS=y +CONFIG_SEMIHOSTFS_MAX_MOUNT_POINTS=1 +CONFIG_SEMIHOSTFS_HOST_PATH_MAX_LEN=128 +# end of Deprecated options for backward compatibility diff --git a/ports/espressif/tools/generate_all_sdkconfig.py b/ports/espressif/tools/generate_all_sdkconfig.py new file mode 100644 index 0000000000..a3589c34bb --- /dev/null +++ b/ports/espressif/tools/generate_all_sdkconfig.py @@ -0,0 +1,25 @@ +import pathlib +import sys +import shlex +import shutil +import subprocess + +output_dir = pathlib.Path(sys.argv[-1]) +output_dir.mkdir(parents=True, exist_ok=True) + + +def run(cmd): + subprocess.run(shlex.split(cmd), capture_output=True) + + +for board in pathlib.Path("boards/").glob("*/"): + board = board.name + print(board) + run(f"make BOARD={board} DEBUG=1 build-{board}/esp-idf/config/sdkconfig.h") + shutil.copyfile(f"build-{board}/esp-idf/sdkconfig", output_dir / (board + "-debug.sdkconfig")) + # run(f"python tools/update_sdkconfig.py --board={board} --update_all --debug=1") + run(f"make BOARD={board} DEBUG=1 clean") + run(f"make BOARD={board} build-{board}/esp-idf/config/sdkconfig.h") + shutil.copyfile(f"build-{board}/esp-idf/sdkconfig", output_dir / (board + "-opt.sdkconfig")) + # run(f"python tools/update_sdkconfig.py --board={board} --update_all") + run(f"make BOARD={board} clean") diff --git a/ports/espressif/tools/update_sdkconfig.py b/ports/espressif/tools/update_sdkconfig.py new file mode 100644 index 0000000000..4b6114336e --- /dev/null +++ b/ports/espressif/tools/update_sdkconfig.py @@ -0,0 +1,180 @@ +"""This script updates the sdkconfigs based on the menuconfig results in a given + build.""" + +import pathlib +import click + +OPT_SETTINGS = [ + "CONFIG_ESP_ERR_TO_NAME_LOOKUP", + "CONFIG_ESP_CONSOLE_", + "CONFIG_CONSOLE_UART_", + "CONFIG_ESP_SYSTEM_PANIC_", + "COMPILER_OPTIMIZATION_", + "CONFIG_ESP32S3_DEBUG_OCDAWARE", + "CONFIG_FREERTOS_ASSERT_", + "CONFIG_FREERTOS_DEBUG_OCDAWARE", + "CONFIG_FREERTOS_TASK_FUNCTION_WRAPPER", + "CONFIG_HAL_ASSERTION_", + "CONFIG_LWIP_ESP_LWIP_ASSERT", + "CONFIG_OPTIMIZATION_ASSERTION_LEVEL", + "CONFIG_OPTIMIZATION_ASSERTIONS_", + "CONFIG_HAL_DEFAULT_ASSERTION_LEVEL", +] + +TARGET_SETTINGS = [ + "CONFIG_IDF_TARGET", + "CONFIG_IDF_FIRMWARE_CHIP_ID", + "CONFIG_BOOTLOADER_OFFSET_IN_FLASH", + "CONFIG_ESP32_", + "CONFIG_ESP32C3_", + "CONFIG_ESP32S2_", + "CONFIG_ESP32S3_", + "CONFIG_ESP32H2_", + "CONFIG_ESP_SLEEP_POWER_DOWN_FLASH", + "CONFIG_ESP_SYSTEM_SINGLE_CORE_MODE", + "CONFIG_ESP_SYSTEM_MEMPROT_", + "CONFIG_ESP_MAIN_TASK_AFFINITY", + "CONFIG_ESP_WIFI_EXTERNAL_COEXIST_ENABLE", + "CONFIG_FREERTOS_UNICORE", + "CONFIG_FREERTOS_TICK_SUPPORT_CORETIMER", + "CONFIG_FREERTOS_CORETIMER_0", + "CONFIG_FREERTOS_CORETIMER_1", + "CONFIG_FREERTOS_SYSTICK_USES_CCOUNT", + "CONFIG_FREERTOS_OPTIMIZED_SCHEDULER", + "CONFIG_MBEDTLS_HARDWARE_GCM", + "CONFIG_ESP_SYSTEM_PD_FLASH", + "CONFIG_EXTERNAL_COEX_ENABLE", + "CONFIG_SDK_TOOLPREFIX", + "CONFIG_TOOLPREFIX", + "ESP_SLEEP_GPIO_RESET_WORKAROUND", +] + +BOARD_SETTINGS = [ + "PSRAM clock and cs IO for ESP32S3", + "CONFIG_SPIRAM", + "CONFIG_DEFAULT_PSRAM_", + "_SPIRAM_SUPPORT", + "CONFIG_LWIP_LOCAL_HOSTNAME", +] + +FLASH_SETTINGS = [ + "CONFIG_ESPTOOLPY_FLASHSIZE", + "CONFIG_PARTITION_TABLE_CUSTOM_FILENAME", + "CONFIG_PARTITION_TABLE_FILENAME", +] + +# boards/lilygo_ttgo_t8_s2_st7789/sdkconfig +# CONFIG_LWIP_DNS_SUPPORT_MDNS_QUERIES=y + +# boards/morpheans_morphesp-240/sdkconfig +# CONFIG_LWIP_DNS_SUPPORT_MDNS_QUERIES=y + + +def matches_group(line, group): + for setting in group: + if setting in line: + return True + return False + + +def add_group(lines, last_group, current_group): + if last_group != current_group: + if last_group: + lines.append("# end of " + last_group) + lines.append("") + return None + if current_group: + lines.append("#") + lines.append("# " + current_group) + lines.append("#") + return current_group + return last_group + + +@click.command() +@click.option("--debug") +@click.option("--board") +@click.option( + "--update_all", + is_flag=True, + default=False, + help="Updates the sdkconfigs outside of the board directory.", +) +def update(debug, board, update_all): + """Simple program that greets NAME for a total of COUNT times.""" + + board_make = pathlib.Path(f"boards/{board}/mpconfigboard.mk") + for line in board_make.read_text().split("\n"): + if line.startswith("IDF_TARGET"): + target = line.split("=")[1].strip() + elif line.startswith("CIRCUITPY_ESP_FLASH_SIZE"): + flash = line.split("=")[1].strip() + + input_config = pathlib.Path(f"build-{board}/esp-idf/sdkconfig") + default_config = pathlib.Path("esp-idf-config/sdkconfig.defaults") + if debug: + opt_config = pathlib.Path("esp-idf-config/sdkconfig-debug.defaults") + else: + opt_config = pathlib.Path("esp-idf-config/sdkconfig-opt.defaults") + flash_config = pathlib.Path(f"esp-idf-config/sdkconfig-{flash}.defaults") + target_config = pathlib.Path(f"esp-idf-config/sdkconfig-{target}.defaults") + board_config = pathlib.Path(f"boards/{board}/sdkconfig") + + defaults = default_config.read_text().split("\n") + defaults.extend(opt_config.read_text().split("\n")) + defaults.extend(flash_config.read_text().split("\n")) + defaults.extend(target_config.read_text().split("\n")) + + board_settings = [] + last_board_group = None + flash_settings = [] + last_flash_group = None + opt_settings = [] + last_opt_group = None + target_settings = [] + last_target_group = None + default_settings = [] + last_default_group = None + current_group = None + for line in input_config.read_text().split("\n"): + if line.startswith("# ") and "CONFIG_" not in line and len(line) > 3: + if line.startswith("# end of"): + current_group = None + else: + current_group = line[2:] + + if (not update_all and line not in defaults) or ( + update_all and matches_group(line, BOARD_SETTINGS) + ): + last_board_group = add_group(board_settings, last_board_group, current_group) + board_settings.append(line) + elif update_all: + if matches_group(line, OPT_SETTINGS): + last_opt_group = add_group(opt_settings, last_opt_group, current_group) + opt_settings.append(line) + elif matches_group(line, FLASH_SETTINGS): + last_flash_group = add_group(flash_settings, last_flash_group, current_group) + flash_settings.append(line) + elif matches_group(line, TARGET_SETTINGS): + last_target_group = add_group(target_settings, last_target_group, current_group) + target_settings.append(line) + elif "CONFIG_" in line: + last_default_group = add_group(default_settings, last_default_group, current_group) + default_settings.append(line) + + add_group(board_settings, last_board_group, current_group) + add_group(opt_settings, last_opt_group, current_group) + add_group(flash_settings, last_flash_group, current_group) + add_group(target_settings, last_target_group, current_group) + add_group(default_settings, last_default_group, current_group) + + board_config.write_text("\n".join(board_settings)) + if update_all: + flash_config.write_text("\n".join(flash_settings)) + opt_config.write_text("\n".join(opt_settings)) + default_config.write_text("\n".join(default_settings)) + target_config.write_text("\n".join(target_settings)) + + +if __name__ == "__main__": + update() From 869cf5eba59d084f4cf484fa9ad3bf48cdd28574 Mon Sep 17 00:00:00 2001 From: Scott Shawcroft Date: Wed, 12 Jan 2022 14:55:22 -0800 Subject: [PATCH 12/27] Run USB on the same core as CP --- ports/espressif/Makefile | 8 +++++--- ports/espressif/supervisor/usb.c | 7 +++++-- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ports/espressif/Makefile b/ports/espressif/Makefile index 825663d87b..36d4726ddf 100644 --- a/ports/espressif/Makefile +++ b/ports/espressif/Makefile @@ -289,6 +289,7 @@ IDF_PATH = $(realpath ./esp-idf) $(BUILD)/esp-idf: $(Q)$(MKDIR) -p $@ +TARGET_SDKCONFIG = esp-idf-config/sdkconfig-$(IDF_TARGET).defaults FLASH_SDKCONFIG = esp-idf-config/sdkconfig-$(CIRCUITPY_ESP_FLASH_SIZE).defaults ifeq ($(DEBUG), 1) DEBUG_SDKCONFIG = esp-idf-config/sdkconfig-debug.defaults @@ -317,10 +318,11 @@ $(BUILD)/esp-idf/partition_table/partition-table.bin: $(BUILD)/esp-idf/config/sd IDF_PATH=$(IDF_PATH) ninja -C $(BUILD)/esp-idf partition_table/partition-table.bin # run menuconfig and then remove standard settings -menuconfig: $(BUILD)/esp-idf/config +menuconfig: $(BUILD)/esp-idf/config $(BUILD)/esp-idf/config/sdkconfig.h $(Q)ninja -C $(BUILD)/esp-idf menuconfig - $(Q)diff --old-line-format= --unchanged-line-format= esp-idf-config/sdkconfig.defaults $(BUILD)/esp-idf/sdkconfig > $(BUILD)/sdkconfig.diff || true - $(Q)grep -Fvxf $(DEBUG_SDKCONFIG) -f $(FLASH_SDKCONFIG) $(BUILD)/sdkconfig.diff > boards/$(BOARD)/sdkconfig + # Newer versions of the idf will have save-defconfig that will only include non-default values. + # We should use that when available. For now, we sort out everything. + python tools/update_sdkconfig.py --board=$(BOARD) --debug=$(DEBUG) # qstr builds include headers so we need to make sure they are up to date $(HEADER_BUILD)/qstr.split: | $(BUILD)/esp-idf/config/sdkconfig.h diff --git a/ports/espressif/supervisor/usb.c b/ports/espressif/supervisor/usb.c index 7be3e84536..30f9be82a3 100644 --- a/ports/espressif/supervisor/usb.c +++ b/ports/espressif/supervisor/usb.c @@ -109,13 +109,16 @@ void init_usb_hardware(void) { usb_hal_init(&hal); configure_pins(&hal); - (void)xTaskCreateStatic(usb_device_task, + // Pin the USB task to the same core as CircuitPython. This way we leave + // the other core for networking. + (void)xTaskCreateStaticPinnedToCore(usb_device_task, "usbd", USBD_STACK_SIZE, NULL, 5, usb_device_stack, - &usb_device_taskdef); + &usb_device_taskdef, + xPortGetCoreID()); } /** From c87d9c947bb12db9f2664199154ca8f1668a7e94 Mon Sep 17 00:00:00 2001 From: Jeff Epler Date: Fri, 14 Jan 2022 08:53:24 -0600 Subject: [PATCH 13/27] patch esp-idf for i2c crash In theory, this Closes: #5680 -- I didn't test it on HW yet. --- .gitmodules | 2 +- ports/espressif/esp-idf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index 9376daebdc..89fbf6b263 100644 --- a/.gitmodules +++ b/.gitmodules @@ -148,7 +148,7 @@ url = https://github.com/adafruit/Adafruit_CircuitPython_RFM69.git [submodule "ports/espressif/esp-idf"] path = ports/espressif/esp-idf - url = https://github.com/espressif/esp-idf.git + url = https://github.com/adafruit/esp-idf.git branch = release/v4.4 [submodule "ports/espressif/certificates/nina-fw"] path = ports/espressif/certificates/nina-fw diff --git a/ports/espressif/esp-idf b/ports/espressif/esp-idf index 214d62b9ad..2f5ecfd41b 160000 --- a/ports/espressif/esp-idf +++ b/ports/espressif/esp-idf @@ -1 +1 @@ -Subproject commit 214d62b9ad859318520e38870c828278c2caee2a +Subproject commit 2f5ecfd41b4637dc8d9da6452f9e78824a64a20a From ae8284d2681a2f82812ae4cfb6e3b4cce354c518 Mon Sep 17 00:00:00 2001 From: Kattni Rembor Date: Fri, 14 Jan 2022 11:46:48 -0500 Subject: [PATCH 14/27] Update submodule instructions. --- BUILDING.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/BUILDING.md b/BUILDING.md index f7598dced1..fc7b116595 100644 --- a/BUILDING.md +++ b/BUILDING.md @@ -15,7 +15,7 @@ https://learn.adafruit.com/building-circuitpython/ ## Setup -Please ensure you setup your build environment appropriately, as per the guide. You will need: +Please ensure you set up your build environment appropriately, as per the guide. You will need: * Linux: https://learn.adafruit.com/building-circuitpython/linux * MacOS: https://learn.adafruit.com/building-circuitpython/macos @@ -25,8 +25,9 @@ Please ensure you setup your build environment appropriately, as per the guide. This project has a bunch of git submodules. You will need to update them regularly. - git submodule sync - git submodule update --init +In the root folder of the CircuitPython repository, execute the following: + + make fetch-submodules ### Required Python Packages From d54e5c86735ce316a9b8cd9055a4037874c04d3c Mon Sep 17 00:00:00 2001 From: Alec Delaney Date: Fri, 14 Jan 2022 13:26:57 -0500 Subject: [PATCH 15/27] Add breadcrumbs.html to prevent "Edit on Github" link --- docs/templates/breadcrumbs.html | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 docs/templates/breadcrumbs.html diff --git a/docs/templates/breadcrumbs.html b/docs/templates/breadcrumbs.html new file mode 100644 index 0000000000..339f008b94 --- /dev/null +++ b/docs/templates/breadcrumbs.html @@ -0,0 +1,4 @@ +{%- extends "sphinx_rtd_theme/breadcrumbs.html" %} + +{% block breadcrumbs_aside %} +{% endblock %} \ No newline at end of file From 5d6ef60fb4509a09e6012052d930475050cea47b Mon Sep 17 00:00:00 2001 From: Alec Delaney Date: Fri, 14 Jan 2022 13:29:13 -0500 Subject: [PATCH 16/27] Add newline at end of breadcrumbs.html --- docs/templates/breadcrumbs.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/templates/breadcrumbs.html b/docs/templates/breadcrumbs.html index 339f008b94..4ecb013f86 100644 --- a/docs/templates/breadcrumbs.html +++ b/docs/templates/breadcrumbs.html @@ -1,4 +1,4 @@ {%- extends "sphinx_rtd_theme/breadcrumbs.html" %} {% block breadcrumbs_aside %} -{% endblock %} \ No newline at end of file +{% endblock %} From 993e51e5cc0a74bc232c05f9089c2d04886fecf6 Mon Sep 17 00:00:00 2001 From: Scott Shawcroft Date: Fri, 14 Jan 2022 11:52:14 -0800 Subject: [PATCH 17/27] Fix USB when enabling wifi --- ports/espressif/esp-idf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/espressif/esp-idf b/ports/espressif/esp-idf index 2f5ecfd41b..6db2ebd789 160000 --- a/ports/espressif/esp-idf +++ b/ports/espressif/esp-idf @@ -1 +1 @@ -Subproject commit 2f5ecfd41b4637dc8d9da6452f9e78824a64a20a +Subproject commit 6db2ebd7897be544ad0f169871db4b13b4c0941e From af353c9b59df0a9810c38f5bb6b444451ec305ad Mon Sep 17 00:00:00 2001 From: Jeff Epler Date: Fri, 14 Jan 2022 14:15:51 -0600 Subject: [PATCH 18/27] update to ulab 4.0.0 --- extmod/ulab | 2 +- locale/circuitpython.pot | 68 +++++++++++++++++++++++++++++++--------- py/circuitpy_mpconfig.h | 4 +++ 3 files changed, 59 insertions(+), 15 deletions(-) diff --git a/extmod/ulab b/extmod/ulab index a99e0b9878..0c7c6b88f3 160000 --- a/extmod/ulab +++ b/extmod/ulab @@ -1 +1 @@ -Subproject commit a99e0b98787266369eaa33bdae271de761eca05b +Subproject commit 0c7c6b88f3ec1b1d11d2f7d8b185e28ac657c06d diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot index 4a90a1437d..121eac2049 100644 --- a/locale/circuitpython.pot +++ b/locale/circuitpython.pot @@ -2624,7 +2624,7 @@ msgstr "" msgid "attributes not supported yet" msgstr "" -#: extmod/ulab/code/numpy/numerical.c +#: extmod/ulab/code/ulab_tools.c msgid "axis is out of bounds" msgstr "" @@ -2680,11 +2680,11 @@ msgstr "" msgid "branch not in range" msgstr "" -#: extmod/ulab/code/ulab_create.c extmod/ulab/code/utils/utils.c +#: extmod/ulab/code/numpy/create.c extmod/ulab/code/utils/utils.c msgid "buffer is smaller than requested size" msgstr "" -#: extmod/ulab/code/ulab_create.c extmod/ulab/code/utils/utils.c +#: extmod/ulab/code/numpy/create.c extmod/ulab/code/utils/utils.c msgid "buffer size must be a multiple of element size" msgstr "" @@ -2776,6 +2776,10 @@ msgstr "" msgid "can't convert '%q' object to %q implicitly" msgstr "" +#: extmod/ulab/code/numpy/vector.c +msgid "can't convert complex to float" +msgstr "" + #: py/obj.c msgid "can't convert to %q" msgstr "" @@ -2870,6 +2874,14 @@ msgstr "" msgid "cannot cast output with casting rule" msgstr "" +#: extmod/ulab/code/ndarray.c +msgid "cannot convert complex to dtype" +msgstr "" + +#: extmod/ulab/code/ndarray.c +msgid "cannot convert complex type" +msgstr "" + #: py/objtype.c msgid "cannot create '%q' instances" msgstr "" @@ -3061,6 +3073,10 @@ msgstr "" msgid "divisor must be 4" msgstr "" +#: extmod/ulab/code/numpy/vector.c +msgid "dtype must be float, or complex" +msgstr "" + #: py/objdeque.c msgid "empty" msgstr "" @@ -3164,7 +3180,7 @@ msgstr "" msgid "first argument must be a function" msgstr "" -#: extmod/ulab/code/ulab_create.c +#: extmod/ulab/code/numpy/create.c msgid "first argument must be a tuple of ndarrays" msgstr "" @@ -3229,6 +3245,10 @@ msgstr "" msgid "function is defined for ndarrays only" msgstr "" +#: extmod/ulab/code/numpy/carray/carray.c +msgid "function is implemented for ndarrays only" +msgstr "" + #: py/argcheck.c #, c-format msgid "function missing %d required positional arguments" @@ -3342,7 +3362,7 @@ msgstr "" msgid "input and output shapes are not compatible" msgstr "" -#: extmod/ulab/code/ulab_create.c +#: extmod/ulab/code/numpy/create.c msgid "input argument must be an integer, a tuple, or a list" msgstr "" @@ -3350,7 +3370,7 @@ msgstr "" msgid "input array length must be power of 2" msgstr "" -#: extmod/ulab/code/ulab_create.c +#: extmod/ulab/code/numpy/create.c msgid "input arrays are not compatible" msgstr "" @@ -3358,6 +3378,10 @@ msgstr "" msgid "input data must be an iterable" msgstr "" +#: extmod/ulab/code/numpy/vector.c +msgid "input dtype must be float or complex" +msgstr "" + #: extmod/ulab/code/numpy/linalg/linalg.c msgid "input matrix is asymmetric" msgstr "" @@ -3367,18 +3391,26 @@ msgstr "" msgid "input matrix is singular" msgstr "" +#: extmod/ulab/code/numpy/carray/carray.c +msgid "input must be a 1D ndarray" +msgstr "" + #: extmod/ulab/code/scipy/linalg/linalg.c extmod/ulab/code/user/user.c msgid "input must be a dense ndarray" msgstr "" -#: extmod/ulab/code/ulab_create.c +#: extmod/ulab/code/numpy/create.c msgid "input must be a tensor of rank 2" msgstr "" -#: extmod/ulab/code/ulab_create.c extmod/ulab/code/user/user.c +#: extmod/ulab/code/numpy/create.c extmod/ulab/code/user/user.c msgid "input must be an ndarray" msgstr "" +#: extmod/ulab/code/numpy/carray/carray.c +msgid "input must be an ndarray, or a scalar" +msgstr "" + #: extmod/ulab/code/scipy/signal/signal.c msgid "input must be one-dimensional" msgstr "" @@ -3749,7 +3781,11 @@ msgstr "" msgid "not enough arguments for format string" msgstr "" -#: extmod/ulab/code/ulab_create.c +#: extmod/ulab/code/numpy/carray/carray_tools.c +msgid "not implemented for complex dtype" +msgstr "" + +#: extmod/ulab/code/numpy/create.c msgid "number of points must be at least 2" msgstr "" @@ -3807,7 +3843,7 @@ msgstr "" msgid "odd-length string" msgstr "" -#: extmod/ulab/code/ulab_create.c extmod/ulab/code/utils/utils.c +#: extmod/ulab/code/numpy/create.c extmod/ulab/code/utils/utils.c msgid "offset is too large" msgstr "" @@ -3815,7 +3851,7 @@ msgstr "" msgid "offset must be >= 0" msgstr "" -#: extmod/ulab/code/ulab_create.c +#: extmod/ulab/code/numpy/create.c msgid "offset must be non-negative and no greater than buffer length" msgstr "" @@ -4294,7 +4330,7 @@ msgstr "" msgid "too many arguments provided with the given format" msgstr "" -#: extmod/ulab/code/ndarray.c extmod/ulab/code/ulab_create.c +#: extmod/ulab/code/ndarray.c extmod/ulab/code/numpy/create.c msgid "too many dimensions" msgstr "" @@ -4495,7 +4531,7 @@ msgstr "" msgid "wrong axis index" msgstr "" -#: extmod/ulab/code/ulab_create.c +#: extmod/ulab/code/numpy/create.c msgid "wrong axis specified" msgstr "" @@ -4503,7 +4539,11 @@ msgstr "" msgid "wrong input type" msgstr "" -#: extmod/ulab/code/ulab_create.c py/objarray.c py/objstr.c +#: extmod/ulab/code/numpy/transform.c +msgid "wrong length of condition array" +msgstr "" + +#: extmod/ulab/code/numpy/create.c py/objarray.c py/objstr.c msgid "wrong number of arguments" msgstr "" diff --git a/py/circuitpy_mpconfig.h b/py/circuitpy_mpconfig.h index 6efc341fce..7ffb5b7e13 100644 --- a/py/circuitpy_mpconfig.h +++ b/py/circuitpy_mpconfig.h @@ -337,6 +337,10 @@ extern const struct _mp_obj_module_t nvm_module; #endif #endif +#ifndef ULAB_SUPPORTS_COMPLEX +#define ULAB_SUPPORTS_COMPLEX (0) +#endif + #if CIRCUITPY_ULAB // ulab requires reverse special methods #if defined(MICROPY_PY_REVERSE_SPECIAL_METHODS) && !MICROPY_PY_REVERSE_SPECIAL_METHODS From f6cf15de434e77a4eb2f2846ef57da174372e62b Mon Sep 17 00:00:00 2001 From: Scott Shawcroft Date: Fri, 14 Jan 2022 12:22:12 -0800 Subject: [PATCH 19/27] Switch CP to core 1 on S3 --- ports/espressif/esp-idf-config/sdkconfig-esp32s3.defaults | 6 +++--- ports/espressif/esp-idf-config/sdkconfig.defaults | 1 + ports/espressif/tools/update_sdkconfig.py | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/ports/espressif/esp-idf-config/sdkconfig-esp32s3.defaults b/ports/espressif/esp-idf-config/sdkconfig-esp32s3.defaults index d190f0b864..4f3614692b 100644 --- a/ports/espressif/esp-idf-config/sdkconfig-esp32s3.defaults +++ b/ports/espressif/esp-idf-config/sdkconfig-esp32s3.defaults @@ -86,10 +86,10 @@ CONFIG_ESP32S3_UNIVERSAL_MAC_ADDRESSES=4 # end of MAC Config CONFIG_ESP_SLEEP_GPIO_RESET_WORKAROUND=y -CONFIG_ESP_MAIN_TASK_AFFINITY_CPU0=y -# CONFIG_ESP_MAIN_TASK_AFFINITY_CPU1 is not set +# CONFIG_ESP_MAIN_TASK_AFFINITY_CPU0 is not set +CONFIG_ESP_MAIN_TASK_AFFINITY_CPU1=y # CONFIG_ESP_MAIN_TASK_AFFINITY_NO_AFFINITY is not set -CONFIG_ESP_MAIN_TASK_AFFINITY=0x0 +CONFIG_ESP_MAIN_TASK_AFFINITY=0x1 # # Wi-Fi # diff --git a/ports/espressif/esp-idf-config/sdkconfig.defaults b/ports/espressif/esp-idf-config/sdkconfig.defaults index f4efac4063..3bf9a09c26 100644 --- a/ports/espressif/esp-idf-config/sdkconfig.defaults +++ b/ports/espressif/esp-idf-config/sdkconfig.defaults @@ -246,6 +246,7 @@ CONFIG_ESP_PHY_CALIBRATION_AND_DATA_STORAGE=y # CONFIG_ESP_PHY_INIT_DATA_IN_PARTITION is not set CONFIG_ESP_PHY_MAX_WIFI_TX_POWER=20 CONFIG_ESP_PHY_MAX_TX_POWER=20 +CONFIG_ESP_PHY_ENABLE_USB=y # end of PHY # CONFIG_PM_ENABLE is not set diff --git a/ports/espressif/tools/update_sdkconfig.py b/ports/espressif/tools/update_sdkconfig.py index 4b6114336e..a9d61532bb 100644 --- a/ports/espressif/tools/update_sdkconfig.py +++ b/ports/espressif/tools/update_sdkconfig.py @@ -9,6 +9,7 @@ OPT_SETTINGS = [ "CONFIG_ESP_CONSOLE_", "CONFIG_CONSOLE_UART_", "CONFIG_ESP_SYSTEM_PANIC_", + "CONFIG_ESP32S2_PANIC_", "COMPILER_OPTIMIZATION_", "CONFIG_ESP32S3_DEBUG_OCDAWARE", "CONFIG_FREERTOS_ASSERT_", @@ -142,8 +143,7 @@ def update(debug, board, update_all): current_group = None else: current_group = line[2:] - - if (not update_all and line not in defaults) or ( + elif (not update_all and line not in defaults) or ( update_all and matches_group(line, BOARD_SETTINGS) ): last_board_group = add_group(board_settings, last_board_group, current_group) From c70c8a93906085d61ab7346a7cf0826c72606cd8 Mon Sep 17 00:00:00 2001 From: Dan Halbert Date: Sat, 15 Jan 2022 19:28:00 -0500 Subject: [PATCH 20/27] fix espressif open-drain --- ports/espressif/common-hal/digitalio/DigitalInOut.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/ports/espressif/common-hal/digitalio/DigitalInOut.c b/ports/espressif/common-hal/digitalio/DigitalInOut.c index 24c5d5110d..b5199672b1 100644 --- a/ports/espressif/common-hal/digitalio/DigitalInOut.c +++ b/ports/espressif/common-hal/digitalio/DigitalInOut.c @@ -108,11 +108,9 @@ digitalinout_result_t common_hal_digitalio_digitalinout_set_drive_mode( digitalio_digitalinout_obj_t *self, digitalio_drive_mode_t drive_mode) { gpio_num_t number = self->pin->number; - gpio_mode_t mode; + gpio_mode_t mode = GPIO_MODE_DEF_OUTPUT; if (drive_mode == DRIVE_MODE_OPEN_DRAIN) { - mode = GPIO_MODE_DEF_OD; - } else { - mode = GPIO_MODE_DEF_OUTPUT; + mode |= GPIO_MODE_DEF_OD; } esp_err_t result = gpio_set_direction(number, mode); if (result != ESP_OK) { From 11848b1826f81ee5cd2d01e0f7339c21e34618f3 Mon Sep 17 00:00:00 2001 From: Dan Halbert Date: Sat, 15 Jan 2022 23:05:33 -0500 Subject: [PATCH 21/27] use GPIO_MODE_ instead of GPIO_MODE_DEF --- ports/espressif/common-hal/digitalio/DigitalInOut.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/espressif/common-hal/digitalio/DigitalInOut.c b/ports/espressif/common-hal/digitalio/DigitalInOut.c index b5199672b1..bf52965d28 100644 --- a/ports/espressif/common-hal/digitalio/DigitalInOut.c +++ b/ports/espressif/common-hal/digitalio/DigitalInOut.c @@ -71,7 +71,7 @@ void common_hal_digitalio_digitalinout_deinit(digitalio_digitalinout_obj_t *self void common_hal_digitalio_digitalinout_switch_to_input( digitalio_digitalinout_obj_t *self, digitalio_pull_t pull) { common_hal_digitalio_digitalinout_set_pull(self, pull); - gpio_set_direction(self->pin->number, GPIO_MODE_DEF_INPUT); + gpio_set_direction(self->pin->number, GPIO_MODE_INPUT); } digitalinout_result_t common_hal_digitalio_digitalinout_switch_to_output( @@ -108,9 +108,9 @@ digitalinout_result_t common_hal_digitalio_digitalinout_set_drive_mode( digitalio_digitalinout_obj_t *self, digitalio_drive_mode_t drive_mode) { gpio_num_t number = self->pin->number; - gpio_mode_t mode = GPIO_MODE_DEF_OUTPUT; + gpio_mode_t mode = GPIO_MODE_OUTPUT; if (drive_mode == DRIVE_MODE_OPEN_DRAIN) { - mode |= GPIO_MODE_DEF_OD; + mode |= GPIO_MODE_OUTPUT_OD; } esp_err_t result = gpio_set_direction(number, mode); if (result != ESP_OK) { From 2d0590643015d217eb09f119709fc84e42ce4942 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=B6khan=20Ko=C3=A7marl=C4=B1?= Date: Sat, 15 Jan 2022 12:33:29 +0000 Subject: [PATCH 22/27] Translated using Weblate (Turkish) Currently translated at 10.8% (112 of 1031 strings) Translation: CircuitPython/main Translate-URL: https://hosted.weblate.org/projects/circuitpython/main/tr/ --- locale/tr.po | 109 ++++++++++++++++++++++++++------------------------- 1 file changed, 56 insertions(+), 53 deletions(-) diff --git a/locale/tr.po b/locale/tr.po index d00d068b42..8b3ef762cf 100644 --- a/locale/tr.po +++ b/locale/tr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"PO-Revision-Date: 2022-01-09 21:53+0000\n" +"PO-Revision-Date: 2022-01-16 13:56+0000\n" "Last-Translator: Gökhan Koçmarlı \n" "Language-Team: none\n" "Language: tr\n" @@ -265,7 +265,7 @@ msgstr "'%s' integer %d, %d..%d aralığında değil" #: py/emitinlinethumb.c #, c-format msgid "'%s' integer 0x%x doesn't fit in mask 0x%x" -msgstr "" +msgstr "'%s' integer 0x%x, 0x%x maskesine uymuyor" #: py/obj.c #, c-format @@ -287,64 +287,66 @@ msgid "'%s' object isn't subscriptable" msgstr "'%s' nesnesi subscriptable özelliğe sahip değil" #: py/objstr.c +#, fuzzy msgid "'=' alignment not allowed in string format specifier" -msgstr "" +msgstr "'=' hizalamasına string biçiminde izin verilmez" #: shared-module/struct/__init__.c msgid "'S' and 'O' are not supported format types" -msgstr "" +msgstr "'S' ve 'O' desteklenen biçim türlerinden değildir" #: py/compile.c msgid "'align' requires 1 argument" -msgstr "" +msgstr "'align' 1 argümana ihtiyaç duyar" #: py/compile.c msgid "'await' outside function" -msgstr "" +msgstr "fonksiyon dışında 'await'" #: py/compile.c msgid "'await', 'async for' or 'async with' outside async function" msgstr "" +"asenkron fonksiyon dışında kullanılan 'await', 'async for' ya da 'async with'" #: py/compile.c msgid "'break' outside loop" -msgstr "" +msgstr "döngü dışında 'break'" #: py/compile.c msgid "'continue' outside loop" -msgstr "" +msgstr "döngü dışında 'continue'" #: py/objgenerator.c msgid "'coroutine' object is not an iterator" -msgstr "" +msgstr "'coroutine' nesnesi bir iteratör değildir" #: py/compile.c msgid "'data' requires at least 2 arguments" -msgstr "" +msgstr "'data' en az 2 argümana ihtiyaç duyar" #: py/compile.c msgid "'data' requires integer arguments" -msgstr "" +msgstr "'data' integer tipinde argümanlara ihtiyaç duyar" #: py/compile.c msgid "'label' requires 1 argument" -msgstr "" +msgstr "'label' 1 argümana ihtiyaç duyar" #: py/compile.c msgid "'return' outside function" -msgstr "" +msgstr "fonksiyon dışında 'return'" #: py/compile.c msgid "'yield from' inside async function" -msgstr "" +msgstr "asenkron fonksiyon içinde 'yield from'" #: py/compile.c msgid "'yield' outside function" -msgstr "" +msgstr "fonksiyon dışında 'yield'" #: shared-module/vectorio/VectorShape.c msgid "(x,y) integers required" -msgstr "" +msgstr "(x, y) integerları gereklidir" #: py/compile.c msgid "*x must be assignment target" @@ -356,89 +358,89 @@ msgstr ", içinde %q\n" #: py/objcomplex.c msgid "0.0 to a complex power" -msgstr "" +msgstr "0.0'dan bir karmaşık güce" #: py/modbuiltins.c msgid "3-arg pow() not supported" -msgstr "" +msgstr "3-argümanlı pow() desteklenmemektedir" #: shared-module/msgpack/__init__.c msgid "64 bit types" -msgstr "" +msgstr "64 bit tipler" #: ports/atmel-samd/common-hal/alarm/pin/PinAlarm.c #: ports/atmel-samd/common-hal/countio/Counter.c #: ports/atmel-samd/common-hal/rotaryio/IncrementalEncoder.c msgid "A hardware interrupt channel is already in use" -msgstr "" +msgstr "Bir donanım kesme kanalı halihazırda kullanılmaktadır" #: ports/espressif/common-hal/analogio/AnalogIn.c msgid "ADC2 is being used by WiFi" -msgstr "" +msgstr "ADC2, WiFi tarafından kullanılmaktadır" #: shared-bindings/_bleio/Address.c shared-bindings/ipaddress/IPv4Address.c #, c-format msgid "Address must be %d bytes long" -msgstr "" +msgstr "Adres %d byte uzunluğunda olmalıdır" #: shared-bindings/_bleio/Address.c msgid "Address type out of range" -msgstr "" +msgstr "Adres tipi beklenen aralığın dışında" #: ports/espressif/common-hal/canio/CAN.c msgid "All CAN peripherals are in use" -msgstr "" +msgstr "Tüm CAN çevre birimleri kullanımda" #: ports/espressif/common-hal/busio/I2C.c #: ports/espressif/common-hal/i2cperipheral/I2CPeripheral.c #: ports/nrf/common-hal/busio/I2C.c msgid "All I2C peripherals are in use" -msgstr "" +msgstr "Tüm I2C çevre birimleri kullanımda" #: ports/espressif/common-hal/countio/Counter.c #: ports/espressif/common-hal/frequencyio/FrequencyIn.c #: ports/espressif/common-hal/rotaryio/IncrementalEncoder.c msgid "All PCNT units in use" -msgstr "" +msgstr "Tüm PCNT birimleri kullanımda" #: ports/atmel-samd/common-hal/canio/Listener.c #: ports/espressif/common-hal/canio/Listener.c #: ports/stm/common-hal/canio/Listener.c msgid "All RX FIFOs in use" -msgstr "" +msgstr "Tüm RX FIFO'ları kullanımda" #: ports/espressif/common-hal/busio/SPI.c ports/nrf/common-hal/busio/SPI.c msgid "All SPI peripherals are in use" -msgstr "" +msgstr "Tüm SPI çevre birimleri kullanımda" #: ports/espressif/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c #: ports/raspberrypi/common-hal/busio/UART.c msgid "All UART peripherals are in use" -msgstr "" +msgstr "Tüm UART çevre birimleri kullanımda" #: ports/nrf/common-hal/countio/Counter.c #: ports/nrf/common-hal/pulseio/PulseIn.c #: ports/nrf/common-hal/rotaryio/IncrementalEncoder.c #: shared-bindings/pwmio/PWMOut.c msgid "All channels in use" -msgstr "" +msgstr "Tüm kanallar kullanımda" #: ports/atmel-samd/common-hal/audioio/AudioOut.c msgid "All event channels in use" -msgstr "" +msgstr "Tüm olay kanalları kullanımda" #: ports/raspberrypi/common-hal/pulseio/PulseIn.c #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c msgid "All state machines in use" -msgstr "" +msgstr "Tüm durum makineleri kullanımda" #: ports/atmel-samd/audio_dma.c msgid "All sync event channels in use" -msgstr "" +msgstr "Tüm asenkron olay kanalları kullanımda" #: shared-bindings/pwmio/PWMOut.c msgid "All timers for this pin are in use" -msgstr "" +msgstr "Bu pin için tüm zamanlayıcılar kullanımda" #: ports/atmel-samd/common-hal/_pew/PewPew.c #: ports/atmel-samd/common-hal/audioio/AudioOut.c @@ -455,11 +457,11 @@ msgstr "" #: ports/raspberrypi/common-hal/audiopwmio/PWMAudioOut.c #: ports/stm/peripherals/timers.c shared-bindings/pwmio/PWMOut.c msgid "All timers in use" -msgstr "" +msgstr "Tüm zamanlayıcılar kullanımda" #: ports/nrf/common-hal/_bleio/Adapter.c msgid "Already advertising." -msgstr "" +msgstr "Halihazırda duyuruluyor." #: ports/atmel-samd/common-hal/canio/Listener.c msgid "Already have all-matches listener" @@ -468,47 +470,47 @@ msgstr "" #: shared-module/memorymonitor/AllocationAlarm.c #: shared-module/memorymonitor/AllocationSize.c msgid "Already running" -msgstr "" +msgstr "Halihazırda çalışıyor" #: ports/espressif/common-hal/wifi/Radio.c msgid "Already scanning for wifi networks" -msgstr "" +msgstr "Halihazırda wifi ağları için tarama yapılıyor" #: ports/cxd56/common-hal/analogio/AnalogIn.c msgid "AnalogIn not supported on given pin" -msgstr "" +msgstr "Verilen pin için AnalogIn desteklenmemektedir" #: ports/cxd56/common-hal/analogio/AnalogOut.c #: ports/mimxrt10xx/common-hal/analogio/AnalogOut.c #: ports/nrf/common-hal/analogio/AnalogOut.c #: ports/raspberrypi/common-hal/analogio/AnalogOut.c msgid "AnalogOut functionality not supported" -msgstr "" +msgstr "AnalogOut işlevi desteklenmemektedir" #: shared-bindings/analogio/AnalogOut.c msgid "AnalogOut is only 16 bits. Value must be less than 65536." -msgstr "" +msgstr "AnalogOut yalnızca 16 bitlik. Değer 65536'dan küçük olmalıdır." #: ports/atmel-samd/common-hal/analogio/AnalogOut.c msgid "AnalogOut not supported on given pin" -msgstr "" +msgstr "Verilen pin için AnalogOut desteklenmemektedir" #: ports/stm/common-hal/audiopwmio/PWMAudioOut.c msgid "Another PWMAudioOut is already active" -msgstr "" +msgstr "Başka bir PWMAudioOut zaten aktif durumda" #: ports/atmel-samd/common-hal/pulseio/PulseOut.c #: ports/cxd56/common-hal/pulseio/PulseOut.c msgid "Another send is already active" -msgstr "" +msgstr "Başka bir gönderme zaten aktif" #: shared-bindings/pulseio/PulseOut.c msgid "Array must contain halfwords (type 'H')" -msgstr "" +msgstr "Dizi yarımsözcüklere sahip olmalıdır (tip 'H')" #: shared-bindings/alarm/SleepMemory.c shared-bindings/nvm/ByteArray.c msgid "Array values should be single bytes." -msgstr "" +msgstr "Dizi değerleri tekil bytelar olmalıdır." #: shared-bindings/microcontroller/Pin.c msgid "At most %d %q may be specified (not %d)" @@ -517,23 +519,23 @@ msgstr "" #: shared-module/memorymonitor/AllocationAlarm.c #, c-format msgid "Attempt to allocate %d blocks" -msgstr "" +msgstr "%d bloğun ayrılması girişimi" #: supervisor/shared/safe_mode.c msgid "Attempted heap allocation when VM not running." -msgstr "" +msgstr "VM çalışmazken heap'ten alan tahsis edilmeye çalışıldı." #: ports/raspberrypi/audio_dma.c msgid "Audio conversion not implemented" -msgstr "" +msgstr "Ses dönüşümü implemente edilmedi" #: shared-bindings/wifi/Radio.c msgid "AuthMode.OPEN is not used with password" -msgstr "" +msgstr "AuthMode.OPEN bir şifre ile kullanılmadı" #: shared-bindings/wifi/Radio.c msgid "Authentication failure" -msgstr "" +msgstr "Kimlik doğrulama hatası" #: main.c msgid "Auto-reload is off.\n" @@ -549,12 +551,12 @@ msgstr "" #: ports/espressif/common-hal/canio/CAN.c msgid "Baudrate not supported by peripheral" -msgstr "" +msgstr "Baudhızı, çevre birimi tarafından desteklenmiyor" #: shared-module/displayio/Display.c #: shared-module/framebufferio/FramebufferDisplay.c msgid "Below minimum frame rate" -msgstr "" +msgstr "Minimum kare hızından altında" #: ports/raspberrypi/common-hal/audiobusio/I2SOut.c msgid "Bit clock and word select must be sequential pins" @@ -1967,6 +1969,7 @@ msgstr "" #: main.c msgid "Pretending to deep sleep until alarm, CTRL-C or file write.\n" msgstr "" +"Alarma, CTRL-C'ye veya dosya yazana kadar derin uyku moduna geçiliyor.\n" #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c msgid "Program does IN without loading ISR" From 784a5edc4bc7d9d7c9b4119c8d5e4c52962cf1c4 Mon Sep 17 00:00:00 2001 From: Neradoc Date: Mon, 17 Jan 2022 06:52:08 +0100 Subject: [PATCH 23/27] Define default SPI pins on kb2040 Fixes #5875 --- ports/raspberrypi/boards/adafruit_kb2040/mpconfigboard.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ports/raspberrypi/boards/adafruit_kb2040/mpconfigboard.h b/ports/raspberrypi/boards/adafruit_kb2040/mpconfigboard.h index c01f713e48..e1bfbb01e7 100644 --- a/ports/raspberrypi/boards/adafruit_kb2040/mpconfigboard.h +++ b/ports/raspberrypi/boards/adafruit_kb2040/mpconfigboard.h @@ -8,3 +8,7 @@ #define DEFAULT_UART_BUS_TX (&pin_GPIO0) #define DEFAULT_UART_BUS_RX (&pin_GPIO1) + +#define DEFAULT_SPI_BUS_SCK (&pin_GPIO18) +#define DEFAULT_SPI_BUS_MOSI (&pin_GPIO19) +#define DEFAULT_SPI_BUS_MISO (&pin_GPIO20) From 9b9dd97e00b88083f51e0646c5c25385b5d2b146 Mon Sep 17 00:00:00 2001 From: 0hotpotman0 Date: Mon, 17 Jan 2022 14:49:11 +0800 Subject: [PATCH 24/27] add softdev_version 7.0.1 --- ports/nrf/boards/Seeed_XIAO_nRF52840_Sense/mpconfigboard.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ports/nrf/boards/Seeed_XIAO_nRF52840_Sense/mpconfigboard.mk b/ports/nrf/boards/Seeed_XIAO_nRF52840_Sense/mpconfigboard.mk index c280246cc9..228c5698f0 100644 --- a/ports/nrf/boards/Seeed_XIAO_nRF52840_Sense/mpconfigboard.mk +++ b/ports/nrf/boards/Seeed_XIAO_nRF52840_Sense/mpconfigboard.mk @@ -1,6 +1,7 @@ USB_VID = 0x2886 USB_PID = 0x0045 -USB_PRODUCT = "Seeed XIAO nRF52840 Sense SOFTDEV_VERSION=7.0.1" +USB_PRODUCT = "Seeed XIAO nRF52840 Sense" +SOFTDEV_VERSION=7.0.1 USB_MANUFACTURER = "Seeed" MCU_CHIP = nrf52840 From d0a1a7d380061230d7e270506d402195764b9bcb Mon Sep 17 00:00:00 2001 From: Hosted Weblate Date: Mon, 17 Jan 2022 22:08:58 +0100 Subject: [PATCH 25/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 | 68 +++++++++++++++++++++++++++++++--------- locale/cs.po | 68 +++++++++++++++++++++++++++++++--------- locale/de_DE.po | 68 +++++++++++++++++++++++++++++++--------- locale/el.po | 68 +++++++++++++++++++++++++++++++--------- locale/en_GB.po | 68 +++++++++++++++++++++++++++++++--------- locale/es.po | 68 +++++++++++++++++++++++++++++++--------- locale/fil.po | 68 +++++++++++++++++++++++++++++++--------- locale/fr.po | 68 +++++++++++++++++++++++++++++++--------- locale/hi.po | 68 +++++++++++++++++++++++++++++++--------- locale/it_IT.po | 68 +++++++++++++++++++++++++++++++--------- locale/ja.po | 68 +++++++++++++++++++++++++++++++--------- locale/ko.po | 68 +++++++++++++++++++++++++++++++--------- locale/nl.po | 68 +++++++++++++++++++++++++++++++--------- locale/pl.po | 68 +++++++++++++++++++++++++++++++--------- locale/pt_BR.po | 68 +++++++++++++++++++++++++++++++--------- locale/ru.po | 68 +++++++++++++++++++++++++++++++--------- locale/sv.po | 68 +++++++++++++++++++++++++++++++--------- locale/tr.po | 68 +++++++++++++++++++++++++++++++--------- locale/zh_Latn_pinyin.po | 68 +++++++++++++++++++++++++++++++--------- 19 files changed, 1026 insertions(+), 266 deletions(-) diff --git a/locale/ID.po b/locale/ID.po index 9e529e3204..8e9ffa9e40 100644 --- a/locale/ID.po +++ b/locale/ID.po @@ -2661,7 +2661,7 @@ msgstr "berusaha mendapatkan argmin/argmax dari urutan kosong" msgid "attributes not supported yet" msgstr "atribut belum didukung" -#: extmod/ulab/code/numpy/numerical.c +#: extmod/ulab/code/ulab_tools.c msgid "axis is out of bounds" msgstr "" @@ -2717,11 +2717,11 @@ msgstr "" msgid "branch not in range" msgstr "" -#: extmod/ulab/code/ulab_create.c extmod/ulab/code/utils/utils.c +#: extmod/ulab/code/numpy/create.c extmod/ulab/code/utils/utils.c msgid "buffer is smaller than requested size" msgstr "" -#: extmod/ulab/code/ulab_create.c extmod/ulab/code/utils/utils.c +#: extmod/ulab/code/numpy/create.c extmod/ulab/code/utils/utils.c msgid "buffer size must be a multiple of element size" msgstr "" @@ -2813,6 +2813,10 @@ msgstr "" msgid "can't convert '%q' object to %q implicitly" msgstr "" +#: extmod/ulab/code/numpy/vector.c +msgid "can't convert complex to float" +msgstr "" + #: py/obj.c msgid "can't convert to %q" msgstr "" @@ -2907,6 +2911,14 @@ msgstr "" msgid "cannot cast output with casting rule" msgstr "" +#: extmod/ulab/code/ndarray.c +msgid "cannot convert complex to dtype" +msgstr "" + +#: extmod/ulab/code/ndarray.c +msgid "cannot convert complex type" +msgstr "" + #: py/objtype.c msgid "cannot create '%q' instances" msgstr "" @@ -3098,6 +3110,10 @@ msgstr "" msgid "divisor must be 4" msgstr "" +#: extmod/ulab/code/numpy/vector.c +msgid "dtype must be float, or complex" +msgstr "" + #: py/objdeque.c msgid "empty" msgstr "" @@ -3201,7 +3217,7 @@ msgstr "" msgid "first argument must be a function" msgstr "" -#: extmod/ulab/code/ulab_create.c +#: extmod/ulab/code/numpy/create.c msgid "first argument must be a tuple of ndarrays" msgstr "" @@ -3266,6 +3282,10 @@ msgstr "" msgid "function is defined for ndarrays only" msgstr "" +#: extmod/ulab/code/numpy/carray/carray.c +msgid "function is implemented for ndarrays only" +msgstr "" + #: py/argcheck.c #, c-format msgid "function missing %d required positional arguments" @@ -3379,7 +3399,7 @@ msgstr "inline assembler harus sebuah fungsi" msgid "input and output shapes are not compatible" msgstr "" -#: extmod/ulab/code/ulab_create.c +#: extmod/ulab/code/numpy/create.c msgid "input argument must be an integer, a tuple, or a list" msgstr "" @@ -3387,7 +3407,7 @@ msgstr "" msgid "input array length must be power of 2" msgstr "" -#: extmod/ulab/code/ulab_create.c +#: extmod/ulab/code/numpy/create.c msgid "input arrays are not compatible" msgstr "" @@ -3395,6 +3415,10 @@ msgstr "" msgid "input data must be an iterable" msgstr "" +#: extmod/ulab/code/numpy/vector.c +msgid "input dtype must be float or complex" +msgstr "" + #: extmod/ulab/code/numpy/linalg/linalg.c msgid "input matrix is asymmetric" msgstr "" @@ -3404,18 +3428,26 @@ msgstr "" msgid "input matrix is singular" msgstr "" +#: extmod/ulab/code/numpy/carray/carray.c +msgid "input must be a 1D ndarray" +msgstr "" + #: extmod/ulab/code/scipy/linalg/linalg.c extmod/ulab/code/user/user.c msgid "input must be a dense ndarray" msgstr "" -#: extmod/ulab/code/ulab_create.c +#: extmod/ulab/code/numpy/create.c msgid "input must be a tensor of rank 2" msgstr "" -#: extmod/ulab/code/ulab_create.c extmod/ulab/code/user/user.c +#: extmod/ulab/code/numpy/create.c extmod/ulab/code/user/user.c msgid "input must be an ndarray" msgstr "" +#: extmod/ulab/code/numpy/carray/carray.c +msgid "input must be an ndarray, or a scalar" +msgstr "" + #: extmod/ulab/code/scipy/signal/signal.c msgid "input must be one-dimensional" msgstr "" @@ -3786,7 +3818,11 @@ msgstr "" msgid "not enough arguments for format string" msgstr "" -#: extmod/ulab/code/ulab_create.c +#: extmod/ulab/code/numpy/carray/carray_tools.c +msgid "not implemented for complex dtype" +msgstr "" + +#: extmod/ulab/code/numpy/create.c msgid "number of points must be at least 2" msgstr "" @@ -3844,7 +3880,7 @@ msgstr "" msgid "odd-length string" msgstr "panjang data string memiliki keganjilan (odd-length)" -#: extmod/ulab/code/ulab_create.c extmod/ulab/code/utils/utils.c +#: extmod/ulab/code/numpy/create.c extmod/ulab/code/utils/utils.c msgid "offset is too large" msgstr "" @@ -3852,7 +3888,7 @@ msgstr "" msgid "offset must be >= 0" msgstr "" -#: extmod/ulab/code/ulab_create.c +#: extmod/ulab/code/numpy/create.c msgid "offset must be non-negative and no greater than buffer length" msgstr "" @@ -4332,7 +4368,7 @@ msgstr "" msgid "too many arguments provided with the given format" msgstr "" -#: extmod/ulab/code/ndarray.c extmod/ulab/code/ulab_create.c +#: extmod/ulab/code/ndarray.c extmod/ulab/code/numpy/create.c msgid "too many dimensions" msgstr "" @@ -4533,7 +4569,7 @@ msgstr "jendela harus <= interval" msgid "wrong axis index" msgstr "indeks sumbu salah" -#: extmod/ulab/code/ulab_create.c +#: extmod/ulab/code/numpy/create.c msgid "wrong axis specified" msgstr "sumbu yang ditentukan salah" @@ -4541,7 +4577,11 @@ msgstr "sumbu yang ditentukan salah" msgid "wrong input type" msgstr "tipe input salah" -#: extmod/ulab/code/ulab_create.c py/objarray.c py/objstr.c +#: extmod/ulab/code/numpy/transform.c +msgid "wrong length of condition array" +msgstr "" + +#: extmod/ulab/code/numpy/create.c py/objarray.c py/objstr.c msgid "wrong number of arguments" msgstr "jumlah argumen salah" diff --git a/locale/cs.po b/locale/cs.po index f0744403ab..25fb7a2dfd 100644 --- a/locale/cs.po +++ b/locale/cs.po @@ -2635,7 +2635,7 @@ msgstr "" msgid "attributes not supported yet" msgstr "" -#: extmod/ulab/code/numpy/numerical.c +#: extmod/ulab/code/ulab_tools.c msgid "axis is out of bounds" msgstr "" @@ -2691,11 +2691,11 @@ msgstr "" msgid "branch not in range" msgstr "" -#: extmod/ulab/code/ulab_create.c extmod/ulab/code/utils/utils.c +#: extmod/ulab/code/numpy/create.c extmod/ulab/code/utils/utils.c msgid "buffer is smaller than requested size" msgstr "" -#: extmod/ulab/code/ulab_create.c extmod/ulab/code/utils/utils.c +#: extmod/ulab/code/numpy/create.c extmod/ulab/code/utils/utils.c msgid "buffer size must be a multiple of element size" msgstr "" @@ -2787,6 +2787,10 @@ msgstr "" msgid "can't convert '%q' object to %q implicitly" msgstr "" +#: extmod/ulab/code/numpy/vector.c +msgid "can't convert complex to float" +msgstr "" + #: py/obj.c msgid "can't convert to %q" msgstr "" @@ -2881,6 +2885,14 @@ msgstr "" msgid "cannot cast output with casting rule" msgstr "" +#: extmod/ulab/code/ndarray.c +msgid "cannot convert complex to dtype" +msgstr "" + +#: extmod/ulab/code/ndarray.c +msgid "cannot convert complex type" +msgstr "" + #: py/objtype.c msgid "cannot create '%q' instances" msgstr "" @@ -3072,6 +3084,10 @@ msgstr "" msgid "divisor must be 4" msgstr "" +#: extmod/ulab/code/numpy/vector.c +msgid "dtype must be float, or complex" +msgstr "" + #: py/objdeque.c msgid "empty" msgstr "" @@ -3175,7 +3191,7 @@ msgstr "" msgid "first argument must be a function" msgstr "" -#: extmod/ulab/code/ulab_create.c +#: extmod/ulab/code/numpy/create.c msgid "first argument must be a tuple of ndarrays" msgstr "" @@ -3240,6 +3256,10 @@ msgstr "" msgid "function is defined for ndarrays only" msgstr "" +#: extmod/ulab/code/numpy/carray/carray.c +msgid "function is implemented for ndarrays only" +msgstr "" + #: py/argcheck.c #, c-format msgid "function missing %d required positional arguments" @@ -3353,7 +3373,7 @@ msgstr "" msgid "input and output shapes are not compatible" msgstr "" -#: extmod/ulab/code/ulab_create.c +#: extmod/ulab/code/numpy/create.c msgid "input argument must be an integer, a tuple, or a list" msgstr "" @@ -3361,7 +3381,7 @@ msgstr "" msgid "input array length must be power of 2" msgstr "" -#: extmod/ulab/code/ulab_create.c +#: extmod/ulab/code/numpy/create.c msgid "input arrays are not compatible" msgstr "" @@ -3369,6 +3389,10 @@ msgstr "" msgid "input data must be an iterable" msgstr "" +#: extmod/ulab/code/numpy/vector.c +msgid "input dtype must be float or complex" +msgstr "" + #: extmod/ulab/code/numpy/linalg/linalg.c msgid "input matrix is asymmetric" msgstr "" @@ -3378,18 +3402,26 @@ msgstr "" msgid "input matrix is singular" msgstr "" +#: extmod/ulab/code/numpy/carray/carray.c +msgid "input must be a 1D ndarray" +msgstr "" + #: extmod/ulab/code/scipy/linalg/linalg.c extmod/ulab/code/user/user.c msgid "input must be a dense ndarray" msgstr "" -#: extmod/ulab/code/ulab_create.c +#: extmod/ulab/code/numpy/create.c msgid "input must be a tensor of rank 2" msgstr "" -#: extmod/ulab/code/ulab_create.c extmod/ulab/code/user/user.c +#: extmod/ulab/code/numpy/create.c extmod/ulab/code/user/user.c msgid "input must be an ndarray" msgstr "" +#: extmod/ulab/code/numpy/carray/carray.c +msgid "input must be an ndarray, or a scalar" +msgstr "" + #: extmod/ulab/code/scipy/signal/signal.c msgid "input must be one-dimensional" msgstr "" @@ -3760,7 +3792,11 @@ msgstr "" msgid "not enough arguments for format string" msgstr "" -#: extmod/ulab/code/ulab_create.c +#: extmod/ulab/code/numpy/carray/carray_tools.c +msgid "not implemented for complex dtype" +msgstr "" + +#: extmod/ulab/code/numpy/create.c msgid "number of points must be at least 2" msgstr "" @@ -3818,7 +3854,7 @@ msgstr "" msgid "odd-length string" msgstr "" -#: extmod/ulab/code/ulab_create.c extmod/ulab/code/utils/utils.c +#: extmod/ulab/code/numpy/create.c extmod/ulab/code/utils/utils.c msgid "offset is too large" msgstr "" @@ -3826,7 +3862,7 @@ msgstr "" msgid "offset must be >= 0" msgstr "" -#: extmod/ulab/code/ulab_create.c +#: extmod/ulab/code/numpy/create.c msgid "offset must be non-negative and no greater than buffer length" msgstr "" @@ -4305,7 +4341,7 @@ msgstr "" msgid "too many arguments provided with the given format" msgstr "" -#: extmod/ulab/code/ndarray.c extmod/ulab/code/ulab_create.c +#: extmod/ulab/code/ndarray.c extmod/ulab/code/numpy/create.c msgid "too many dimensions" msgstr "" @@ -4506,7 +4542,7 @@ msgstr "" msgid "wrong axis index" msgstr "" -#: extmod/ulab/code/ulab_create.c +#: extmod/ulab/code/numpy/create.c msgid "wrong axis specified" msgstr "" @@ -4514,7 +4550,11 @@ msgstr "" msgid "wrong input type" msgstr "" -#: extmod/ulab/code/ulab_create.c py/objarray.c py/objstr.c +#: extmod/ulab/code/numpy/transform.c +msgid "wrong length of condition array" +msgstr "" + +#: extmod/ulab/code/numpy/create.c py/objarray.c py/objstr.c msgid "wrong number of arguments" msgstr "" diff --git a/locale/de_DE.po b/locale/de_DE.po index b670e96ea6..b57b2bc6c2 100644 --- a/locale/de_DE.po +++ b/locale/de_DE.po @@ -2666,7 +2666,7 @@ msgstr "Sie haben versucht argmin/argmax einer leeren Sequenz zu erhalten" msgid "attributes not supported yet" msgstr "Attribute werden noch nicht unterstützt" -#: extmod/ulab/code/numpy/numerical.c +#: extmod/ulab/code/ulab_tools.c msgid "axis is out of bounds" msgstr "Achse außerhalb des Wertebereichs" @@ -2722,11 +2722,11 @@ msgstr "Es müssen 8 oder 16 bits_per_sample sein" msgid "branch not in range" msgstr "Zweig ist außerhalb der Reichweite" -#: extmod/ulab/code/ulab_create.c extmod/ulab/code/utils/utils.c +#: extmod/ulab/code/numpy/create.c extmod/ulab/code/utils/utils.c msgid "buffer is smaller than requested size" msgstr "Der Puffer ist kleiner als die angefragte Größe" -#: extmod/ulab/code/ulab_create.c extmod/ulab/code/utils/utils.c +#: extmod/ulab/code/numpy/create.c extmod/ulab/code/utils/utils.c msgid "buffer size must be a multiple of element size" msgstr "Die Puffergröße muss ein vielfaches der Elementgröße sein" @@ -2820,6 +2820,10 @@ msgstr "kann %s nicht nach complex konvertieren" msgid "can't convert '%q' object to %q implicitly" msgstr "Kann '%q' Objekt nicht implizit nach %q konvertieren" +#: extmod/ulab/code/numpy/vector.c +msgid "can't convert complex to float" +msgstr "" + #: py/obj.c msgid "can't convert to %q" msgstr "kann nicht zu %q konvertieren" @@ -2920,6 +2924,14 @@ msgstr "Kann neue shape nicht zuweisen" msgid "cannot cast output with casting rule" msgstr "" +#: extmod/ulab/code/ndarray.c +msgid "cannot convert complex to dtype" +msgstr "" + +#: extmod/ulab/code/ndarray.c +msgid "cannot convert complex type" +msgstr "" + #: py/objtype.c msgid "cannot create '%q' instances" msgstr "Kann '%q' Instanzen nicht erstellen" @@ -3115,6 +3127,10 @@ msgstr "Division durch Null" msgid "divisor must be 4" msgstr "" +#: extmod/ulab/code/numpy/vector.c +msgid "dtype must be float, or complex" +msgstr "" + #: py/objdeque.c msgid "empty" msgstr "leer" @@ -3218,7 +3234,7 @@ msgstr "" msgid "first argument must be a function" msgstr "" -#: extmod/ulab/code/ulab_create.c +#: extmod/ulab/code/numpy/create.c msgid "first argument must be a tuple of ndarrays" msgstr "" @@ -3283,6 +3299,10 @@ msgstr "" msgid "function is defined for ndarrays only" msgstr "" +#: extmod/ulab/code/numpy/carray/carray.c +msgid "function is implemented for ndarrays only" +msgstr "" + #: py/argcheck.c #, c-format msgid "function missing %d required positional arguments" @@ -3398,7 +3418,7 @@ msgstr "inline assembler muss eine function sein" msgid "input and output shapes are not compatible" msgstr "" -#: extmod/ulab/code/ulab_create.c +#: extmod/ulab/code/numpy/create.c msgid "input argument must be an integer, a tuple, or a list" msgstr "das Eingabeargument muss ein Integer, Tupel oder eine Liste sein" @@ -3406,7 +3426,7 @@ msgstr "das Eingabeargument muss ein Integer, Tupel oder eine Liste sein" msgid "input array length must be power of 2" msgstr "Die Länge des Eingabearrays muss eine Potenz von 2 sein" -#: extmod/ulab/code/ulab_create.c +#: extmod/ulab/code/numpy/create.c msgid "input arrays are not compatible" msgstr "Eingabe-Arrays sind nicht kompatibel" @@ -3414,6 +3434,10 @@ msgstr "Eingabe-Arrays sind nicht kompatibel" msgid "input data must be an iterable" msgstr "Eingabedaten müssen iterierbar sein" +#: extmod/ulab/code/numpy/vector.c +msgid "input dtype must be float or complex" +msgstr "" + #: extmod/ulab/code/numpy/linalg/linalg.c msgid "input matrix is asymmetric" msgstr "Eingabematrix ist asymmetrisch" @@ -3423,18 +3447,26 @@ msgstr "Eingabematrix ist asymmetrisch" msgid "input matrix is singular" msgstr "Eingabematrix ist singulär" +#: extmod/ulab/code/numpy/carray/carray.c +msgid "input must be a 1D ndarray" +msgstr "" + #: extmod/ulab/code/scipy/linalg/linalg.c extmod/ulab/code/user/user.c msgid "input must be a dense ndarray" msgstr "" -#: extmod/ulab/code/ulab_create.c +#: extmod/ulab/code/numpy/create.c msgid "input must be a tensor of rank 2" msgstr "" -#: extmod/ulab/code/ulab_create.c extmod/ulab/code/user/user.c +#: extmod/ulab/code/numpy/create.c extmod/ulab/code/user/user.c msgid "input must be an ndarray" msgstr "" +#: extmod/ulab/code/numpy/carray/carray.c +msgid "input must be an ndarray, or a scalar" +msgstr "" + #: extmod/ulab/code/scipy/signal/signal.c msgid "input must be one-dimensional" msgstr "die Eingabe muss ein-Dimensional sein" @@ -3812,7 +3844,11 @@ msgstr "" msgid "not enough arguments for format string" msgstr "Nicht genügend Argumente für den Formatierungs-String" -#: extmod/ulab/code/ulab_create.c +#: extmod/ulab/code/numpy/carray/carray_tools.c +msgid "not implemented for complex dtype" +msgstr "" + +#: extmod/ulab/code/numpy/create.c msgid "number of points must be at least 2" msgstr "Die Anzahl der Punkte muss mindestens 2 betragen" @@ -3870,7 +3906,7 @@ msgstr "Objekt mit Pufferprotokoll (buffer protocol) erforderlich" msgid "odd-length string" msgstr "String mit ungerader Länge" -#: extmod/ulab/code/ulab_create.c extmod/ulab/code/utils/utils.c +#: extmod/ulab/code/numpy/create.c extmod/ulab/code/utils/utils.c msgid "offset is too large" msgstr "" @@ -3878,7 +3914,7 @@ msgstr "" msgid "offset must be >= 0" msgstr "" -#: extmod/ulab/code/ulab_create.c +#: extmod/ulab/code/numpy/create.c msgid "offset must be non-negative and no greater than buffer length" msgstr "" @@ -4363,7 +4399,7 @@ msgstr "" msgid "too many arguments provided with the given format" msgstr "zu viele Argumente mit dem angegebenen Format" -#: extmod/ulab/code/ndarray.c extmod/ulab/code/ulab_create.c +#: extmod/ulab/code/ndarray.c extmod/ulab/code/numpy/create.c msgid "too many dimensions" msgstr "zu viele Dimensionen" @@ -4566,7 +4602,7 @@ msgstr "Fenster muss <= Intervall sein" msgid "wrong axis index" msgstr "falscher Achsenindex" -#: extmod/ulab/code/ulab_create.c +#: extmod/ulab/code/numpy/create.c msgid "wrong axis specified" msgstr "falsche Achse gewählt" @@ -4574,7 +4610,11 @@ msgstr "falsche Achse gewählt" msgid "wrong input type" msgstr "falscher Eingabetyp" -#: extmod/ulab/code/ulab_create.c py/objarray.c py/objstr.c +#: extmod/ulab/code/numpy/transform.c +msgid "wrong length of condition array" +msgstr "" + +#: extmod/ulab/code/numpy/create.c py/objarray.c py/objstr.c msgid "wrong number of arguments" msgstr "falsche Anzahl an Argumenten" diff --git a/locale/el.po b/locale/el.po index 0f32b9174c..aec64bb7cf 100644 --- a/locale/el.po +++ b/locale/el.po @@ -2624,7 +2624,7 @@ msgstr "" msgid "attributes not supported yet" msgstr "" -#: extmod/ulab/code/numpy/numerical.c +#: extmod/ulab/code/ulab_tools.c msgid "axis is out of bounds" msgstr "" @@ -2680,11 +2680,11 @@ msgstr "" msgid "branch not in range" msgstr "" -#: extmod/ulab/code/ulab_create.c extmod/ulab/code/utils/utils.c +#: extmod/ulab/code/numpy/create.c extmod/ulab/code/utils/utils.c msgid "buffer is smaller than requested size" msgstr "" -#: extmod/ulab/code/ulab_create.c extmod/ulab/code/utils/utils.c +#: extmod/ulab/code/numpy/create.c extmod/ulab/code/utils/utils.c msgid "buffer size must be a multiple of element size" msgstr "" @@ -2776,6 +2776,10 @@ msgstr "" msgid "can't convert '%q' object to %q implicitly" msgstr "" +#: extmod/ulab/code/numpy/vector.c +msgid "can't convert complex to float" +msgstr "" + #: py/obj.c msgid "can't convert to %q" msgstr "" @@ -2870,6 +2874,14 @@ msgstr "" msgid "cannot cast output with casting rule" msgstr "" +#: extmod/ulab/code/ndarray.c +msgid "cannot convert complex to dtype" +msgstr "" + +#: extmod/ulab/code/ndarray.c +msgid "cannot convert complex type" +msgstr "" + #: py/objtype.c msgid "cannot create '%q' instances" msgstr "" @@ -3061,6 +3073,10 @@ msgstr "" msgid "divisor must be 4" msgstr "" +#: extmod/ulab/code/numpy/vector.c +msgid "dtype must be float, or complex" +msgstr "" + #: py/objdeque.c msgid "empty" msgstr "" @@ -3164,7 +3180,7 @@ msgstr "" msgid "first argument must be a function" msgstr "" -#: extmod/ulab/code/ulab_create.c +#: extmod/ulab/code/numpy/create.c msgid "first argument must be a tuple of ndarrays" msgstr "" @@ -3229,6 +3245,10 @@ msgstr "" msgid "function is defined for ndarrays only" msgstr "" +#: extmod/ulab/code/numpy/carray/carray.c +msgid "function is implemented for ndarrays only" +msgstr "" + #: py/argcheck.c #, c-format msgid "function missing %d required positional arguments" @@ -3342,7 +3362,7 @@ msgstr "" msgid "input and output shapes are not compatible" msgstr "" -#: extmod/ulab/code/ulab_create.c +#: extmod/ulab/code/numpy/create.c msgid "input argument must be an integer, a tuple, or a list" msgstr "" @@ -3350,7 +3370,7 @@ msgstr "" msgid "input array length must be power of 2" msgstr "" -#: extmod/ulab/code/ulab_create.c +#: extmod/ulab/code/numpy/create.c msgid "input arrays are not compatible" msgstr "" @@ -3358,6 +3378,10 @@ msgstr "" msgid "input data must be an iterable" msgstr "" +#: extmod/ulab/code/numpy/vector.c +msgid "input dtype must be float or complex" +msgstr "" + #: extmod/ulab/code/numpy/linalg/linalg.c msgid "input matrix is asymmetric" msgstr "" @@ -3367,18 +3391,26 @@ msgstr "" msgid "input matrix is singular" msgstr "" +#: extmod/ulab/code/numpy/carray/carray.c +msgid "input must be a 1D ndarray" +msgstr "" + #: extmod/ulab/code/scipy/linalg/linalg.c extmod/ulab/code/user/user.c msgid "input must be a dense ndarray" msgstr "" -#: extmod/ulab/code/ulab_create.c +#: extmod/ulab/code/numpy/create.c msgid "input must be a tensor of rank 2" msgstr "" -#: extmod/ulab/code/ulab_create.c extmod/ulab/code/user/user.c +#: extmod/ulab/code/numpy/create.c extmod/ulab/code/user/user.c msgid "input must be an ndarray" msgstr "" +#: extmod/ulab/code/numpy/carray/carray.c +msgid "input must be an ndarray, or a scalar" +msgstr "" + #: extmod/ulab/code/scipy/signal/signal.c msgid "input must be one-dimensional" msgstr "" @@ -3749,7 +3781,11 @@ msgstr "" msgid "not enough arguments for format string" msgstr "" -#: extmod/ulab/code/ulab_create.c +#: extmod/ulab/code/numpy/carray/carray_tools.c +msgid "not implemented for complex dtype" +msgstr "" + +#: extmod/ulab/code/numpy/create.c msgid "number of points must be at least 2" msgstr "" @@ -3807,7 +3843,7 @@ msgstr "" msgid "odd-length string" msgstr "" -#: extmod/ulab/code/ulab_create.c extmod/ulab/code/utils/utils.c +#: extmod/ulab/code/numpy/create.c extmod/ulab/code/utils/utils.c msgid "offset is too large" msgstr "" @@ -3815,7 +3851,7 @@ msgstr "" msgid "offset must be >= 0" msgstr "" -#: extmod/ulab/code/ulab_create.c +#: extmod/ulab/code/numpy/create.c msgid "offset must be non-negative and no greater than buffer length" msgstr "" @@ -4294,7 +4330,7 @@ msgstr "" msgid "too many arguments provided with the given format" msgstr "" -#: extmod/ulab/code/ndarray.c extmod/ulab/code/ulab_create.c +#: extmod/ulab/code/ndarray.c extmod/ulab/code/numpy/create.c msgid "too many dimensions" msgstr "" @@ -4495,7 +4531,7 @@ msgstr "" msgid "wrong axis index" msgstr "" -#: extmod/ulab/code/ulab_create.c +#: extmod/ulab/code/numpy/create.c msgid "wrong axis specified" msgstr "" @@ -4503,7 +4539,11 @@ msgstr "" msgid "wrong input type" msgstr "" -#: extmod/ulab/code/ulab_create.c py/objarray.c py/objstr.c +#: extmod/ulab/code/numpy/transform.c +msgid "wrong length of condition array" +msgstr "" + +#: extmod/ulab/code/numpy/create.c py/objarray.c py/objstr.c msgid "wrong number of arguments" msgstr "" diff --git a/locale/en_GB.po b/locale/en_GB.po index c7113ab877..5e54a91d83 100644 --- a/locale/en_GB.po +++ b/locale/en_GB.po @@ -2658,7 +2658,7 @@ msgstr "attempt to get argmin/argmax of an empty sequence" msgid "attributes not supported yet" msgstr "attributes not supported yet" -#: extmod/ulab/code/numpy/numerical.c +#: extmod/ulab/code/ulab_tools.c msgid "axis is out of bounds" msgstr "axis is out of bounds" @@ -2714,11 +2714,11 @@ msgstr "bits_per_sample must be 8 or 16" msgid "branch not in range" msgstr "Branch not in range" -#: extmod/ulab/code/ulab_create.c extmod/ulab/code/utils/utils.c +#: extmod/ulab/code/numpy/create.c extmod/ulab/code/utils/utils.c msgid "buffer is smaller than requested size" msgstr "Buffer is smaller than requested size" -#: extmod/ulab/code/ulab_create.c extmod/ulab/code/utils/utils.c +#: extmod/ulab/code/numpy/create.c extmod/ulab/code/utils/utils.c msgid "buffer size must be a multiple of element size" msgstr "Buffer size must be a multiple of element size" @@ -2810,6 +2810,10 @@ msgstr "can't convert %s to complex" msgid "can't convert '%q' object to %q implicitly" msgstr "Can't convert '%q' object to %q implicitly" +#: extmod/ulab/code/numpy/vector.c +msgid "can't convert complex to float" +msgstr "" + #: py/obj.c msgid "can't convert to %q" msgstr "Can't convert to %q" @@ -2906,6 +2910,14 @@ msgstr "cannot assign new shape" msgid "cannot cast output with casting rule" msgstr "can't cast output with casting rule" +#: extmod/ulab/code/ndarray.c +msgid "cannot convert complex to dtype" +msgstr "" + +#: extmod/ulab/code/ndarray.c +msgid "cannot convert complex type" +msgstr "" + #: py/objtype.c msgid "cannot create '%q' instances" msgstr "can't create '%q' instances" @@ -3098,6 +3110,10 @@ msgstr "division by zero" msgid "divisor must be 4" msgstr "" +#: extmod/ulab/code/numpy/vector.c +msgid "dtype must be float, or complex" +msgstr "" + #: py/objdeque.c msgid "empty" msgstr "empty" @@ -3201,7 +3217,7 @@ msgstr "first argument must be a callable" msgid "first argument must be a function" msgstr "first argument must be a function" -#: extmod/ulab/code/ulab_create.c +#: extmod/ulab/code/numpy/create.c msgid "first argument must be a tuple of ndarrays" msgstr "first argument must be a tuple of ndarrays" @@ -3266,6 +3282,10 @@ msgstr "function has the same sign at the ends of interval" msgid "function is defined for ndarrays only" msgstr "function is defined for ndarrays only" +#: extmod/ulab/code/numpy/carray/carray.c +msgid "function is implemented for ndarrays only" +msgstr "" + #: py/argcheck.c #, c-format msgid "function missing %d required positional arguments" @@ -3379,7 +3399,7 @@ msgstr "inline assembler must be a function" msgid "input and output shapes are not compatible" msgstr "input and output shapes are not compatible" -#: extmod/ulab/code/ulab_create.c +#: extmod/ulab/code/numpy/create.c msgid "input argument must be an integer, a tuple, or a list" msgstr "input argument must be an integer, a tuple, or a list" @@ -3387,7 +3407,7 @@ msgstr "input argument must be an integer, a tuple, or a list" msgid "input array length must be power of 2" msgstr "input array length must be power of 2" -#: extmod/ulab/code/ulab_create.c +#: extmod/ulab/code/numpy/create.c msgid "input arrays are not compatible" msgstr "input arrays are not compatible" @@ -3395,6 +3415,10 @@ msgstr "input arrays are not compatible" msgid "input data must be an iterable" msgstr "input data must be an iterable" +#: extmod/ulab/code/numpy/vector.c +msgid "input dtype must be float or complex" +msgstr "" + #: extmod/ulab/code/numpy/linalg/linalg.c msgid "input matrix is asymmetric" msgstr "input matrix is asymmetric" @@ -3404,18 +3428,26 @@ msgstr "input matrix is asymmetric" msgid "input matrix is singular" msgstr "input matrix is singular" +#: extmod/ulab/code/numpy/carray/carray.c +msgid "input must be a 1D ndarray" +msgstr "" + #: 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" -#: extmod/ulab/code/ulab_create.c +#: extmod/ulab/code/numpy/create.c msgid "input must be a tensor of rank 2" msgstr "input must be a tensor of rank 2" -#: extmod/ulab/code/ulab_create.c extmod/ulab/code/user/user.c +#: extmod/ulab/code/numpy/create.c extmod/ulab/code/user/user.c msgid "input must be an ndarray" msgstr "input must be an ndarray" +#: extmod/ulab/code/numpy/carray/carray.c +msgid "input must be an ndarray, or a scalar" +msgstr "" + #: extmod/ulab/code/scipy/signal/signal.c msgid "input must be one-dimensional" msgstr "input must be one-dimensional" @@ -3786,7 +3818,11 @@ msgstr "not all arguments converted during string formatting" msgid "not enough arguments for format string" msgstr "not enough arguments for format string" -#: extmod/ulab/code/ulab_create.c +#: extmod/ulab/code/numpy/carray/carray_tools.c +msgid "not implemented for complex dtype" +msgstr "" + +#: extmod/ulab/code/numpy/create.c msgid "number of points must be at least 2" msgstr "number of points must be at least 2" @@ -3844,7 +3880,7 @@ msgstr "object with buffer protocol required" msgid "odd-length string" msgstr "odd-length string" -#: extmod/ulab/code/ulab_create.c extmod/ulab/code/utils/utils.c +#: extmod/ulab/code/numpy/create.c extmod/ulab/code/utils/utils.c msgid "offset is too large" msgstr "offset is too large" @@ -3852,7 +3888,7 @@ msgstr "offset is too large" msgid "offset must be >= 0" msgstr "offset must be >= 0" -#: extmod/ulab/code/ulab_create.c +#: extmod/ulab/code/numpy/create.c msgid "offset must be non-negative and no greater than buffer length" msgstr "offset must be non-negative and not greater than buffer length" @@ -4333,7 +4369,7 @@ msgstr "tobytes can be invoked for dense arrays only" msgid "too many arguments provided with the given format" msgstr "too many arguments provided with the given format" -#: extmod/ulab/code/ndarray.c extmod/ulab/code/ulab_create.c +#: extmod/ulab/code/ndarray.c extmod/ulab/code/numpy/create.c msgid "too many dimensions" msgstr "too many dimensions" @@ -4534,7 +4570,7 @@ msgstr "window must be <= interval" msgid "wrong axis index" msgstr "wrong axis index" -#: extmod/ulab/code/ulab_create.c +#: extmod/ulab/code/numpy/create.c msgid "wrong axis specified" msgstr "wrong axis specified" @@ -4542,7 +4578,11 @@ msgstr "wrong axis specified" msgid "wrong input type" msgstr "wrong input type" -#: extmod/ulab/code/ulab_create.c py/objarray.c py/objstr.c +#: extmod/ulab/code/numpy/transform.c +msgid "wrong length of condition array" +msgstr "" + +#: extmod/ulab/code/numpy/create.c py/objarray.c py/objstr.c msgid "wrong number of arguments" msgstr "wrong number of arguments" diff --git a/locale/es.po b/locale/es.po index 0d9c53db5d..15b32afa1d 100644 --- a/locale/es.po +++ b/locale/es.po @@ -2693,7 +2693,7 @@ msgstr "intento de obtener argmin/argmax de una secuencia vacía" msgid "attributes not supported yet" msgstr "atributos aún no soportados" -#: extmod/ulab/code/numpy/numerical.c +#: extmod/ulab/code/ulab_tools.c msgid "axis is out of bounds" msgstr "Eje está fuera de sus límites" @@ -2749,11 +2749,11 @@ msgstr "bits_per_sample debe ser 8 ó 16" msgid "branch not in range" msgstr "la rama no está dentro del rango" -#: extmod/ulab/code/ulab_create.c extmod/ulab/code/utils/utils.c +#: extmod/ulab/code/numpy/create.c extmod/ulab/code/utils/utils.c msgid "buffer is smaller than requested size" msgstr "El buffer es mas pequeño que el requerido" -#: extmod/ulab/code/ulab_create.c extmod/ulab/code/utils/utils.c +#: extmod/ulab/code/numpy/create.c extmod/ulab/code/utils/utils.c msgid "buffer size must be a multiple of element size" msgstr "El tamaño del buffer debe ser un múltiplo del tamaño del elemento" @@ -2845,6 +2845,10 @@ msgstr "no se puede convertir %s a complejo" msgid "can't convert '%q' object to %q implicitly" msgstr "no se puede convertir el objeto '%q' a %q implícitamente" +#: extmod/ulab/code/numpy/vector.c +msgid "can't convert complex to float" +msgstr "" + #: py/obj.c msgid "can't convert to %q" msgstr "no puede convertir a %q" @@ -2944,6 +2948,14 @@ msgstr "" msgid "cannot cast output with casting rule" msgstr "No se puede realizar cast de la salida sin una regla de cast" +#: extmod/ulab/code/ndarray.c +msgid "cannot convert complex to dtype" +msgstr "" + +#: extmod/ulab/code/ndarray.c +msgid "cannot convert complex type" +msgstr "" + #: py/objtype.c msgid "cannot create '%q' instances" msgstr "no se pueden crear '%q' instancias" @@ -3137,6 +3149,10 @@ msgstr "división por cero" msgid "divisor must be 4" msgstr "" +#: extmod/ulab/code/numpy/vector.c +msgid "dtype must be float, or complex" +msgstr "" + #: py/objdeque.c msgid "empty" msgstr "vacío" @@ -3240,7 +3256,7 @@ msgstr "se debe poder llamar al primer argumento" msgid "first argument must be a function" msgstr "el primer argumento debe ser una función" -#: extmod/ulab/code/ulab_create.c +#: extmod/ulab/code/numpy/create.c msgid "first argument must be a tuple of ndarrays" msgstr "Primer argumento tiene que ser una tupla de ndarrays" @@ -3305,6 +3321,10 @@ msgstr "la función tiene el mismo signo a extremos del intervalo" msgid "function is defined for ndarrays only" msgstr "Función solo definida para ndarrays" +#: extmod/ulab/code/numpy/carray/carray.c +msgid "function is implemented for ndarrays only" +msgstr "" + #: py/argcheck.c #, c-format msgid "function missing %d required positional arguments" @@ -3418,7 +3438,7 @@ msgstr "ensamblador en línea debe ser una función" msgid "input and output shapes are not compatible" msgstr "Formas de entrada y salida no son compatibles" -#: extmod/ulab/code/ulab_create.c +#: extmod/ulab/code/numpy/create.c msgid "input argument must be an integer, a tuple, or a list" msgstr "argumento de entrada debe ser un entero, una tupla o una lista" @@ -3426,7 +3446,7 @@ msgstr "argumento de entrada debe ser un entero, una tupla o una lista" msgid "input array length must be power of 2" msgstr "el tamaño del arreglo de entrada debe ser potencia de 2" -#: extmod/ulab/code/ulab_create.c +#: extmod/ulab/code/numpy/create.c msgid "input arrays are not compatible" msgstr "Arrays de entrada no son compactibles" @@ -3434,6 +3454,10 @@ msgstr "Arrays de entrada no son compactibles" msgid "input data must be an iterable" msgstr "los datos de entrada deben ser iterables" +#: extmod/ulab/code/numpy/vector.c +msgid "input dtype must be float or complex" +msgstr "" + #: extmod/ulab/code/numpy/linalg/linalg.c msgid "input matrix is asymmetric" msgstr "la matriz de entrada es asimétrica" @@ -3443,18 +3467,26 @@ msgstr "la matriz de entrada es asimétrica" msgid "input matrix is singular" msgstr "la matriz de entrada es singular" +#: extmod/ulab/code/numpy/carray/carray.c +msgid "input must be a 1D ndarray" +msgstr "" + #: 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" -#: extmod/ulab/code/ulab_create.c +#: extmod/ulab/code/numpy/create.c msgid "input must be a tensor of rank 2" msgstr "Entrada tiene que ser un tensor de rango 2" -#: extmod/ulab/code/ulab_create.c extmod/ulab/code/user/user.c +#: extmod/ulab/code/numpy/create.c extmod/ulab/code/user/user.c msgid "input must be an ndarray" msgstr "Entrada tiene que ser un ndarray" +#: extmod/ulab/code/numpy/carray/carray.c +msgid "input must be an ndarray, or a scalar" +msgstr "" + #: extmod/ulab/code/scipy/signal/signal.c msgid "input must be one-dimensional" msgstr "Entrada tiene que ser unidimensional" @@ -3832,7 +3864,11 @@ msgstr "" msgid "not enough arguments for format string" msgstr "no suficientes argumentos para format string" -#: extmod/ulab/code/ulab_create.c +#: extmod/ulab/code/numpy/carray/carray_tools.c +msgid "not implemented for complex dtype" +msgstr "" + +#: extmod/ulab/code/numpy/create.c msgid "number of points must be at least 2" msgstr "el número de puntos debe ser al menos 2" @@ -3890,7 +3926,7 @@ msgstr "objeto con protocolo de buffer requerido" msgid "odd-length string" msgstr "string de longitud impar" -#: extmod/ulab/code/ulab_create.c extmod/ulab/code/utils/utils.c +#: extmod/ulab/code/numpy/create.c extmod/ulab/code/utils/utils.c msgid "offset is too large" msgstr "offset es demasiado grande" @@ -3898,7 +3934,7 @@ msgstr "offset es demasiado grande" msgid "offset must be >= 0" msgstr "offset debe ser >= 0" -#: extmod/ulab/code/ulab_create.c +#: extmod/ulab/code/numpy/create.c msgid "offset must be non-negative and no greater than buffer length" msgstr "offset debe ser non-negative y no mayo que la longitud del buffer" @@ -4380,7 +4416,7 @@ msgstr "tobytes solo pueden ser invocados por arrays densos" msgid "too many arguments provided with the given format" msgstr "demasiados argumentos provistos con el formato dado" -#: extmod/ulab/code/ndarray.c extmod/ulab/code/ulab_create.c +#: extmod/ulab/code/ndarray.c extmod/ulab/code/numpy/create.c msgid "too many dimensions" msgstr "demasiadas dimensiones" @@ -4581,7 +4617,7 @@ msgstr "la ventana debe ser <= intervalo" msgid "wrong axis index" msgstr "indice de eje erróneo" -#: extmod/ulab/code/ulab_create.c +#: extmod/ulab/code/numpy/create.c msgid "wrong axis specified" msgstr "eje especificado erróneo" @@ -4589,7 +4625,11 @@ msgstr "eje especificado erróneo" msgid "wrong input type" msgstr "tipo de entrada incorrecta" -#: extmod/ulab/code/ulab_create.c py/objarray.c py/objstr.c +#: extmod/ulab/code/numpy/transform.c +msgid "wrong length of condition array" +msgstr "" + +#: extmod/ulab/code/numpy/create.c py/objarray.c py/objstr.c msgid "wrong number of arguments" msgstr "numero erroneo de argumentos" diff --git a/locale/fil.po b/locale/fil.po index ee707c460a..5d2a737d7f 100644 --- a/locale/fil.po +++ b/locale/fil.po @@ -2646,7 +2646,7 @@ msgstr "" msgid "attributes not supported yet" msgstr "attributes hindi sinusuportahan" -#: extmod/ulab/code/numpy/numerical.c +#: extmod/ulab/code/ulab_tools.c msgid "axis is out of bounds" msgstr "" @@ -2702,11 +2702,11 @@ msgstr "bits_per_sample ay dapat 8 o 16" msgid "branch not in range" msgstr "branch wala sa range" -#: extmod/ulab/code/ulab_create.c extmod/ulab/code/utils/utils.c +#: extmod/ulab/code/numpy/create.c extmod/ulab/code/utils/utils.c msgid "buffer is smaller than requested size" msgstr "" -#: extmod/ulab/code/ulab_create.c extmod/ulab/code/utils/utils.c +#: extmod/ulab/code/numpy/create.c extmod/ulab/code/utils/utils.c msgid "buffer size must be a multiple of element size" msgstr "" @@ -2800,6 +2800,10 @@ msgstr "hindi ma-convert %s sa complex" msgid "can't convert '%q' object to %q implicitly" msgstr "hindi maaaring i-convert ang '%q' na bagay sa %q nang walang pahiwatig" +#: extmod/ulab/code/numpy/vector.c +msgid "can't convert complex to float" +msgstr "" + #: py/obj.c msgid "can't convert to %q" msgstr "" @@ -2899,6 +2903,14 @@ msgstr "" msgid "cannot cast output with casting rule" msgstr "" +#: extmod/ulab/code/ndarray.c +msgid "cannot convert complex to dtype" +msgstr "" + +#: extmod/ulab/code/ndarray.c +msgid "cannot convert complex type" +msgstr "" + #: py/objtype.c msgid "cannot create '%q' instances" msgstr "hindi magawa '%q' instances" @@ -3094,6 +3106,10 @@ msgstr "dibisyon ng zero" msgid "divisor must be 4" msgstr "" +#: extmod/ulab/code/numpy/vector.c +msgid "dtype must be float, or complex" +msgstr "" + #: py/objdeque.c msgid "empty" msgstr "walang laman" @@ -3198,7 +3214,7 @@ msgstr "" msgid "first argument must be a function" msgstr "" -#: extmod/ulab/code/ulab_create.c +#: extmod/ulab/code/numpy/create.c msgid "first argument must be a tuple of ndarrays" msgstr "" @@ -3263,6 +3279,10 @@ msgstr "" msgid "function is defined for ndarrays only" msgstr "" +#: extmod/ulab/code/numpy/carray/carray.c +msgid "function is implemented for ndarrays only" +msgstr "" + #: py/argcheck.c #, c-format msgid "function missing %d required positional arguments" @@ -3377,7 +3397,7 @@ msgstr "inline assembler ay dapat na function" msgid "input and output shapes are not compatible" msgstr "" -#: extmod/ulab/code/ulab_create.c +#: extmod/ulab/code/numpy/create.c msgid "input argument must be an integer, a tuple, or a list" msgstr "" @@ -3385,7 +3405,7 @@ msgstr "" msgid "input array length must be power of 2" msgstr "" -#: extmod/ulab/code/ulab_create.c +#: extmod/ulab/code/numpy/create.c msgid "input arrays are not compatible" msgstr "" @@ -3393,6 +3413,10 @@ msgstr "" msgid "input data must be an iterable" msgstr "" +#: extmod/ulab/code/numpy/vector.c +msgid "input dtype must be float or complex" +msgstr "" + #: extmod/ulab/code/numpy/linalg/linalg.c msgid "input matrix is asymmetric" msgstr "" @@ -3402,18 +3426,26 @@ msgstr "" msgid "input matrix is singular" msgstr "" +#: extmod/ulab/code/numpy/carray/carray.c +msgid "input must be a 1D ndarray" +msgstr "" + #: extmod/ulab/code/scipy/linalg/linalg.c extmod/ulab/code/user/user.c msgid "input must be a dense ndarray" msgstr "" -#: extmod/ulab/code/ulab_create.c +#: extmod/ulab/code/numpy/create.c msgid "input must be a tensor of rank 2" msgstr "" -#: extmod/ulab/code/ulab_create.c extmod/ulab/code/user/user.c +#: extmod/ulab/code/numpy/create.c extmod/ulab/code/user/user.c msgid "input must be an ndarray" msgstr "" +#: extmod/ulab/code/numpy/carray/carray.c +msgid "input must be an ndarray, or a scalar" +msgstr "" + #: extmod/ulab/code/scipy/signal/signal.c msgid "input must be one-dimensional" msgstr "" @@ -3788,7 +3820,11 @@ msgstr "hindi lahat ng arguments na i-convert habang string formatting" msgid "not enough arguments for format string" msgstr "kulang sa arguments para sa format string" -#: extmod/ulab/code/ulab_create.c +#: extmod/ulab/code/numpy/carray/carray_tools.c +msgid "not implemented for complex dtype" +msgstr "" + +#: extmod/ulab/code/numpy/create.c msgid "number of points must be at least 2" msgstr "" @@ -3846,7 +3882,7 @@ msgstr "object na may buffer protocol kinakailangan" msgid "odd-length string" msgstr "odd-length string" -#: extmod/ulab/code/ulab_create.c extmod/ulab/code/utils/utils.c +#: extmod/ulab/code/numpy/create.c extmod/ulab/code/utils/utils.c msgid "offset is too large" msgstr "" @@ -3854,7 +3890,7 @@ msgstr "" msgid "offset must be >= 0" msgstr "" -#: extmod/ulab/code/ulab_create.c +#: extmod/ulab/code/numpy/create.c msgid "offset must be non-negative and no greater than buffer length" msgstr "" @@ -4339,7 +4375,7 @@ msgstr "" msgid "too many arguments provided with the given format" msgstr "masyadong maraming mga argumento na ibinigay sa ibinigay na format" -#: extmod/ulab/code/ndarray.c extmod/ulab/code/ulab_create.c +#: extmod/ulab/code/ndarray.c extmod/ulab/code/numpy/create.c msgid "too many dimensions" msgstr "" @@ -4540,7 +4576,7 @@ msgstr "" msgid "wrong axis index" msgstr "" -#: extmod/ulab/code/ulab_create.c +#: extmod/ulab/code/numpy/create.c msgid "wrong axis specified" msgstr "" @@ -4548,7 +4584,11 @@ msgstr "" msgid "wrong input type" msgstr "" -#: extmod/ulab/code/ulab_create.c py/objarray.c py/objstr.c +#: extmod/ulab/code/numpy/transform.c +msgid "wrong length of condition array" +msgstr "" + +#: extmod/ulab/code/numpy/create.c py/objarray.c py/objstr.c msgid "wrong number of arguments" msgstr "mali ang bilang ng argumento" diff --git a/locale/fr.po b/locale/fr.po index b8b968a4fe..dd9b524aed 100644 --- a/locale/fr.po +++ b/locale/fr.po @@ -2716,7 +2716,7 @@ msgstr "tenter d'obtenir argmin / argmax d'une séquence vide" msgid "attributes not supported yet" msgstr "attribut pas encore supporté" -#: extmod/ulab/code/numpy/numerical.c +#: extmod/ulab/code/ulab_tools.c msgid "axis is out of bounds" msgstr "axis est hors limites" @@ -2772,11 +2772,11 @@ msgstr "'bits_per_sample' doivent être 8 ou 16" msgid "branch not in range" msgstr "branche hors-bornes" -#: extmod/ulab/code/ulab_create.c extmod/ulab/code/utils/utils.c +#: extmod/ulab/code/numpy/create.c extmod/ulab/code/utils/utils.c msgid "buffer is smaller than requested size" msgstr "tampon est plus petit que la taille demandée" -#: extmod/ulab/code/ulab_create.c extmod/ulab/code/utils/utils.c +#: extmod/ulab/code/numpy/create.c extmod/ulab/code/utils/utils.c msgid "buffer size must be a multiple of element size" msgstr "taille du tampon doit être un multiple de la taille de l'élement" @@ -2869,6 +2869,10 @@ msgstr "ne peut convertir %s en nombre complexe" msgid "can't convert '%q' object to %q implicitly" msgstr "impossible de convertir l'objet '%q' en '%q' implicitement" +#: extmod/ulab/code/numpy/vector.c +msgid "can't convert complex to float" +msgstr "" + #: py/obj.c msgid "can't convert to %q" msgstr "impossible de convertir en %q" @@ -2969,6 +2973,14 @@ msgstr "ne peut assigner une nouvelle forme" msgid "cannot cast output with casting rule" msgstr "output ne peut être projeté sans règle de projection" +#: extmod/ulab/code/ndarray.c +msgid "cannot convert complex to dtype" +msgstr "" + +#: extmod/ulab/code/ndarray.c +msgid "cannot convert complex type" +msgstr "" + #: py/objtype.c msgid "cannot create '%q' instances" msgstr "ne peut pas créer une instance de '%q'" @@ -3164,6 +3176,10 @@ msgstr "division par zéro" msgid "divisor must be 4" msgstr "le diviseur doit être 4" +#: extmod/ulab/code/numpy/vector.c +msgid "dtype must be float, or complex" +msgstr "" + #: py/objdeque.c msgid "empty" msgstr "vide" @@ -3267,7 +3283,7 @@ msgstr "le premier argument doit être un appelable" msgid "first argument must be a function" msgstr "le premier argument doit être une fonction" -#: extmod/ulab/code/ulab_create.c +#: extmod/ulab/code/numpy/create.c msgid "first argument must be a tuple of ndarrays" msgstr "le premier paramêtre doit être un tuple de ndarrays" @@ -3332,6 +3348,10 @@ msgstr "la fonction a le même signe aux extrémités de l’intervalle" msgid "function is defined for ndarrays only" msgstr "fonction définie que pour les ndarrays" +#: extmod/ulab/code/numpy/carray/carray.c +msgid "function is implemented for ndarrays only" +msgstr "" + #: py/argcheck.c #, c-format msgid "function missing %d required positional arguments" @@ -3446,7 +3466,7 @@ msgstr "l'assembleur doit être une fonction" msgid "input and output shapes are not compatible" msgstr "les formes d'entrée et de sortie ne sont pas compatibles" -#: extmod/ulab/code/ulab_create.c +#: extmod/ulab/code/numpy/create.c msgid "input argument must be an integer, a tuple, or a list" msgstr "Paramètre entrant doit être un chiffre entier, un tuple, ou une liste" @@ -3454,7 +3474,7 @@ msgstr "Paramètre entrant doit être un chiffre entier, un tuple, ou une liste" msgid "input array length must be power of 2" msgstr "longueur de la matrice d'entrée doit être une puissance de 2" -#: extmod/ulab/code/ulab_create.c +#: extmod/ulab/code/numpy/create.c msgid "input arrays are not compatible" msgstr "les matrices d'entrée ne sont pas compatibles" @@ -3462,6 +3482,10 @@ msgstr "les matrices d'entrée ne sont pas compatibles" msgid "input data must be an iterable" msgstr "les données d'entrée doivent être un itérable" +#: extmod/ulab/code/numpy/vector.c +msgid "input dtype must be float or complex" +msgstr "" + #: extmod/ulab/code/numpy/linalg/linalg.c msgid "input matrix is asymmetric" msgstr "la matrice d'entrée est asymétrique" @@ -3471,18 +3495,26 @@ msgstr "la matrice d'entrée est asymétrique" msgid "input matrix is singular" msgstr "la matrice d'entrée est singulière" +#: extmod/ulab/code/numpy/carray/carray.c +msgid "input must be a 1D ndarray" +msgstr "" + #: 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" -#: extmod/ulab/code/ulab_create.c +#: extmod/ulab/code/numpy/create.c msgid "input must be a tensor of rank 2" msgstr "l'entrée doit être un tenseur de rang 2" -#: extmod/ulab/code/ulab_create.c extmod/ulab/code/user/user.c +#: extmod/ulab/code/numpy/create.c extmod/ulab/code/user/user.c msgid "input must be an ndarray" msgstr "l'entrée doit être un ndarray" +#: extmod/ulab/code/numpy/carray/carray.c +msgid "input must be an ndarray, or a scalar" +msgstr "" + #: extmod/ulab/code/scipy/signal/signal.c msgid "input must be one-dimensional" msgstr "l'entrée doit être uni-dimensionelle" @@ -3860,7 +3892,11 @@ msgstr "" msgid "not enough arguments for format string" msgstr "pas assez d'arguments pour la chaîne de format" -#: extmod/ulab/code/ulab_create.c +#: extmod/ulab/code/numpy/carray/carray_tools.c +msgid "not implemented for complex dtype" +msgstr "" + +#: extmod/ulab/code/numpy/create.c msgid "number of points must be at least 2" msgstr "le nombre de points doit être d'au moins 2" @@ -3918,7 +3954,7 @@ msgstr "un objet avec un protocole de tampon est nécessaire" msgid "odd-length string" msgstr "chaîne de longueur impaire" -#: extmod/ulab/code/ulab_create.c extmod/ulab/code/utils/utils.c +#: extmod/ulab/code/numpy/create.c extmod/ulab/code/utils/utils.c msgid "offset is too large" msgstr "offset est trop large" @@ -3926,7 +3962,7 @@ msgstr "offset est trop large" msgid "offset must be >= 0" msgstr "offset doit être >= 0" -#: extmod/ulab/code/ulab_create.c +#: extmod/ulab/code/numpy/create.c msgid "offset must be non-negative and no greater than buffer length" msgstr "offset doit être non-négatif, et au plus la taille du tampon" @@ -4411,7 +4447,7 @@ msgstr "tobytes ne peut être appelée que pour des matrices dense" msgid "too many arguments provided with the given format" msgstr "trop d'arguments fournis avec ce format" -#: extmod/ulab/code/ndarray.c extmod/ulab/code/ulab_create.c +#: extmod/ulab/code/ndarray.c extmod/ulab/code/numpy/create.c msgid "too many dimensions" msgstr "Trop de dimensions" @@ -4612,7 +4648,7 @@ msgstr "la fenêtre (window) doit être <= intervalle (interval)" msgid "wrong axis index" msgstr "index d'axe incorrecte" -#: extmod/ulab/code/ulab_create.c +#: extmod/ulab/code/numpy/create.c msgid "wrong axis specified" msgstr "axe incorrecte spécifiée" @@ -4620,7 +4656,11 @@ msgstr "axe incorrecte spécifiée" msgid "wrong input type" msgstr "type d'entrée incorrect" -#: extmod/ulab/code/ulab_create.c py/objarray.c py/objstr.c +#: extmod/ulab/code/numpy/transform.c +msgid "wrong length of condition array" +msgstr "" + +#: extmod/ulab/code/numpy/create.c py/objarray.c py/objstr.c msgid "wrong number of arguments" msgstr "mauvais nombres d'arguments" diff --git a/locale/hi.po b/locale/hi.po index be5f5347ff..7b2ad4a3ef 100644 --- a/locale/hi.po +++ b/locale/hi.po @@ -2624,7 +2624,7 @@ msgstr "" msgid "attributes not supported yet" msgstr "" -#: extmod/ulab/code/numpy/numerical.c +#: extmod/ulab/code/ulab_tools.c msgid "axis is out of bounds" msgstr "" @@ -2680,11 +2680,11 @@ msgstr "" msgid "branch not in range" msgstr "" -#: extmod/ulab/code/ulab_create.c extmod/ulab/code/utils/utils.c +#: extmod/ulab/code/numpy/create.c extmod/ulab/code/utils/utils.c msgid "buffer is smaller than requested size" msgstr "" -#: extmod/ulab/code/ulab_create.c extmod/ulab/code/utils/utils.c +#: extmod/ulab/code/numpy/create.c extmod/ulab/code/utils/utils.c msgid "buffer size must be a multiple of element size" msgstr "" @@ -2776,6 +2776,10 @@ msgstr "" msgid "can't convert '%q' object to %q implicitly" msgstr "" +#: extmod/ulab/code/numpy/vector.c +msgid "can't convert complex to float" +msgstr "" + #: py/obj.c msgid "can't convert to %q" msgstr "" @@ -2870,6 +2874,14 @@ msgstr "" msgid "cannot cast output with casting rule" msgstr "" +#: extmod/ulab/code/ndarray.c +msgid "cannot convert complex to dtype" +msgstr "" + +#: extmod/ulab/code/ndarray.c +msgid "cannot convert complex type" +msgstr "" + #: py/objtype.c msgid "cannot create '%q' instances" msgstr "" @@ -3061,6 +3073,10 @@ msgstr "" msgid "divisor must be 4" msgstr "" +#: extmod/ulab/code/numpy/vector.c +msgid "dtype must be float, or complex" +msgstr "" + #: py/objdeque.c msgid "empty" msgstr "" @@ -3164,7 +3180,7 @@ msgstr "" msgid "first argument must be a function" msgstr "" -#: extmod/ulab/code/ulab_create.c +#: extmod/ulab/code/numpy/create.c msgid "first argument must be a tuple of ndarrays" msgstr "" @@ -3229,6 +3245,10 @@ msgstr "" msgid "function is defined for ndarrays only" msgstr "" +#: extmod/ulab/code/numpy/carray/carray.c +msgid "function is implemented for ndarrays only" +msgstr "" + #: py/argcheck.c #, c-format msgid "function missing %d required positional arguments" @@ -3342,7 +3362,7 @@ msgstr "" msgid "input and output shapes are not compatible" msgstr "" -#: extmod/ulab/code/ulab_create.c +#: extmod/ulab/code/numpy/create.c msgid "input argument must be an integer, a tuple, or a list" msgstr "" @@ -3350,7 +3370,7 @@ msgstr "" msgid "input array length must be power of 2" msgstr "" -#: extmod/ulab/code/ulab_create.c +#: extmod/ulab/code/numpy/create.c msgid "input arrays are not compatible" msgstr "" @@ -3358,6 +3378,10 @@ msgstr "" msgid "input data must be an iterable" msgstr "" +#: extmod/ulab/code/numpy/vector.c +msgid "input dtype must be float or complex" +msgstr "" + #: extmod/ulab/code/numpy/linalg/linalg.c msgid "input matrix is asymmetric" msgstr "" @@ -3367,18 +3391,26 @@ msgstr "" msgid "input matrix is singular" msgstr "" +#: extmod/ulab/code/numpy/carray/carray.c +msgid "input must be a 1D ndarray" +msgstr "" + #: extmod/ulab/code/scipy/linalg/linalg.c extmod/ulab/code/user/user.c msgid "input must be a dense ndarray" msgstr "" -#: extmod/ulab/code/ulab_create.c +#: extmod/ulab/code/numpy/create.c msgid "input must be a tensor of rank 2" msgstr "" -#: extmod/ulab/code/ulab_create.c extmod/ulab/code/user/user.c +#: extmod/ulab/code/numpy/create.c extmod/ulab/code/user/user.c msgid "input must be an ndarray" msgstr "" +#: extmod/ulab/code/numpy/carray/carray.c +msgid "input must be an ndarray, or a scalar" +msgstr "" + #: extmod/ulab/code/scipy/signal/signal.c msgid "input must be one-dimensional" msgstr "" @@ -3749,7 +3781,11 @@ msgstr "" msgid "not enough arguments for format string" msgstr "" -#: extmod/ulab/code/ulab_create.c +#: extmod/ulab/code/numpy/carray/carray_tools.c +msgid "not implemented for complex dtype" +msgstr "" + +#: extmod/ulab/code/numpy/create.c msgid "number of points must be at least 2" msgstr "" @@ -3807,7 +3843,7 @@ msgstr "" msgid "odd-length string" msgstr "" -#: extmod/ulab/code/ulab_create.c extmod/ulab/code/utils/utils.c +#: extmod/ulab/code/numpy/create.c extmod/ulab/code/utils/utils.c msgid "offset is too large" msgstr "" @@ -3815,7 +3851,7 @@ msgstr "" msgid "offset must be >= 0" msgstr "" -#: extmod/ulab/code/ulab_create.c +#: extmod/ulab/code/numpy/create.c msgid "offset must be non-negative and no greater than buffer length" msgstr "" @@ -4294,7 +4330,7 @@ msgstr "" msgid "too many arguments provided with the given format" msgstr "" -#: extmod/ulab/code/ndarray.c extmod/ulab/code/ulab_create.c +#: extmod/ulab/code/ndarray.c extmod/ulab/code/numpy/create.c msgid "too many dimensions" msgstr "" @@ -4495,7 +4531,7 @@ msgstr "" msgid "wrong axis index" msgstr "" -#: extmod/ulab/code/ulab_create.c +#: extmod/ulab/code/numpy/create.c msgid "wrong axis specified" msgstr "" @@ -4503,7 +4539,11 @@ msgstr "" msgid "wrong input type" msgstr "" -#: extmod/ulab/code/ulab_create.c py/objarray.c py/objstr.c +#: extmod/ulab/code/numpy/transform.c +msgid "wrong length of condition array" +msgstr "" + +#: extmod/ulab/code/numpy/create.c py/objarray.c py/objstr.c msgid "wrong number of arguments" msgstr "" diff --git a/locale/it_IT.po b/locale/it_IT.po index 4196da915c..6c5007f00c 100644 --- a/locale/it_IT.po +++ b/locale/it_IT.po @@ -2665,7 +2665,7 @@ msgstr "" msgid "attributes not supported yet" msgstr "attributi non ancora supportati" -#: extmod/ulab/code/numpy/numerical.c +#: extmod/ulab/code/ulab_tools.c msgid "axis is out of bounds" msgstr "" @@ -2723,11 +2723,11 @@ msgstr "i bit devono essere 7, 8 o 9" msgid "branch not in range" msgstr "argomento di chr() non è in range(256)" -#: extmod/ulab/code/ulab_create.c extmod/ulab/code/utils/utils.c +#: extmod/ulab/code/numpy/create.c extmod/ulab/code/utils/utils.c msgid "buffer is smaller than requested size" msgstr "" -#: extmod/ulab/code/ulab_create.c extmod/ulab/code/utils/utils.c +#: extmod/ulab/code/numpy/create.c extmod/ulab/code/utils/utils.c msgid "buffer size must be a multiple of element size" msgstr "" @@ -2821,6 +2821,10 @@ msgstr "non è possibile convertire a complex" msgid "can't convert '%q' object to %q implicitly" msgstr "impossibile convertire l'oggetto '%q' implicitamente in %q" +#: extmod/ulab/code/numpy/vector.c +msgid "can't convert complex to float" +msgstr "" + #: py/obj.c msgid "can't convert to %q" msgstr "" @@ -2915,6 +2919,14 @@ msgstr "" msgid "cannot cast output with casting rule" msgstr "" +#: extmod/ulab/code/ndarray.c +msgid "cannot convert complex to dtype" +msgstr "" + +#: extmod/ulab/code/ndarray.c +msgid "cannot convert complex type" +msgstr "" + #: py/objtype.c msgid "cannot create '%q' instances" msgstr "creare '%q' istanze" @@ -3111,6 +3123,10 @@ msgstr "divisione per zero" msgid "divisor must be 4" msgstr "" +#: extmod/ulab/code/numpy/vector.c +msgid "dtype must be float, or complex" +msgstr "" + #: py/objdeque.c msgid "empty" msgstr "vuoto" @@ -3215,7 +3231,7 @@ msgstr "" msgid "first argument must be a function" msgstr "" -#: extmod/ulab/code/ulab_create.c +#: extmod/ulab/code/numpy/create.c msgid "first argument must be a tuple of ndarrays" msgstr "" @@ -3280,6 +3296,10 @@ msgstr "" msgid "function is defined for ndarrays only" msgstr "" +#: extmod/ulab/code/numpy/carray/carray.c +msgid "function is implemented for ndarrays only" +msgstr "" + #: py/argcheck.c #, c-format msgid "function missing %d required positional arguments" @@ -3394,7 +3414,7 @@ msgstr "inline assembler deve essere una funzione" msgid "input and output shapes are not compatible" msgstr "" -#: extmod/ulab/code/ulab_create.c +#: extmod/ulab/code/numpy/create.c msgid "input argument must be an integer, a tuple, or a list" msgstr "" @@ -3402,7 +3422,7 @@ msgstr "" msgid "input array length must be power of 2" msgstr "" -#: extmod/ulab/code/ulab_create.c +#: extmod/ulab/code/numpy/create.c msgid "input arrays are not compatible" msgstr "" @@ -3410,6 +3430,10 @@ msgstr "" msgid "input data must be an iterable" msgstr "" +#: extmod/ulab/code/numpy/vector.c +msgid "input dtype must be float or complex" +msgstr "" + #: extmod/ulab/code/numpy/linalg/linalg.c msgid "input matrix is asymmetric" msgstr "" @@ -3419,18 +3443,26 @@ msgstr "" msgid "input matrix is singular" msgstr "" +#: extmod/ulab/code/numpy/carray/carray.c +msgid "input must be a 1D ndarray" +msgstr "" + #: extmod/ulab/code/scipy/linalg/linalg.c extmod/ulab/code/user/user.c msgid "input must be a dense ndarray" msgstr "" -#: extmod/ulab/code/ulab_create.c +#: extmod/ulab/code/numpy/create.c msgid "input must be a tensor of rank 2" msgstr "" -#: extmod/ulab/code/ulab_create.c extmod/ulab/code/user/user.c +#: extmod/ulab/code/numpy/create.c extmod/ulab/code/user/user.c msgid "input must be an ndarray" msgstr "" +#: extmod/ulab/code/numpy/carray/carray.c +msgid "input must be an ndarray, or a scalar" +msgstr "" + #: extmod/ulab/code/scipy/signal/signal.c msgid "input must be one-dimensional" msgstr "" @@ -3808,7 +3840,11 @@ msgstr "" msgid "not enough arguments for format string" msgstr "argomenti non sufficienti per la stringa di formattazione" -#: extmod/ulab/code/ulab_create.c +#: extmod/ulab/code/numpy/carray/carray_tools.c +msgid "not implemented for complex dtype" +msgstr "" + +#: extmod/ulab/code/numpy/create.c msgid "number of points must be at least 2" msgstr "" @@ -3866,7 +3902,7 @@ msgstr "" msgid "odd-length string" msgstr "stringa di lunghezza dispari" -#: extmod/ulab/code/ulab_create.c extmod/ulab/code/utils/utils.c +#: extmod/ulab/code/numpy/create.c extmod/ulab/code/utils/utils.c msgid "offset is too large" msgstr "" @@ -3874,7 +3910,7 @@ msgstr "" msgid "offset must be >= 0" msgstr "" -#: extmod/ulab/code/ulab_create.c +#: extmod/ulab/code/numpy/create.c msgid "offset must be non-negative and no greater than buffer length" msgstr "" @@ -4361,7 +4397,7 @@ msgstr "" msgid "too many arguments provided with the given format" msgstr "troppi argomenti forniti con il formato specificato" -#: extmod/ulab/code/ndarray.c extmod/ulab/code/ulab_create.c +#: extmod/ulab/code/ndarray.c extmod/ulab/code/numpy/create.c msgid "too many dimensions" msgstr "" @@ -4562,7 +4598,7 @@ msgstr "" msgid "wrong axis index" msgstr "" -#: extmod/ulab/code/ulab_create.c +#: extmod/ulab/code/numpy/create.c msgid "wrong axis specified" msgstr "" @@ -4570,7 +4606,11 @@ msgstr "" msgid "wrong input type" msgstr "" -#: extmod/ulab/code/ulab_create.c py/objarray.c py/objstr.c +#: extmod/ulab/code/numpy/transform.c +msgid "wrong length of condition array" +msgstr "" + +#: extmod/ulab/code/numpy/create.c py/objarray.c py/objstr.c msgid "wrong number of arguments" msgstr "numero di argomenti errato" diff --git a/locale/ja.po b/locale/ja.po index 8912a4c0ed..56e524a99d 100644 --- a/locale/ja.po +++ b/locale/ja.po @@ -2639,7 +2639,7 @@ msgstr "" msgid "attributes not supported yet" msgstr "属性は未対応です" -#: extmod/ulab/code/numpy/numerical.c +#: extmod/ulab/code/ulab_tools.c msgid "axis is out of bounds" msgstr "" @@ -2695,11 +2695,11 @@ msgstr "bits_per_sampleは8または16でなければなりません" msgid "branch not in range" msgstr "" -#: extmod/ulab/code/ulab_create.c extmod/ulab/code/utils/utils.c +#: extmod/ulab/code/numpy/create.c extmod/ulab/code/utils/utils.c msgid "buffer is smaller than requested size" msgstr "" -#: extmod/ulab/code/ulab_create.c extmod/ulab/code/utils/utils.c +#: extmod/ulab/code/numpy/create.c extmod/ulab/code/utils/utils.c msgid "buffer size must be a multiple of element size" msgstr "" @@ -2791,6 +2791,10 @@ msgstr "" msgid "can't convert '%q' object to %q implicitly" msgstr "オブジェクト '%q' を %q に暗黙に変換できません" +#: extmod/ulab/code/numpy/vector.c +msgid "can't convert complex to float" +msgstr "" + #: py/obj.c msgid "can't convert to %q" msgstr "%q に変換できません" @@ -2885,6 +2889,14 @@ msgstr "" msgid "cannot cast output with casting rule" msgstr "" +#: extmod/ulab/code/ndarray.c +msgid "cannot convert complex to dtype" +msgstr "" + +#: extmod/ulab/code/ndarray.c +msgid "cannot convert complex type" +msgstr "" + #: py/objtype.c msgid "cannot create '%q' instances" msgstr "" @@ -3080,6 +3092,10 @@ msgstr "ゼロ除算 (division by zero)" msgid "divisor must be 4" msgstr "" +#: extmod/ulab/code/numpy/vector.c +msgid "dtype must be float, or complex" +msgstr "" + #: py/objdeque.c msgid "empty" msgstr "" @@ -3183,7 +3199,7 @@ msgstr "1つ目の引数は呼び出し可能でなければなりません" msgid "first argument must be a function" msgstr "1つ目の引数は関数でなければなりません" -#: extmod/ulab/code/ulab_create.c +#: extmod/ulab/code/numpy/create.c msgid "first argument must be a tuple of ndarrays" msgstr "" @@ -3248,6 +3264,10 @@ msgstr "" msgid "function is defined for ndarrays only" msgstr "" +#: extmod/ulab/code/numpy/carray/carray.c +msgid "function is implemented for ndarrays only" +msgstr "" + #: py/argcheck.c #, c-format msgid "function missing %d required positional arguments" @@ -3362,7 +3382,7 @@ msgstr "インラインアセンブラは関数でなければなりません" msgid "input and output shapes are not compatible" msgstr "" -#: extmod/ulab/code/ulab_create.c +#: extmod/ulab/code/numpy/create.c msgid "input argument must be an integer, a tuple, or a list" msgstr "" @@ -3370,7 +3390,7 @@ msgstr "" msgid "input array length must be power of 2" msgstr "入力array長は2の累乗でなければなりません" -#: extmod/ulab/code/ulab_create.c +#: extmod/ulab/code/numpy/create.c msgid "input arrays are not compatible" msgstr "" @@ -3378,6 +3398,10 @@ msgstr "" msgid "input data must be an iterable" msgstr "" +#: extmod/ulab/code/numpy/vector.c +msgid "input dtype must be float or complex" +msgstr "" + #: extmod/ulab/code/numpy/linalg/linalg.c msgid "input matrix is asymmetric" msgstr "入力行列が非対称" @@ -3387,18 +3411,26 @@ msgstr "入力行列が非対称" msgid "input matrix is singular" msgstr "入力が非正則行列" +#: extmod/ulab/code/numpy/carray/carray.c +msgid "input must be a 1D ndarray" +msgstr "" + #: extmod/ulab/code/scipy/linalg/linalg.c extmod/ulab/code/user/user.c msgid "input must be a dense ndarray" msgstr "" -#: extmod/ulab/code/ulab_create.c +#: extmod/ulab/code/numpy/create.c msgid "input must be a tensor of rank 2" msgstr "" -#: extmod/ulab/code/ulab_create.c extmod/ulab/code/user/user.c +#: extmod/ulab/code/numpy/create.c extmod/ulab/code/user/user.c msgid "input must be an ndarray" msgstr "" +#: extmod/ulab/code/numpy/carray/carray.c +msgid "input must be an ndarray, or a scalar" +msgstr "" + #: extmod/ulab/code/scipy/signal/signal.c msgid "input must be one-dimensional" msgstr "" @@ -3769,7 +3801,11 @@ msgstr "文字列書式化で全ての引数が使われていません" msgid "not enough arguments for format string" msgstr "書式化文字列への引数が足りません" -#: extmod/ulab/code/ulab_create.c +#: extmod/ulab/code/numpy/carray/carray_tools.c +msgid "not implemented for complex dtype" +msgstr "" + +#: extmod/ulab/code/numpy/create.c msgid "number of points must be at least 2" msgstr "" @@ -3827,7 +3863,7 @@ msgstr "" msgid "odd-length string" msgstr "奇数長の文字列" -#: extmod/ulab/code/ulab_create.c extmod/ulab/code/utils/utils.c +#: extmod/ulab/code/numpy/create.c extmod/ulab/code/utils/utils.c msgid "offset is too large" msgstr "" @@ -3835,7 +3871,7 @@ msgstr "" msgid "offset must be >= 0" msgstr "" -#: extmod/ulab/code/ulab_create.c +#: extmod/ulab/code/numpy/create.c msgid "offset must be non-negative and no greater than buffer length" msgstr "" @@ -4317,7 +4353,7 @@ msgstr "" msgid "too many arguments provided with the given format" msgstr "指定された書式に対して引数が多すぎます" -#: extmod/ulab/code/ndarray.c extmod/ulab/code/ulab_create.c +#: extmod/ulab/code/ndarray.c extmod/ulab/code/numpy/create.c msgid "too many dimensions" msgstr "" @@ -4518,7 +4554,7 @@ msgstr "windowはinterval以下でなければなりません" msgid "wrong axis index" msgstr "" -#: extmod/ulab/code/ulab_create.c +#: extmod/ulab/code/numpy/create.c msgid "wrong axis specified" msgstr "" @@ -4526,7 +4562,11 @@ msgstr "" msgid "wrong input type" msgstr "" -#: extmod/ulab/code/ulab_create.c py/objarray.c py/objstr.c +#: extmod/ulab/code/numpy/transform.c +msgid "wrong length of condition array" +msgstr "" + +#: extmod/ulab/code/numpy/create.c py/objarray.c py/objstr.c msgid "wrong number of arguments" msgstr "" diff --git a/locale/ko.po b/locale/ko.po index 4b7d06bcf7..fc35104af5 100644 --- a/locale/ko.po +++ b/locale/ko.po @@ -2628,7 +2628,7 @@ msgstr "" msgid "attributes not supported yet" msgstr "" -#: extmod/ulab/code/numpy/numerical.c +#: extmod/ulab/code/ulab_tools.c msgid "axis is out of bounds" msgstr "" @@ -2684,11 +2684,11 @@ msgstr "bits_per_sample은 8 또는 16이어야합니다." msgid "branch not in range" msgstr "" -#: extmod/ulab/code/ulab_create.c extmod/ulab/code/utils/utils.c +#: extmod/ulab/code/numpy/create.c extmod/ulab/code/utils/utils.c msgid "buffer is smaller than requested size" msgstr "" -#: extmod/ulab/code/ulab_create.c extmod/ulab/code/utils/utils.c +#: extmod/ulab/code/numpy/create.c extmod/ulab/code/utils/utils.c msgid "buffer size must be a multiple of element size" msgstr "" @@ -2780,6 +2780,10 @@ msgstr "" msgid "can't convert '%q' object to %q implicitly" msgstr "" +#: extmod/ulab/code/numpy/vector.c +msgid "can't convert complex to float" +msgstr "" + #: py/obj.c msgid "can't convert to %q" msgstr "" @@ -2874,6 +2878,14 @@ msgstr "" msgid "cannot cast output with casting rule" msgstr "" +#: extmod/ulab/code/ndarray.c +msgid "cannot convert complex to dtype" +msgstr "" + +#: extmod/ulab/code/ndarray.c +msgid "cannot convert complex type" +msgstr "" + #: py/objtype.c msgid "cannot create '%q' instances" msgstr "" @@ -3065,6 +3077,10 @@ msgstr "" msgid "divisor must be 4" msgstr "" +#: extmod/ulab/code/numpy/vector.c +msgid "dtype must be float, or complex" +msgstr "" + #: py/objdeque.c msgid "empty" msgstr "" @@ -3168,7 +3184,7 @@ msgstr "" msgid "first argument must be a function" msgstr "" -#: extmod/ulab/code/ulab_create.c +#: extmod/ulab/code/numpy/create.c msgid "first argument must be a tuple of ndarrays" msgstr "" @@ -3233,6 +3249,10 @@ msgstr "" msgid "function is defined for ndarrays only" msgstr "" +#: extmod/ulab/code/numpy/carray/carray.c +msgid "function is implemented for ndarrays only" +msgstr "" + #: py/argcheck.c #, c-format msgid "function missing %d required positional arguments" @@ -3346,7 +3366,7 @@ msgstr "" msgid "input and output shapes are not compatible" msgstr "" -#: extmod/ulab/code/ulab_create.c +#: extmod/ulab/code/numpy/create.c msgid "input argument must be an integer, a tuple, or a list" msgstr "" @@ -3354,7 +3374,7 @@ msgstr "" msgid "input array length must be power of 2" msgstr "" -#: extmod/ulab/code/ulab_create.c +#: extmod/ulab/code/numpy/create.c msgid "input arrays are not compatible" msgstr "" @@ -3362,6 +3382,10 @@ msgstr "" msgid "input data must be an iterable" msgstr "" +#: extmod/ulab/code/numpy/vector.c +msgid "input dtype must be float or complex" +msgstr "" + #: extmod/ulab/code/numpy/linalg/linalg.c msgid "input matrix is asymmetric" msgstr "" @@ -3371,18 +3395,26 @@ msgstr "" msgid "input matrix is singular" msgstr "" +#: extmod/ulab/code/numpy/carray/carray.c +msgid "input must be a 1D ndarray" +msgstr "" + #: extmod/ulab/code/scipy/linalg/linalg.c extmod/ulab/code/user/user.c msgid "input must be a dense ndarray" msgstr "" -#: extmod/ulab/code/ulab_create.c +#: extmod/ulab/code/numpy/create.c msgid "input must be a tensor of rank 2" msgstr "" -#: extmod/ulab/code/ulab_create.c extmod/ulab/code/user/user.c +#: extmod/ulab/code/numpy/create.c extmod/ulab/code/user/user.c msgid "input must be an ndarray" msgstr "" +#: extmod/ulab/code/numpy/carray/carray.c +msgid "input must be an ndarray, or a scalar" +msgstr "" + #: extmod/ulab/code/scipy/signal/signal.c msgid "input must be one-dimensional" msgstr "" @@ -3753,7 +3785,11 @@ msgstr "" msgid "not enough arguments for format string" msgstr "" -#: extmod/ulab/code/ulab_create.c +#: extmod/ulab/code/numpy/carray/carray_tools.c +msgid "not implemented for complex dtype" +msgstr "" + +#: extmod/ulab/code/numpy/create.c msgid "number of points must be at least 2" msgstr "" @@ -3811,7 +3847,7 @@ msgstr "" msgid "odd-length string" msgstr "" -#: extmod/ulab/code/ulab_create.c extmod/ulab/code/utils/utils.c +#: extmod/ulab/code/numpy/create.c extmod/ulab/code/utils/utils.c msgid "offset is too large" msgstr "" @@ -3819,7 +3855,7 @@ msgstr "" msgid "offset must be >= 0" msgstr "" -#: extmod/ulab/code/ulab_create.c +#: extmod/ulab/code/numpy/create.c msgid "offset must be non-negative and no greater than buffer length" msgstr "" @@ -4298,7 +4334,7 @@ msgstr "" msgid "too many arguments provided with the given format" msgstr "" -#: extmod/ulab/code/ndarray.c extmod/ulab/code/ulab_create.c +#: extmod/ulab/code/ndarray.c extmod/ulab/code/numpy/create.c msgid "too many dimensions" msgstr "" @@ -4499,7 +4535,7 @@ msgstr "" msgid "wrong axis index" msgstr "" -#: extmod/ulab/code/ulab_create.c +#: extmod/ulab/code/numpy/create.c msgid "wrong axis specified" msgstr "" @@ -4507,7 +4543,11 @@ msgstr "" msgid "wrong input type" msgstr "" -#: extmod/ulab/code/ulab_create.c py/objarray.c py/objstr.c +#: extmod/ulab/code/numpy/transform.c +msgid "wrong length of condition array" +msgstr "" + +#: extmod/ulab/code/numpy/create.c py/objarray.c py/objstr.c msgid "wrong number of arguments" msgstr "" diff --git a/locale/nl.po b/locale/nl.po index a83b35c007..e83c1e2618 100644 --- a/locale/nl.po +++ b/locale/nl.po @@ -2656,7 +2656,7 @@ msgstr "poging om argmin/argmax van een lege sequentie te krijgen" msgid "attributes not supported yet" msgstr "attributen nog niet ondersteund" -#: extmod/ulab/code/numpy/numerical.c +#: extmod/ulab/code/ulab_tools.c msgid "axis is out of bounds" msgstr "as is buiten bereik" @@ -2712,11 +2712,11 @@ msgstr "bits_per_sample moet 8 of 16 zijn" msgid "branch not in range" msgstr "pad (branch) niet binnen bereik" -#: extmod/ulab/code/ulab_create.c extmod/ulab/code/utils/utils.c +#: extmod/ulab/code/numpy/create.c extmod/ulab/code/utils/utils.c msgid "buffer is smaller than requested size" msgstr "" -#: extmod/ulab/code/ulab_create.c extmod/ulab/code/utils/utils.c +#: extmod/ulab/code/numpy/create.c extmod/ulab/code/utils/utils.c msgid "buffer size must be a multiple of element size" msgstr "" @@ -2809,6 +2809,10 @@ msgstr "kan %s niet converteren naar een complex" msgid "can't convert '%q' object to %q implicitly" msgstr "kan '%q' object niet omzetten naar %q impliciet" +#: extmod/ulab/code/numpy/vector.c +msgid "can't convert complex to float" +msgstr "" + #: py/obj.c msgid "can't convert to %q" msgstr "kan niet naar %q converteren" @@ -2903,6 +2907,14 @@ msgstr "" msgid "cannot cast output with casting rule" msgstr "kan uitvoer niet converteren zonder conversieregel" +#: extmod/ulab/code/ndarray.c +msgid "cannot convert complex to dtype" +msgstr "" + +#: extmod/ulab/code/ndarray.c +msgid "cannot convert complex type" +msgstr "" + #: py/objtype.c msgid "cannot create '%q' instances" msgstr "kan geen instanties van '%q' creëren" @@ -3097,6 +3109,10 @@ msgstr "deling door nul" msgid "divisor must be 4" msgstr "" +#: extmod/ulab/code/numpy/vector.c +msgid "dtype must be float, or complex" +msgstr "" + #: py/objdeque.c msgid "empty" msgstr "leeg" @@ -3200,7 +3216,7 @@ msgstr "eerste argument moet een aanroepbare (callable) zijn" msgid "first argument must be a function" msgstr "eerste argument moet een functie zijn" -#: extmod/ulab/code/ulab_create.c +#: extmod/ulab/code/numpy/create.c msgid "first argument must be a tuple of ndarrays" msgstr "eerste argument moet een tupel van ndarrays zijn" @@ -3265,6 +3281,10 @@ msgstr "functie heeft hetzelfde teken aan beide uiteinden van het interval" msgid "function is defined for ndarrays only" msgstr "functie is alleen gedefinieerd voor ndarrays" +#: extmod/ulab/code/numpy/carray/carray.c +msgid "function is implemented for ndarrays only" +msgstr "" + #: py/argcheck.c #, c-format msgid "function missing %d required positional arguments" @@ -3379,7 +3399,7 @@ msgstr "inline assembler moet een functie zijn" msgid "input and output shapes are not compatible" msgstr "in- en uitvoervormen zijn niet compatibel" -#: extmod/ulab/code/ulab_create.c +#: extmod/ulab/code/numpy/create.c msgid "input argument must be an integer, a tuple, or a list" msgstr "" @@ -3387,7 +3407,7 @@ msgstr "" msgid "input array length must be power of 2" msgstr "invoer array lengte moet een macht van 2 zijn" -#: extmod/ulab/code/ulab_create.c +#: extmod/ulab/code/numpy/create.c msgid "input arrays are not compatible" msgstr "input arrays zijn niet compatibel" @@ -3395,6 +3415,10 @@ msgstr "input arrays zijn niet compatibel" msgid "input data must be an iterable" msgstr "invoerdata moet itereerbaar zijn" +#: extmod/ulab/code/numpy/vector.c +msgid "input dtype must be float or complex" +msgstr "" + #: extmod/ulab/code/numpy/linalg/linalg.c msgid "input matrix is asymmetric" msgstr "invoermatrix is asymmetrisch" @@ -3404,18 +3428,26 @@ msgstr "invoermatrix is asymmetrisch" msgid "input matrix is singular" msgstr "invoermatrix is singulier" +#: extmod/ulab/code/numpy/carray/carray.c +msgid "input must be a 1D ndarray" +msgstr "" + #: 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" -#: extmod/ulab/code/ulab_create.c +#: extmod/ulab/code/numpy/create.c msgid "input must be a tensor of rank 2" msgstr "invoer moet een tensor van rang 2 zijn" -#: extmod/ulab/code/ulab_create.c extmod/ulab/code/user/user.c +#: extmod/ulab/code/numpy/create.c extmod/ulab/code/user/user.c msgid "input must be an ndarray" msgstr "invoer moet een ndarray zijn" +#: extmod/ulab/code/numpy/carray/carray.c +msgid "input must be an ndarray, or a scalar" +msgstr "" + #: extmod/ulab/code/scipy/signal/signal.c msgid "input must be one-dimensional" msgstr "invoer moet eendimensionaal zijn" @@ -3789,7 +3821,11 @@ msgstr "niet alle argumenten omgezet bij formattering van string" msgid "not enough arguments for format string" msgstr "niet genoeg argumenten om string te formatteren" -#: extmod/ulab/code/ulab_create.c +#: extmod/ulab/code/numpy/carray/carray_tools.c +msgid "not implemented for complex dtype" +msgstr "" + +#: extmod/ulab/code/numpy/create.c msgid "number of points must be at least 2" msgstr "aantal punten moet minimaal 2 zijn" @@ -3847,7 +3883,7 @@ msgstr "object met buffer protocol vereist" msgid "odd-length string" msgstr "string met oneven lengte" -#: extmod/ulab/code/ulab_create.c extmod/ulab/code/utils/utils.c +#: extmod/ulab/code/numpy/create.c extmod/ulab/code/utils/utils.c msgid "offset is too large" msgstr "compensatie is te groot" @@ -3855,7 +3891,7 @@ msgstr "compensatie is te groot" msgid "offset must be >= 0" msgstr "compensatie moet groter of gelijk 0 zijn" -#: extmod/ulab/code/ulab_create.c +#: extmod/ulab/code/numpy/create.c msgid "offset must be non-negative and no greater than buffer length" msgstr "" @@ -4337,7 +4373,7 @@ msgstr "tobytes kunnen alleen ingeroepen worden voor gesloten arrays" msgid "too many arguments provided with the given format" msgstr "te veel argumenten opgegeven bij dit formaat" -#: extmod/ulab/code/ndarray.c extmod/ulab/code/ulab_create.c +#: extmod/ulab/code/ndarray.c extmod/ulab/code/numpy/create.c msgid "too many dimensions" msgstr "" @@ -4538,7 +4574,7 @@ msgstr "window moet <= interval zijn" msgid "wrong axis index" msgstr "foute index voor as" -#: extmod/ulab/code/ulab_create.c +#: extmod/ulab/code/numpy/create.c msgid "wrong axis specified" msgstr "onjuiste as gespecificeerd" @@ -4546,7 +4582,11 @@ msgstr "onjuiste as gespecificeerd" msgid "wrong input type" msgstr "onjuist invoertype" -#: extmod/ulab/code/ulab_create.c py/objarray.c py/objstr.c +#: extmod/ulab/code/numpy/transform.c +msgid "wrong length of condition array" +msgstr "" + +#: extmod/ulab/code/numpy/create.c py/objarray.c py/objstr.c msgid "wrong number of arguments" msgstr "onjuist aantal argumenten" diff --git a/locale/pl.po b/locale/pl.po index f440f4cac6..a9f4460ba8 100644 --- a/locale/pl.po +++ b/locale/pl.po @@ -2635,7 +2635,7 @@ msgstr "" msgid "attributes not supported yet" msgstr "atrybuty nie są jeszcze obsługiwane" -#: extmod/ulab/code/numpy/numerical.c +#: extmod/ulab/code/ulab_tools.c msgid "axis is out of bounds" msgstr "" @@ -2691,11 +2691,11 @@ msgstr "bits_per_sample musi być 8 lub 16" msgid "branch not in range" msgstr "skok poza zakres" -#: extmod/ulab/code/ulab_create.c extmod/ulab/code/utils/utils.c +#: extmod/ulab/code/numpy/create.c extmod/ulab/code/utils/utils.c msgid "buffer is smaller than requested size" msgstr "" -#: extmod/ulab/code/ulab_create.c extmod/ulab/code/utils/utils.c +#: extmod/ulab/code/numpy/create.c extmod/ulab/code/utils/utils.c msgid "buffer size must be a multiple of element size" msgstr "" @@ -2787,6 +2787,10 @@ msgstr "nie można skonwertować %s do complex" msgid "can't convert '%q' object to %q implicitly" msgstr "nie można automatycznie skonwertować '%q' do '%q'" +#: extmod/ulab/code/numpy/vector.c +msgid "can't convert complex to float" +msgstr "" + #: py/obj.c msgid "can't convert to %q" msgstr "" @@ -2881,6 +2885,14 @@ msgstr "" msgid "cannot cast output with casting rule" msgstr "" +#: extmod/ulab/code/ndarray.c +msgid "cannot convert complex to dtype" +msgstr "" + +#: extmod/ulab/code/ndarray.c +msgid "cannot convert complex type" +msgstr "" + #: py/objtype.c msgid "cannot create '%q' instances" msgstr "nie można tworzyć instancji '%q'" @@ -3073,6 +3085,10 @@ msgstr "dzielenie przez zero" msgid "divisor must be 4" msgstr "" +#: extmod/ulab/code/numpy/vector.c +msgid "dtype must be float, or complex" +msgstr "" + #: py/objdeque.c msgid "empty" msgstr "puste" @@ -3176,7 +3192,7 @@ msgstr "" msgid "first argument must be a function" msgstr "pierwszy argument musi być funkcją" -#: extmod/ulab/code/ulab_create.c +#: extmod/ulab/code/numpy/create.c msgid "first argument must be a tuple of ndarrays" msgstr "" @@ -3241,6 +3257,10 @@ msgstr "" msgid "function is defined for ndarrays only" msgstr "" +#: extmod/ulab/code/numpy/carray/carray.c +msgid "function is implemented for ndarrays only" +msgstr "" + #: py/argcheck.c #, c-format msgid "function missing %d required positional arguments" @@ -3354,7 +3374,7 @@ msgstr "wtrącony asembler musi być funkcją" msgid "input and output shapes are not compatible" msgstr "" -#: extmod/ulab/code/ulab_create.c +#: extmod/ulab/code/numpy/create.c msgid "input argument must be an integer, a tuple, or a list" msgstr "" @@ -3362,7 +3382,7 @@ msgstr "" msgid "input array length must be power of 2" msgstr "długość tablicy wejściowej musi być potęgą 2" -#: extmod/ulab/code/ulab_create.c +#: extmod/ulab/code/numpy/create.c msgid "input arrays are not compatible" msgstr "" @@ -3370,6 +3390,10 @@ msgstr "" msgid "input data must be an iterable" msgstr "" +#: extmod/ulab/code/numpy/vector.c +msgid "input dtype must be float or complex" +msgstr "" + #: extmod/ulab/code/numpy/linalg/linalg.c msgid "input matrix is asymmetric" msgstr "" @@ -3379,18 +3403,26 @@ msgstr "" msgid "input matrix is singular" msgstr "" +#: extmod/ulab/code/numpy/carray/carray.c +msgid "input must be a 1D ndarray" +msgstr "" + #: extmod/ulab/code/scipy/linalg/linalg.c extmod/ulab/code/user/user.c msgid "input must be a dense ndarray" msgstr "" -#: extmod/ulab/code/ulab_create.c +#: extmod/ulab/code/numpy/create.c msgid "input must be a tensor of rank 2" msgstr "" -#: extmod/ulab/code/ulab_create.c extmod/ulab/code/user/user.c +#: extmod/ulab/code/numpy/create.c extmod/ulab/code/user/user.c msgid "input must be an ndarray" msgstr "" +#: extmod/ulab/code/numpy/carray/carray.c +msgid "input must be an ndarray, or a scalar" +msgstr "" + #: extmod/ulab/code/scipy/signal/signal.c msgid "input must be one-dimensional" msgstr "" @@ -3761,7 +3793,11 @@ msgstr "nie wszystkie argumenty wykorzystane w formatowaniu" msgid "not enough arguments for format string" msgstr "nie dość argumentów przy formatowaniu" -#: extmod/ulab/code/ulab_create.c +#: extmod/ulab/code/numpy/carray/carray_tools.c +msgid "not implemented for complex dtype" +msgstr "" + +#: extmod/ulab/code/numpy/create.c msgid "number of points must be at least 2" msgstr "liczba punktów musi wynosić co najmniej 2" @@ -3819,7 +3855,7 @@ msgstr "wymagany obiekt z protokołem buforu" msgid "odd-length string" msgstr "łańcuch o nieparzystej długości" -#: extmod/ulab/code/ulab_create.c extmod/ulab/code/utils/utils.c +#: extmod/ulab/code/numpy/create.c extmod/ulab/code/utils/utils.c msgid "offset is too large" msgstr "" @@ -3827,7 +3863,7 @@ msgstr "" msgid "offset must be >= 0" msgstr "" -#: extmod/ulab/code/ulab_create.c +#: extmod/ulab/code/numpy/create.c msgid "offset must be non-negative and no greater than buffer length" msgstr "" @@ -4308,7 +4344,7 @@ msgstr "" msgid "too many arguments provided with the given format" msgstr "zbyt wiele argumentów podanych dla tego formatu" -#: extmod/ulab/code/ndarray.c extmod/ulab/code/ulab_create.c +#: extmod/ulab/code/ndarray.c extmod/ulab/code/numpy/create.c msgid "too many dimensions" msgstr "" @@ -4509,7 +4545,7 @@ msgstr "" msgid "wrong axis index" msgstr "" -#: extmod/ulab/code/ulab_create.c +#: extmod/ulab/code/numpy/create.c msgid "wrong axis specified" msgstr "" @@ -4517,7 +4553,11 @@ msgstr "" msgid "wrong input type" msgstr "nieprawidłowy typ wejścia" -#: extmod/ulab/code/ulab_create.c py/objarray.c py/objstr.c +#: extmod/ulab/code/numpy/transform.c +msgid "wrong length of condition array" +msgstr "" + +#: extmod/ulab/code/numpy/create.c py/objarray.c py/objstr.c msgid "wrong number of arguments" msgstr "zła liczba argumentów" diff --git a/locale/pt_BR.po b/locale/pt_BR.po index 69e237d5aa..317b409726 100644 --- a/locale/pt_BR.po +++ b/locale/pt_BR.po @@ -2708,7 +2708,7 @@ msgstr "tente obter argmin/argmax de uma sequência vazia" msgid "attributes not supported yet" msgstr "atributos ainda não suportados" -#: extmod/ulab/code/numpy/numerical.c +#: extmod/ulab/code/ulab_tools.c msgid "axis is out of bounds" msgstr "o eixo está fora dos limites" @@ -2764,11 +2764,11 @@ msgstr "bits_per_sample deve ser 8 ou 16" msgid "branch not in range" msgstr "ramo fora do alcance" -#: extmod/ulab/code/ulab_create.c extmod/ulab/code/utils/utils.c +#: extmod/ulab/code/numpy/create.c extmod/ulab/code/utils/utils.c msgid "buffer is smaller than requested size" msgstr "o tamanho do buffer é menor do que o tamanho que foi solicitado" -#: extmod/ulab/code/ulab_create.c extmod/ulab/code/utils/utils.c +#: extmod/ulab/code/numpy/create.c extmod/ulab/code/utils/utils.c msgid "buffer size must be a multiple of element size" msgstr "o tamanho do buffer deve ser um múltiplo do tamanho do elemento" @@ -2860,6 +2860,10 @@ msgstr "Não é possível converter %s para complex" msgid "can't convert '%q' object to %q implicitly" msgstr "não é possível converter implicitamente o objeto '%q' para %q" +#: extmod/ulab/code/numpy/vector.c +msgid "can't convert complex to float" +msgstr "" + #: py/obj.c msgid "can't convert to %q" msgstr "não é possível converter para %q" @@ -2958,6 +2962,14 @@ msgstr "não é possível atribuir uma nova forma" msgid "cannot cast output with casting rule" msgstr "não pode lançar a saída com a regra de fundição" +#: extmod/ulab/code/ndarray.c +msgid "cannot convert complex to dtype" +msgstr "" + +#: extmod/ulab/code/ndarray.c +msgid "cannot convert complex type" +msgstr "" + #: py/objtype.c msgid "cannot create '%q' instances" msgstr "não é possível criar instâncias '%q'" @@ -3154,6 +3166,10 @@ msgstr "divisão por zero" msgid "divisor must be 4" msgstr "o divisor deve ser 4" +#: extmod/ulab/code/numpy/vector.c +msgid "dtype must be float, or complex" +msgstr "" + #: py/objdeque.c msgid "empty" msgstr "vazio" @@ -3257,7 +3273,7 @@ msgstr "o primeiro argumento deve ser chamável" msgid "first argument must be a function" msgstr "o primeiro argumento deve ser uma função" -#: extmod/ulab/code/ulab_create.c +#: extmod/ulab/code/numpy/create.c msgid "first argument must be a tuple of ndarrays" msgstr "o primeiro argumento deve ser um tuple de ndarrays" @@ -3322,6 +3338,10 @@ msgstr "a função tem o mesmo sinal nas extremidades do intervalo" msgid "function is defined for ndarrays only" msgstr "A função é definida apenas para ndarrays" +#: extmod/ulab/code/numpy/carray/carray.c +msgid "function is implemented for ndarrays only" +msgstr "" + #: py/argcheck.c #, c-format msgid "function missing %d required positional arguments" @@ -3435,7 +3455,7 @@ msgstr "o assembler em linha deve ser uma função" msgid "input and output shapes are not compatible" msgstr "as formas de entrada e saída não são compatíveis" -#: extmod/ulab/code/ulab_create.c +#: extmod/ulab/code/numpy/create.c msgid "input argument must be an integer, a tuple, or a list" msgstr "" "argumento da entrada deve ser um número inteiro, uma tupla ou uma lista" @@ -3444,7 +3464,7 @@ msgstr "" msgid "input array length must be power of 2" msgstr "comprimento da matriz da entrada deve ter potência de 2" -#: extmod/ulab/code/ulab_create.c +#: extmod/ulab/code/numpy/create.c msgid "input arrays are not compatible" msgstr "as matrizes da entrada não são compatíveis" @@ -3452,6 +3472,10 @@ msgstr "as matrizes da entrada não são compatíveis" msgid "input data must be an iterable" msgstr "os dados da entrada devem ser iteráveis" +#: extmod/ulab/code/numpy/vector.c +msgid "input dtype must be float or complex" +msgstr "" + #: extmod/ulab/code/numpy/linalg/linalg.c msgid "input matrix is asymmetric" msgstr "a matriz da entrada é assimétrica" @@ -3461,18 +3485,26 @@ msgstr "a matriz da entrada é assimétrica" msgid "input matrix is singular" msgstr "a matriz da entrada é singular" +#: extmod/ulab/code/numpy/carray/carray.c +msgid "input must be a 1D ndarray" +msgstr "" + #: 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" -#: extmod/ulab/code/ulab_create.c +#: extmod/ulab/code/numpy/create.c msgid "input must be a tensor of rank 2" msgstr "a entrada dos dados deve ser um tensor de nível 2" -#: extmod/ulab/code/ulab_create.c extmod/ulab/code/user/user.c +#: extmod/ulab/code/numpy/create.c extmod/ulab/code/user/user.c msgid "input must be an ndarray" msgstr "a entrada deve ser um ndarray" +#: extmod/ulab/code/numpy/carray/carray.c +msgid "input must be an ndarray, or a scalar" +msgstr "" + #: extmod/ulab/code/scipy/signal/signal.c msgid "input must be one-dimensional" msgstr "a entrada deve ser unidimensional" @@ -3848,7 +3880,11 @@ msgstr "nem todos os argumentos são convertidos durante a formatação da strin msgid "not enough arguments for format string" msgstr "argumentos insuficientes para o formato da string" -#: extmod/ulab/code/ulab_create.c +#: extmod/ulab/code/numpy/carray/carray_tools.c +msgid "not implemented for complex dtype" +msgstr "" + +#: extmod/ulab/code/numpy/create.c msgid "number of points must be at least 2" msgstr "a quantidade dos pontos deve ser pelo menos 2" @@ -3906,7 +3942,7 @@ msgstr "é necessário objeto com protocolo do buffer" msgid "odd-length string" msgstr "sequência com comprimento ímpar" -#: extmod/ulab/code/ulab_create.c extmod/ulab/code/utils/utils.c +#: extmod/ulab/code/numpy/create.c extmod/ulab/code/utils/utils.c msgid "offset is too large" msgstr "o offset é muito grande" @@ -3914,7 +3950,7 @@ msgstr "o offset é muito grande" msgid "offset must be >= 0" msgstr "o offset deve ser >= 0" -#: extmod/ulab/code/ulab_create.c +#: extmod/ulab/code/numpy/create.c msgid "offset must be non-negative and no greater than buffer length" msgstr "o offset deve ser positivo e não maior do que o comprimento do buffer" @@ -4400,7 +4436,7 @@ msgstr "os tobytes podem ser invocados apenas nas matrizes densas" msgid "too many arguments provided with the given format" msgstr "Muitos argumentos fornecidos com o formato dado" -#: extmod/ulab/code/ndarray.c extmod/ulab/code/ulab_create.c +#: extmod/ulab/code/ndarray.c extmod/ulab/code/numpy/create.c msgid "too many dimensions" msgstr "dimensões demais" @@ -4601,7 +4637,7 @@ msgstr "a janela deve ser <= intervalo" msgid "wrong axis index" msgstr "índice do eixo errado" -#: extmod/ulab/code/ulab_create.c +#: extmod/ulab/code/numpy/create.c msgid "wrong axis specified" msgstr "um eixo errado foi definido" @@ -4609,7 +4645,11 @@ msgstr "um eixo errado foi definido" msgid "wrong input type" msgstr "tipo da entrada incorreta" -#: extmod/ulab/code/ulab_create.c py/objarray.c py/objstr.c +#: extmod/ulab/code/numpy/transform.c +msgid "wrong length of condition array" +msgstr "" + +#: extmod/ulab/code/numpy/create.c py/objarray.c py/objstr.c msgid "wrong number of arguments" msgstr "quantidade errada dos argumentos" diff --git a/locale/ru.po b/locale/ru.po index cbd2d6634c..af6e5c3822 100644 --- a/locale/ru.po +++ b/locale/ru.po @@ -2679,7 +2679,7 @@ msgstr "" msgid "attributes not supported yet" msgstr "" -#: extmod/ulab/code/numpy/numerical.c +#: extmod/ulab/code/ulab_tools.c msgid "axis is out of bounds" msgstr "" @@ -2735,11 +2735,11 @@ msgstr "" msgid "branch not in range" msgstr "" -#: extmod/ulab/code/ulab_create.c extmod/ulab/code/utils/utils.c +#: extmod/ulab/code/numpy/create.c extmod/ulab/code/utils/utils.c msgid "buffer is smaller than requested size" msgstr "" -#: extmod/ulab/code/ulab_create.c extmod/ulab/code/utils/utils.c +#: extmod/ulab/code/numpy/create.c extmod/ulab/code/utils/utils.c msgid "buffer size must be a multiple of element size" msgstr "" @@ -2831,6 +2831,10 @@ msgstr "" msgid "can't convert '%q' object to %q implicitly" msgstr "" +#: extmod/ulab/code/numpy/vector.c +msgid "can't convert complex to float" +msgstr "" + #: py/obj.c msgid "can't convert to %q" msgstr "" @@ -2925,6 +2929,14 @@ msgstr "" msgid "cannot cast output with casting rule" msgstr "" +#: extmod/ulab/code/ndarray.c +msgid "cannot convert complex to dtype" +msgstr "" + +#: extmod/ulab/code/ndarray.c +msgid "cannot convert complex type" +msgstr "" + #: py/objtype.c msgid "cannot create '%q' instances" msgstr "" @@ -3116,6 +3128,10 @@ msgstr "" msgid "divisor must be 4" msgstr "" +#: extmod/ulab/code/numpy/vector.c +msgid "dtype must be float, or complex" +msgstr "" + #: py/objdeque.c msgid "empty" msgstr "" @@ -3219,7 +3235,7 @@ msgstr "" msgid "first argument must be a function" msgstr "" -#: extmod/ulab/code/ulab_create.c +#: extmod/ulab/code/numpy/create.c msgid "first argument must be a tuple of ndarrays" msgstr "" @@ -3284,6 +3300,10 @@ msgstr "" msgid "function is defined for ndarrays only" msgstr "" +#: extmod/ulab/code/numpy/carray/carray.c +msgid "function is implemented for ndarrays only" +msgstr "" + #: py/argcheck.c #, c-format msgid "function missing %d required positional arguments" @@ -3397,7 +3417,7 @@ msgstr "" msgid "input and output shapes are not compatible" msgstr "" -#: extmod/ulab/code/ulab_create.c +#: extmod/ulab/code/numpy/create.c msgid "input argument must be an integer, a tuple, or a list" msgstr "" @@ -3405,7 +3425,7 @@ msgstr "" msgid "input array length must be power of 2" msgstr "" -#: extmod/ulab/code/ulab_create.c +#: extmod/ulab/code/numpy/create.c msgid "input arrays are not compatible" msgstr "" @@ -3413,6 +3433,10 @@ msgstr "" msgid "input data must be an iterable" msgstr "" +#: extmod/ulab/code/numpy/vector.c +msgid "input dtype must be float or complex" +msgstr "" + #: extmod/ulab/code/numpy/linalg/linalg.c msgid "input matrix is asymmetric" msgstr "" @@ -3422,18 +3446,26 @@ msgstr "" msgid "input matrix is singular" msgstr "" +#: extmod/ulab/code/numpy/carray/carray.c +msgid "input must be a 1D ndarray" +msgstr "" + #: extmod/ulab/code/scipy/linalg/linalg.c extmod/ulab/code/user/user.c msgid "input must be a dense ndarray" msgstr "" -#: extmod/ulab/code/ulab_create.c +#: extmod/ulab/code/numpy/create.c msgid "input must be a tensor of rank 2" msgstr "" -#: extmod/ulab/code/ulab_create.c extmod/ulab/code/user/user.c +#: extmod/ulab/code/numpy/create.c extmod/ulab/code/user/user.c msgid "input must be an ndarray" msgstr "" +#: extmod/ulab/code/numpy/carray/carray.c +msgid "input must be an ndarray, or a scalar" +msgstr "" + #: extmod/ulab/code/scipy/signal/signal.c msgid "input must be one-dimensional" msgstr "" @@ -3804,7 +3836,11 @@ msgstr "" msgid "not enough arguments for format string" msgstr "" -#: extmod/ulab/code/ulab_create.c +#: extmod/ulab/code/numpy/carray/carray_tools.c +msgid "not implemented for complex dtype" +msgstr "" + +#: extmod/ulab/code/numpy/create.c msgid "number of points must be at least 2" msgstr "" @@ -3862,7 +3898,7 @@ msgstr "" msgid "odd-length string" msgstr "" -#: extmod/ulab/code/ulab_create.c extmod/ulab/code/utils/utils.c +#: extmod/ulab/code/numpy/create.c extmod/ulab/code/utils/utils.c msgid "offset is too large" msgstr "" @@ -3870,7 +3906,7 @@ msgstr "" msgid "offset must be >= 0" msgstr "" -#: extmod/ulab/code/ulab_create.c +#: extmod/ulab/code/numpy/create.c msgid "offset must be non-negative and no greater than buffer length" msgstr "" @@ -4349,7 +4385,7 @@ msgstr "" msgid "too many arguments provided with the given format" msgstr "" -#: extmod/ulab/code/ndarray.c extmod/ulab/code/ulab_create.c +#: extmod/ulab/code/ndarray.c extmod/ulab/code/numpy/create.c msgid "too many dimensions" msgstr "" @@ -4550,7 +4586,7 @@ msgstr "" msgid "wrong axis index" msgstr "" -#: extmod/ulab/code/ulab_create.c +#: extmod/ulab/code/numpy/create.c msgid "wrong axis specified" msgstr "" @@ -4558,7 +4594,11 @@ msgstr "" msgid "wrong input type" msgstr "" -#: extmod/ulab/code/ulab_create.c py/objarray.c py/objstr.c +#: extmod/ulab/code/numpy/transform.c +msgid "wrong length of condition array" +msgstr "" + +#: extmod/ulab/code/numpy/create.c py/objarray.c py/objstr.c msgid "wrong number of arguments" msgstr "" diff --git a/locale/sv.po b/locale/sv.po index a93e7ad753..74c57e7946 100644 --- a/locale/sv.po +++ b/locale/sv.po @@ -2676,7 +2676,7 @@ msgstr "försök att få argmin/argmax för en tom sekvens" msgid "attributes not supported yet" msgstr "attribut stöds inte än" -#: extmod/ulab/code/numpy/numerical.c +#: extmod/ulab/code/ulab_tools.c msgid "axis is out of bounds" msgstr "axis är utanför gränsen" @@ -2732,11 +2732,11 @@ msgstr "bits_per_sample måste vara 8 eller 16" msgid "branch not in range" msgstr "branch utanför räckvidd" -#: extmod/ulab/code/ulab_create.c extmod/ulab/code/utils/utils.c +#: extmod/ulab/code/numpy/create.c extmod/ulab/code/utils/utils.c msgid "buffer is smaller than requested size" msgstr "bufferten är mindre än begärd storlek" -#: extmod/ulab/code/ulab_create.c extmod/ulab/code/utils/utils.c +#: extmod/ulab/code/numpy/create.c extmod/ulab/code/utils/utils.c msgid "buffer size must be a multiple of element size" msgstr "buffertstorlek måste vara en multipel av elementstorlek" @@ -2828,6 +2828,10 @@ msgstr "kan inte konvertera %s till komplex" msgid "can't convert '%q' object to %q implicitly" msgstr "kan inte konvertera '%q' objekt implicit till %q" +#: extmod/ulab/code/numpy/vector.c +msgid "can't convert complex to float" +msgstr "" + #: py/obj.c msgid "can't convert to %q" msgstr "kan inte konvertera till %q" @@ -2924,6 +2928,14 @@ msgstr "kan inte tilldela en ny form" msgid "cannot cast output with casting rule" msgstr "kan inte casta utdata med regel" +#: extmod/ulab/code/ndarray.c +msgid "cannot convert complex to dtype" +msgstr "" + +#: extmod/ulab/code/ndarray.c +msgid "cannot convert complex type" +msgstr "" + #: py/objtype.c msgid "cannot create '%q' instances" msgstr "kan inte skapa instanser av '%q'" @@ -3118,6 +3130,10 @@ msgstr "division med noll" msgid "divisor must be 4" msgstr "divisor måste vara 4" +#: extmod/ulab/code/numpy/vector.c +msgid "dtype must be float, or complex" +msgstr "" + #: py/objdeque.c msgid "empty" msgstr "tom" @@ -3221,7 +3237,7 @@ msgstr "första argumentet måste vara en callable" msgid "first argument must be a function" msgstr "första argumentet måste vara en funktion" -#: extmod/ulab/code/ulab_create.c +#: extmod/ulab/code/numpy/create.c msgid "first argument must be a tuple of ndarrays" msgstr "första argumentet måste vara en tupel av ndarray" @@ -3286,6 +3302,10 @@ msgstr "funktionen har samma teckenvärden vid slutet av intervall" msgid "function is defined for ndarrays only" msgstr "funktionen är enbart definierad för ndarray" +#: extmod/ulab/code/numpy/carray/carray.c +msgid "function is implemented for ndarrays only" +msgstr "" + #: py/argcheck.c #, c-format msgid "function missing %d required positional arguments" @@ -3399,7 +3419,7 @@ msgstr "inline assembler måste vara en funktion" msgid "input and output shapes are not compatible" msgstr "indata- och utdataformer är inte kompatibla" -#: extmod/ulab/code/ulab_create.c +#: extmod/ulab/code/numpy/create.c msgid "input argument must be an integer, a tuple, or a list" msgstr "indataargument måste vara integer, en tuple eller list" @@ -3407,7 +3427,7 @@ msgstr "indataargument måste vara integer, en tuple eller list" msgid "input array length must be power of 2" msgstr "indataarraylängden måste vara en multipel av 2" -#: extmod/ulab/code/ulab_create.c +#: extmod/ulab/code/numpy/create.c msgid "input arrays are not compatible" msgstr "indatamatriser är inte kompatibla" @@ -3415,6 +3435,10 @@ msgstr "indatamatriser är inte kompatibla" msgid "input data must be an iterable" msgstr "indata måste vara en iterable" +#: extmod/ulab/code/numpy/vector.c +msgid "input dtype must be float or complex" +msgstr "" + #: extmod/ulab/code/numpy/linalg/linalg.c msgid "input matrix is asymmetric" msgstr "indatamatrisen är asymmetrisk" @@ -3424,18 +3448,26 @@ msgstr "indatamatrisen är asymmetrisk" msgid "input matrix is singular" msgstr "indatamatrisen är singulär" +#: extmod/ulab/code/numpy/carray/carray.c +msgid "input must be a 1D ndarray" +msgstr "" + #: 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" -#: extmod/ulab/code/ulab_create.c +#: extmod/ulab/code/numpy/create.c msgid "input must be a tensor of rank 2" msgstr "indata måste vara en tensor av rank 2" -#: extmod/ulab/code/ulab_create.c extmod/ulab/code/user/user.c +#: extmod/ulab/code/numpy/create.c extmod/ulab/code/user/user.c msgid "input must be an ndarray" msgstr "indata måste vara en ndarray" +#: extmod/ulab/code/numpy/carray/carray.c +msgid "input must be an ndarray, or a scalar" +msgstr "" + #: extmod/ulab/code/scipy/signal/signal.c msgid "input must be one-dimensional" msgstr "indata måste vara endimensionell" @@ -3809,7 +3841,11 @@ msgstr "inte alla argument omvandlade under strängformatering" msgid "not enough arguments for format string" msgstr "inte tillräckligt med argument för formatsträng" -#: extmod/ulab/code/ulab_create.c +#: extmod/ulab/code/numpy/carray/carray_tools.c +msgid "not implemented for complex dtype" +msgstr "" + +#: extmod/ulab/code/numpy/create.c msgid "number of points must be at least 2" msgstr "antal punkter måste vara minst 2" @@ -3867,7 +3903,7 @@ msgstr "objekt med buffertprotokoll krävs" msgid "odd-length string" msgstr "sträng har udda längd" -#: extmod/ulab/code/ulab_create.c extmod/ulab/code/utils/utils.c +#: extmod/ulab/code/numpy/create.c extmod/ulab/code/utils/utils.c msgid "offset is too large" msgstr "offset är för stor" @@ -3875,7 +3911,7 @@ msgstr "offset är för stor" msgid "offset must be >= 0" msgstr "offset måste vara >= 0" -#: extmod/ulab/code/ulab_create.c +#: extmod/ulab/code/numpy/create.c msgid "offset must be non-negative and no greater than buffer length" msgstr "offset måste vara icke-negativt och inte längre än buffertlängd" @@ -4357,7 +4393,7 @@ msgstr "tobyte kan enbart anropas för täta matriser" msgid "too many arguments provided with the given format" msgstr "för många argument för det givna formatet" -#: extmod/ulab/code/ndarray.c extmod/ulab/code/ulab_create.c +#: extmod/ulab/code/ndarray.c extmod/ulab/code/numpy/create.c msgid "too many dimensions" msgstr "för många dimensioner" @@ -4558,7 +4594,7 @@ msgstr "window måste vara <= interval" msgid "wrong axis index" msgstr "fel axelindex" -#: extmod/ulab/code/ulab_create.c +#: extmod/ulab/code/numpy/create.c msgid "wrong axis specified" msgstr "fel axel angiven" @@ -4566,7 +4602,11 @@ msgstr "fel axel angiven" msgid "wrong input type" msgstr "fel indatatyp" -#: extmod/ulab/code/ulab_create.c py/objarray.c py/objstr.c +#: extmod/ulab/code/numpy/transform.c +msgid "wrong length of condition array" +msgstr "" + +#: extmod/ulab/code/numpy/create.c py/objarray.c py/objstr.c msgid "wrong number of arguments" msgstr "fel antal argument" diff --git a/locale/tr.po b/locale/tr.po index 8b3ef762cf..2ff9f016bf 100644 --- a/locale/tr.po +++ b/locale/tr.po @@ -2642,7 +2642,7 @@ msgstr "" msgid "attributes not supported yet" msgstr "" -#: extmod/ulab/code/numpy/numerical.c +#: extmod/ulab/code/ulab_tools.c msgid "axis is out of bounds" msgstr "" @@ -2698,11 +2698,11 @@ msgstr "" msgid "branch not in range" msgstr "" -#: extmod/ulab/code/ulab_create.c extmod/ulab/code/utils/utils.c +#: extmod/ulab/code/numpy/create.c extmod/ulab/code/utils/utils.c msgid "buffer is smaller than requested size" msgstr "" -#: extmod/ulab/code/ulab_create.c extmod/ulab/code/utils/utils.c +#: extmod/ulab/code/numpy/create.c extmod/ulab/code/utils/utils.c msgid "buffer size must be a multiple of element size" msgstr "" @@ -2794,6 +2794,10 @@ msgstr "" msgid "can't convert '%q' object to %q implicitly" msgstr "" +#: extmod/ulab/code/numpy/vector.c +msgid "can't convert complex to float" +msgstr "" + #: py/obj.c msgid "can't convert to %q" msgstr "" @@ -2888,6 +2892,14 @@ msgstr "" msgid "cannot cast output with casting rule" msgstr "" +#: extmod/ulab/code/ndarray.c +msgid "cannot convert complex to dtype" +msgstr "" + +#: extmod/ulab/code/ndarray.c +msgid "cannot convert complex type" +msgstr "" + #: py/objtype.c msgid "cannot create '%q' instances" msgstr "" @@ -3079,6 +3091,10 @@ msgstr "" msgid "divisor must be 4" msgstr "" +#: extmod/ulab/code/numpy/vector.c +msgid "dtype must be float, or complex" +msgstr "" + #: py/objdeque.c msgid "empty" msgstr "" @@ -3182,7 +3198,7 @@ msgstr "" msgid "first argument must be a function" msgstr "" -#: extmod/ulab/code/ulab_create.c +#: extmod/ulab/code/numpy/create.c msgid "first argument must be a tuple of ndarrays" msgstr "" @@ -3247,6 +3263,10 @@ msgstr "" msgid "function is defined for ndarrays only" msgstr "" +#: extmod/ulab/code/numpy/carray/carray.c +msgid "function is implemented for ndarrays only" +msgstr "" + #: py/argcheck.c #, c-format msgid "function missing %d required positional arguments" @@ -3360,7 +3380,7 @@ msgstr "" msgid "input and output shapes are not compatible" msgstr "" -#: extmod/ulab/code/ulab_create.c +#: extmod/ulab/code/numpy/create.c msgid "input argument must be an integer, a tuple, or a list" msgstr "" @@ -3368,7 +3388,7 @@ msgstr "" msgid "input array length must be power of 2" msgstr "" -#: extmod/ulab/code/ulab_create.c +#: extmod/ulab/code/numpy/create.c msgid "input arrays are not compatible" msgstr "" @@ -3376,6 +3396,10 @@ msgstr "" msgid "input data must be an iterable" msgstr "" +#: extmod/ulab/code/numpy/vector.c +msgid "input dtype must be float or complex" +msgstr "" + #: extmod/ulab/code/numpy/linalg/linalg.c msgid "input matrix is asymmetric" msgstr "" @@ -3385,18 +3409,26 @@ msgstr "" msgid "input matrix is singular" msgstr "" +#: extmod/ulab/code/numpy/carray/carray.c +msgid "input must be a 1D ndarray" +msgstr "" + #: extmod/ulab/code/scipy/linalg/linalg.c extmod/ulab/code/user/user.c msgid "input must be a dense ndarray" msgstr "" -#: extmod/ulab/code/ulab_create.c +#: extmod/ulab/code/numpy/create.c msgid "input must be a tensor of rank 2" msgstr "" -#: extmod/ulab/code/ulab_create.c extmod/ulab/code/user/user.c +#: extmod/ulab/code/numpy/create.c extmod/ulab/code/user/user.c msgid "input must be an ndarray" msgstr "" +#: extmod/ulab/code/numpy/carray/carray.c +msgid "input must be an ndarray, or a scalar" +msgstr "" + #: extmod/ulab/code/scipy/signal/signal.c msgid "input must be one-dimensional" msgstr "" @@ -3767,7 +3799,11 @@ msgstr "" msgid "not enough arguments for format string" msgstr "" -#: extmod/ulab/code/ulab_create.c +#: extmod/ulab/code/numpy/carray/carray_tools.c +msgid "not implemented for complex dtype" +msgstr "" + +#: extmod/ulab/code/numpy/create.c msgid "number of points must be at least 2" msgstr "" @@ -3825,7 +3861,7 @@ msgstr "" msgid "odd-length string" msgstr "" -#: extmod/ulab/code/ulab_create.c extmod/ulab/code/utils/utils.c +#: extmod/ulab/code/numpy/create.c extmod/ulab/code/utils/utils.c msgid "offset is too large" msgstr "" @@ -3833,7 +3869,7 @@ msgstr "" msgid "offset must be >= 0" msgstr "" -#: extmod/ulab/code/ulab_create.c +#: extmod/ulab/code/numpy/create.c msgid "offset must be non-negative and no greater than buffer length" msgstr "" @@ -4312,7 +4348,7 @@ msgstr "" msgid "too many arguments provided with the given format" msgstr "" -#: extmod/ulab/code/ndarray.c extmod/ulab/code/ulab_create.c +#: extmod/ulab/code/ndarray.c extmod/ulab/code/numpy/create.c msgid "too many dimensions" msgstr "" @@ -4513,7 +4549,7 @@ msgstr "" msgid "wrong axis index" msgstr "" -#: extmod/ulab/code/ulab_create.c +#: extmod/ulab/code/numpy/create.c msgid "wrong axis specified" msgstr "" @@ -4521,7 +4557,11 @@ msgstr "" msgid "wrong input type" msgstr "" -#: extmod/ulab/code/ulab_create.c py/objarray.c py/objstr.c +#: extmod/ulab/code/numpy/transform.c +msgid "wrong length of condition array" +msgstr "" + +#: extmod/ulab/code/numpy/create.c py/objarray.c py/objstr.c msgid "wrong number of arguments" msgstr "" diff --git a/locale/zh_Latn_pinyin.po b/locale/zh_Latn_pinyin.po index 7b6f03da47..ec39c2cba6 100644 --- a/locale/zh_Latn_pinyin.po +++ b/locale/zh_Latn_pinyin.po @@ -2688,7 +2688,7 @@ msgstr "chángshì huòqǔ kōng xùliè de argmin/ argmax" msgid "attributes not supported yet" msgstr "shǔxìng shàngwèi zhīchí" -#: extmod/ulab/code/numpy/numerical.c +#: extmod/ulab/code/ulab_tools.c msgid "axis is out of bounds" msgstr "zhóu chāo chū biān jiè" @@ -2744,11 +2744,11 @@ msgstr "měi jiàn yàngběn bìxū wèi 8 huò 16" msgid "branch not in range" msgstr "fēnzhī bùzài fànwéi nèi" -#: extmod/ulab/code/ulab_create.c extmod/ulab/code/utils/utils.c +#: extmod/ulab/code/numpy/create.c extmod/ulab/code/utils/utils.c msgid "buffer is smaller than requested size" msgstr "huǎn chōng qū xiǎo yú qǐng qiú de dà xiǎo" -#: extmod/ulab/code/ulab_create.c extmod/ulab/code/utils/utils.c +#: extmod/ulab/code/numpy/create.c extmod/ulab/code/utils/utils.c msgid "buffer size must be a multiple of element size" msgstr "huǎn chōng qū dà xiǎo bì xū shì yuán sù dà xiǎo de bèi shù" @@ -2840,6 +2840,10 @@ msgstr "wúfǎ zhuǎnhuàn%s dào fùzá" msgid "can't convert '%q' object to %q implicitly" msgstr "wúfǎ jiāng '%q' duìxiàng zhuǎnhuàn wèi %q yǐn hán" +#: extmod/ulab/code/numpy/vector.c +msgid "can't convert complex to float" +msgstr "" + #: py/obj.c msgid "can't convert to %q" msgstr "wúfǎ zhuǎnhuàn wèi %q" @@ -2935,6 +2939,14 @@ msgid "cannot cast output with casting rule" msgstr "" "wú fǎ shǐ yòng qiáng zhì zhuǎn huàn guī zé qiáng zhì zhuǎn huàn shū chū" +#: extmod/ulab/code/ndarray.c +msgid "cannot convert complex to dtype" +msgstr "" + +#: extmod/ulab/code/ndarray.c +msgid "cannot convert complex type" +msgstr "" + #: py/objtype.c msgid "cannot create '%q' instances" msgstr "wúfǎ chuàngjiàn '%q' ' shílì" @@ -3131,6 +3143,10 @@ msgstr "bèi líng chú" msgid "divisor must be 4" msgstr "èr chóng zòu bì xū shì 4" +#: extmod/ulab/code/numpy/vector.c +msgid "dtype must be float, or complex" +msgstr "" + #: py/objdeque.c msgid "empty" msgstr "kòngxián" @@ -3234,7 +3250,7 @@ msgstr "dì yī gè cānshù bìxū shì kě tiáo yòng de" msgid "first argument must be a function" msgstr "dì yīgè cānshù bìxū shì yī gè hánshù" -#: extmod/ulab/code/ulab_create.c +#: extmod/ulab/code/numpy/create.c msgid "first argument must be a tuple of ndarrays" msgstr "dì yī gè cān shù bì xū shì yí gè yuán zǔ ndarrays" @@ -3299,6 +3315,10 @@ msgstr "hánshù zài jiàngé mòwěi jùyǒu xiāngtóng de fúhào" msgid "function is defined for ndarrays only" msgstr "hán shù jǐn wéi ndarrays dìng yì" +#: extmod/ulab/code/numpy/carray/carray.c +msgid "function is implemented for ndarrays only" +msgstr "" + #: py/argcheck.c #, c-format msgid "function missing %d required positional arguments" @@ -3412,7 +3432,7 @@ msgstr "nèi lián jíhé bìxū shì yīgè hánshù" msgid "input and output shapes are not compatible" msgstr "shū rù hé shū chū xíng zhuàng bù jiān róng" -#: extmod/ulab/code/ulab_create.c +#: extmod/ulab/code/numpy/create.c msgid "input argument must be an integer, a tuple, or a list" msgstr "shū rù cān shù bì xū shì zhěng shù, yuán zǔ huò liè biǎo" @@ -3420,7 +3440,7 @@ msgstr "shū rù cān shù bì xū shì zhěng shù, yuán zǔ huò liè biǎo" msgid "input array length must be power of 2" msgstr "shūrù shùzǔ de chángdù bìxū shì 2 de mì" -#: extmod/ulab/code/ulab_create.c +#: extmod/ulab/code/numpy/create.c msgid "input arrays are not compatible" msgstr "shū rù shù zǔ bù jiān róng" @@ -3428,6 +3448,10 @@ msgstr "shū rù shù zǔ bù jiān róng" msgid "input data must be an iterable" msgstr "shūrù shùjù bìxū shì kě diédài de" +#: extmod/ulab/code/numpy/vector.c +msgid "input dtype must be float or complex" +msgstr "" + #: extmod/ulab/code/numpy/linalg/linalg.c msgid "input matrix is asymmetric" msgstr "shūrù jǔzhèn bù duìchèn" @@ -3437,18 +3461,26 @@ msgstr "shūrù jǔzhèn bù duìchèn" msgid "input matrix is singular" msgstr "shūrù jǔzhèn shì qíyì de" +#: extmod/ulab/code/numpy/carray/carray.c +msgid "input must be a 1D ndarray" +msgstr "" + #: 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" -#: extmod/ulab/code/ulab_create.c +#: extmod/ulab/code/numpy/create.c msgid "input must be a tensor of rank 2" msgstr "shū rù bì xū shì děng jí 2 de zhāng liàng" -#: extmod/ulab/code/ulab_create.c extmod/ulab/code/user/user.c +#: extmod/ulab/code/numpy/create.c extmod/ulab/code/user/user.c msgid "input must be an ndarray" msgstr "shū rù bì xū shì ndarray" +#: extmod/ulab/code/numpy/carray/carray.c +msgid "input must be an ndarray, or a scalar" +msgstr "" + #: extmod/ulab/code/scipy/signal/signal.c msgid "input must be one-dimensional" msgstr "shū rù bì xū shì yì wéi de" @@ -3820,7 +3852,11 @@ msgstr "bùshì zì chuàn géshì huà guòchéng zhōng zhuǎnhuàn de suǒyǒ msgid "not enough arguments for format string" msgstr "géshì zìfú chuàn cān shǔ bùzú" -#: extmod/ulab/code/ulab_create.c +#: extmod/ulab/code/numpy/carray/carray_tools.c +msgid "not implemented for complex dtype" +msgstr "" + +#: extmod/ulab/code/numpy/create.c msgid "number of points must be at least 2" msgstr "diǎnshù bìxū zhìshǎo wèi 2" @@ -3878,7 +3914,7 @@ msgstr "xūyào huǎnchōng qū xiéyì de duìxiàng" msgid "odd-length string" msgstr "jīshù zìfú chuàn" -#: extmod/ulab/code/ulab_create.c extmod/ulab/code/utils/utils.c +#: extmod/ulab/code/numpy/create.c extmod/ulab/code/utils/utils.c msgid "offset is too large" msgstr "piān yí tài dà" @@ -3886,7 +3922,7 @@ msgstr "piān yí tài dà" msgid "offset must be >= 0" msgstr "piān yí liàng bì xū >= 0" -#: extmod/ulab/code/ulab_create.c +#: extmod/ulab/code/numpy/create.c msgid "offset must be non-negative and no greater than buffer length" msgstr "piān yí liàng bì xū wéi fēi fù shù qiě bù dà yú huǎn chōng qū cháng dù" @@ -4370,7 +4406,7 @@ msgstr "tobytes zhǐ néng duì mì jí shù zǔ diào yòng" msgid "too many arguments provided with the given format" msgstr "tígōng jǐ dìng géshì de cānshù tài duō" -#: extmod/ulab/code/ndarray.c extmod/ulab/code/ulab_create.c +#: extmod/ulab/code/ndarray.c extmod/ulab/code/numpy/create.c msgid "too many dimensions" msgstr "chǐ cùn tài duō" @@ -4571,7 +4607,7 @@ msgstr "Chuāngkǒu bìxū shì <= jiàngé" msgid "wrong axis index" msgstr "cuò wù de zhóu suǒ yǐn" -#: extmod/ulab/code/ulab_create.c +#: extmod/ulab/code/numpy/create.c msgid "wrong axis specified" msgstr "zhǐ dìng de zhóu cuò wù" @@ -4579,7 +4615,11 @@ msgstr "zhǐ dìng de zhóu cuò wù" msgid "wrong input type" msgstr "shūrù lèixíng cuòwù" -#: extmod/ulab/code/ulab_create.c py/objarray.c py/objstr.c +#: extmod/ulab/code/numpy/transform.c +msgid "wrong length of condition array" +msgstr "" + +#: extmod/ulab/code/numpy/create.c py/objarray.c py/objstr.c msgid "wrong number of arguments" msgstr "cānshù shù cuòwù" From 679f4b30ba8b55a79fd1e77b27e9542575ad37df Mon Sep 17 00:00:00 2001 From: Scott Shawcroft Date: Tue, 18 Jan 2022 15:23:19 -0800 Subject: [PATCH 26/27] Tweak heap sizes for different targets --- ports/espressif/supervisor/port.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/ports/espressif/supervisor/port.c b/ports/espressif/supervisor/port.c index c8cb344aae..d6eb32b395 100644 --- a/ports/espressif/supervisor/port.c +++ b/ports/espressif/supervisor/port.c @@ -81,7 +81,17 @@ #include "esp32/spiram.h" #endif +// Heap sizes for when there is no external RAM for CircuitPython to use +// exclusively. +#ifdef CONFIG_IDF_TARGET_ESP32S2 #define HEAP_SIZE (48 * 1024) +#endif +#ifdef CONFIG_IDF_TARGET_ESP32S3 +#define HEAP_SIZE (176 * 1024) +#endif +#ifdef CONFIG_IDF_TARGET_ESP32C3 +#define HEAP_SIZE (88 * 1024) +#endif uint32_t *heap; uint32_t heap_size; From c839d9b3ccd70c01fa855a9caff49620e0fe035f Mon Sep 17 00:00:00 2001 From: Scott Shawcroft Date: Tue, 18 Jan 2022 15:50:32 -0800 Subject: [PATCH 27/27] Fix S2 builds by not turning on USB with wifi --- .../esp-idf-config/sdkconfig-esp32s2.defaults | 12 ++++-------- .../esp-idf-config/sdkconfig-esp32s3.defaults | 6 ++---- .../espressif/esp-idf-config/sdkconfig-opt.defaults | 4 ++++ ports/espressif/esp-idf-config/sdkconfig.defaults | 1 - ports/espressif/tools/update_sdkconfig.py | 1 + 5 files changed, 11 insertions(+), 13 deletions(-) diff --git a/ports/espressif/esp-idf-config/sdkconfig-esp32s2.defaults b/ports/espressif/esp-idf-config/sdkconfig-esp32s2.defaults index 9020572ccb..ac3e909dfc 100644 --- a/ports/espressif/esp-idf-config/sdkconfig-esp32s2.defaults +++ b/ports/espressif/esp-idf-config/sdkconfig-esp32s2.defaults @@ -83,12 +83,12 @@ CONFIG_ESP_SLEEP_POWER_DOWN_FLASH=y # end of Sleep Config # -# ESP System Settings +# PHY # -CONFIG_ESP_SYSTEM_SINGLE_CORE_MODE=y -# end of ESP System Settings +# CONFIG_ESP_PHY_ENABLE_USB is not set +# end of PHY -CONFIG_ESP_SYSTEM_MEMPROT_DEPCHECK=y +CONFIG_ESP_SYSTEM_SINGLE_CORE_MODE=y # # Memory protection # @@ -151,10 +151,6 @@ CONFIG_ESP32_PHY_CALIBRATION_AND_DATA_STORAGE=y # CONFIG_ESP32_PHY_INIT_DATA_IN_PARTITION is not set CONFIG_ESP32_PHY_MAX_WIFI_TX_POWER=20 CONFIG_ESP32_PHY_MAX_TX_POWER=20 -CONFIG_ESP32S2_PANIC_PRINT_HALT=y -# CONFIG_ESP32S2_PANIC_PRINT_REBOOT is not set -# CONFIG_ESP32S2_PANIC_SILENT_REBOOT is not set -# CONFIG_ESP32S2_PANIC_GDBSTUB is not set CONFIG_ESP32S2_ALLOW_RTC_FAST_MEM_AS_HEAP=y CONFIG_ESP32H2_MEMPROT_FEATURE=y CONFIG_ESP32H2_MEMPROT_FEATURE_LOCK=y diff --git a/ports/espressif/esp-idf-config/sdkconfig-esp32s3.defaults b/ports/espressif/esp-idf-config/sdkconfig-esp32s3.defaults index 4f3614692b..e655f4ceb1 100644 --- a/ports/espressif/esp-idf-config/sdkconfig-esp32s3.defaults +++ b/ports/espressif/esp-idf-config/sdkconfig-esp32s3.defaults @@ -86,6 +86,8 @@ CONFIG_ESP32S3_UNIVERSAL_MAC_ADDRESSES=4 # end of MAC Config CONFIG_ESP_SLEEP_GPIO_RESET_WORKAROUND=y + +CONFIG_ESP_PHY_ENABLE_USB=y # CONFIG_ESP_MAIN_TASK_AFFINITY_CPU0 is not set CONFIG_ESP_MAIN_TASK_AFFINITY_CPU1=y # CONFIG_ESP_MAIN_TASK_AFFINITY_NO_AFFINITY is not set @@ -130,10 +132,6 @@ CONFIG_ESP32_PHY_CALIBRATION_AND_DATA_STORAGE=y # CONFIG_ESP32_PHY_INIT_DATA_IN_PARTITION is not set CONFIG_ESP32_PHY_MAX_WIFI_TX_POWER=20 CONFIG_ESP32_PHY_MAX_TX_POWER=20 -# CONFIG_ESP32S2_PANIC_PRINT_HALT is not set -# CONFIG_ESP32S2_PANIC_PRINT_REBOOT is not set -CONFIG_ESP32S2_PANIC_SILENT_REBOOT=y -# CONFIG_ESP32S2_PANIC_GDBSTUB is not set CONFIG_ESP32S2_ALLOW_RTC_FAST_MEM_AS_HEAP=y # CONFIG_ESP32_ENABLE_COREDUMP_TO_FLASH is not set # CONFIG_ESP32_ENABLE_COREDUMP_TO_UART is not set diff --git a/ports/espressif/esp-idf-config/sdkconfig-opt.defaults b/ports/espressif/esp-idf-config/sdkconfig-opt.defaults index 0d0e75af0e..273303446e 100644 --- a/ports/espressif/esp-idf-config/sdkconfig-opt.defaults +++ b/ports/espressif/esp-idf-config/sdkconfig-opt.defaults @@ -75,6 +75,10 @@ CONFIG_COMPILER_OPTIMIZATION_LEVEL_RELEASE=y CONFIG_OPTIMIZATION_ASSERTIONS_SILENT=y # CONFIG_OPTIMIZATION_ASSERTIONS_DISABLED is not set CONFIG_OPTIMIZATION_ASSERTION_LEVEL=1 +# CONFIG_ESP32S2_PANIC_PRINT_HALT is not set +# CONFIG_ESP32S2_PANIC_PRINT_REBOOT is not set +CONFIG_ESP32S2_PANIC_SILENT_REBOOT=y +# CONFIG_ESP32S2_PANIC_GDBSTUB is not set # CONFIG_CONSOLE_UART_DEFAULT is not set # CONFIG_CONSOLE_UART_CUSTOM is not set CONFIG_ESP_CONSOLE_UART_NONE=y diff --git a/ports/espressif/esp-idf-config/sdkconfig.defaults b/ports/espressif/esp-idf-config/sdkconfig.defaults index 3bf9a09c26..f4efac4063 100644 --- a/ports/espressif/esp-idf-config/sdkconfig.defaults +++ b/ports/espressif/esp-idf-config/sdkconfig.defaults @@ -246,7 +246,6 @@ CONFIG_ESP_PHY_CALIBRATION_AND_DATA_STORAGE=y # CONFIG_ESP_PHY_INIT_DATA_IN_PARTITION is not set CONFIG_ESP_PHY_MAX_WIFI_TX_POWER=20 CONFIG_ESP_PHY_MAX_TX_POWER=20 -CONFIG_ESP_PHY_ENABLE_USB=y # end of PHY # CONFIG_PM_ENABLE is not set diff --git a/ports/espressif/tools/update_sdkconfig.py b/ports/espressif/tools/update_sdkconfig.py index a9d61532bb..ce174fd12a 100644 --- a/ports/espressif/tools/update_sdkconfig.py +++ b/ports/espressif/tools/update_sdkconfig.py @@ -48,6 +48,7 @@ TARGET_SETTINGS = [ "CONFIG_SDK_TOOLPREFIX", "CONFIG_TOOLPREFIX", "ESP_SLEEP_GPIO_RESET_WORKAROUND", + "CONFIG_ESP_PHY_ENABLE_USB", ] BOARD_SETTINGS = [