Merge branch 'adafruit:main' into add-new-boards

ozgurbostan · web-flow · commit 2ede90774653 · 2023-03-26T14:57:12.000+03:00
diff --git 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:
diff --git 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
-
diff --git 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
-

Original file line number	Diff line number	Diff line change
`@@ -5,4 +5,3 @@ CONFIG_ESP32S3_SPIRAM_SUPPORT=n`
`5`	`5`	`#`
`6`	`6`	`CONFIG_LWIP_LOCAL_HOSTNAME="espressif-esp32s3"`
`7`	`7`	`# end of LWIP`
`8`		`-`
Original file line number	Diff line number	Diff line change
`@@ -69,4 +69,3 @@ CONFIG_CAMERA_DMA_BUFFER_SIZE_MAX=32768`
`69`	`69`	`#`
`70`	`70`	`CONFIG_ESP_CONSOLE_UART_TX_GPIO=1`
`71`	`71`	`CONFIG_ESP_CONSOLE_UART_RX_GPIO=3`
`72`		`-`