Merge remote-tracking branch 'origin/main'

2023-03-26 05:47:54 +02:00 · 2023-03-26 05:47:54 +02:00 · d3fa15dced
commit d3fa15dced
parent 817a572669 7dcec38ba0
3 changed files with 2 additions and 4 deletions
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@ -8,9 +8,9 @@ repos:
    hooks:
    -   id: check-yaml
    -   id: end-of-file-fixer
-        exclude: '^(tests/.*\.exp|tests/cmdline/.*|tests/.*/data/.*|ports/espressif/esp-idf-config/.*|ports/espressif/boards/.*/sdkconfig)'
+        exclude: '^(tests/.*\.exp|tests/cmdline/.*|tests/.*/data/.*)'
    -   id: trailing-whitespace
-        exclude: '^(tests/.*\.exp|tests/cmdline/.*|tests/.*/data/.*|lib/mbedtls_errors/.*)'
+        exclude: '^(tests/.*\.exp|tests/cmdline/.*|tests/.*/data/.*|lib/mbedtls_errors/generate_errors.diff)'
 -   repo: https://github.com/codespell-project/codespell
    rev: v2.2.4
    hooks:
--- a/ports/espressif/boards/adafruit_qtpy_esp32s3_nopsram/sdkconfig
+++ b/ports/espressif/boards/adafruit_qtpy_esp32s3_nopsram/sdkconfig
@ -5,4 +5,3 @@ CONFIG_ESP32S3_SPIRAM_SUPPORT=n
 #
 CONFIG_LWIP_LOCAL_HOSTNAME="espressif-esp32s3"
 # end of LWIP
-
--- a/ports/espressif/boards/espressif_esp32_eye/sdkconfig
+++ b/ports/espressif/boards/espressif_esp32_eye/sdkconfig
@ -69,4 +69,3 @@ CONFIG_CAMERA_DMA_BUFFER_SIZE_MAX=32768
 #
 CONFIG_ESP_CONSOLE_UART_TX_GPIO=1
 CONFIG_ESP_CONSOLE_UART_RX_GPIO=3
-