Merge remote-tracking branch 'upstream/dev-esp32' into dev-esp32-idf5…

…-testing
nodemcu · Jan 30, 2024 · 1431587 · 1431587
2 parents 544726f + 2b8e327
commit 1431587
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/.readthedocs.yaml b/.readthedocs.yaml
@@ -1,15 +1,19 @@
-# .readthedocs.yaml
-# Read the Docs configuration file
+# Read the Docs configuration file for MkDocs projects
 # See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
 
 # Required
 version: 2
 
+# Set the version of Python and other tools you might need
+build:
+  os: ubuntu-22.04
+  tools:
+    python: "3.12"
+
 mkdocs:
   configuration: mkdocs.yml
 
-# Optionally set the version of Python and requirements required to build your docs
+# Optionally declare the Python requirements required to build your docs
 python:
-  version: "3.7"
   install:
-    - requirements: docs/requirements.txt
+  - requirements: docs/requirements.txt
diff --git a/components/modules/spi.c b/components/modules/spi.c
@@ -17,7 +17,7 @@ LROT_BEGIN(lspi, NULL, 0)
 #endif
   LROT_NUMENTRY( SPI1,   SPI1_HOST )
   LROT_NUMENTRY( SPI2,   SPI2_HOST )
-#if SOC_SPI_PERIPH_NUM > 2
+#ifdef SPI3_HOST
   LROT_NUMENTRY( SPI3,   SPI3_HOST )
 #endif
 LROT_END(lspi, NULL, 0)