Merge branch 'espressif:master' into main

Author: Jason2866

.github/ISSUE_TEMPLATE/Issue-report.yml

@@ -41,6 +41,7 @@ body:
       options:
         - latest master (checkout manually)
         - latest development Release Candidate (RC-X)
+        - v2.0.10
         - v2.0.9
         - v2.0.8
         - v2.0.7

.github/workflows/docs.yml

@@ -17,7 +17,7 @@ jobs:
 
   build-docs:
     name: Build ReadTheDocs
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     defaults:
       run:
         shell: bash
@@ -27,7 +27,7 @@ jobs:
         submodules: true
     - uses: actions/setup-python@v4
       with:
-        python-version: '3.x'
+        python-version: '3.10'
     - name: Build
       run: |
         sudo apt update

.readthedocs.yaml

@@ -0,0 +1,20 @@
+# .readthedocs.yaml
+# Read the Docs configuration file
+# 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.10"
+
+# Build documentation in the docs/ directory with Sphinx
+sphinx:
+  configuration: docs/source/conf.py
+
+python:
+  install:
+    - requirements: docs/requirements.txt

.readthedocs.yml

@@ -0,0 +1,22 @@
+# .readthedocs.yaml
+# Read the Docs configuration file
+# 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.10"
+
+# Build documentation in the docs/ directory with Sphinx
+sphinx:
+  configuration: docs/conf.py
+
+# We recommend specifying your dependencies to enable reproducible builds:
+# https://docs.readthedocs.io/en/stable/guides/reproducible-builds.html
+# python:
+#   install:
+#   - requirements: docs/requirements.txt

boards.txt

@@ -11755,7 +11755,7 @@ esp32-gateway.menu.Revision.RevC=Revision C or older
 esp32-gateway.menu.Revision.RevC.build.board=ESP32_GATEWAY_C
 esp32-gateway.menu.Revision.RevE=Revision E
 esp32-gateway.menu.Revision.RevE.build.board=ESP32_GATEWAY_E
-esp32-gateway.menu.Revision.RevF=Revision F
+esp32-gateway.menu.Revision.RevF=Revision F or newer
 esp32-gateway.menu.Revision.RevF.build.board=ESP32_GATEWAY_F
 
 esp32-gateway.build.f_cpu=240000000L
@@ -11770,6 +11770,8 @@ esp32-gateway.menu.FlashFreq.80.build.flash_freq=80m
 esp32-gateway.menu.FlashFreq.40=40MHz
 esp32-gateway.menu.FlashFreq.40.build.flash_freq=40m
 
+esp32-gateway.menu.UploadSpeed.921600=921600
+esp32-gateway.menu.UploadSpeed.921600.upload.speed=921600
 esp32-gateway.menu.UploadSpeed.115200=115200
 esp32-gateway.menu.UploadSpeed.115200.upload.speed=115200
 
@@ -13407,6 +13409,81 @@ stamp-s3.menu.EraseFlash.none.upload.erase_cmd=
 stamp-s3.menu.EraseFlash.all=Enabled
 stamp-s3.menu.EraseFlash.all.upload.erase_cmd=-e
 
+###############################################################
+
+m5stamp-pico.name=M5Stamp-Pico
+
+m5stamp-pico.bootloader.tool=esptool_py
+m5stamp-pico.bootloader.tool.default=esptool_py
+
+m5stamp-pico.upload.tool=esptool_py
+m5stamp-pico.upload.tool.default=esptool_py
+m5stamp-pico.upload.tool.network=esp_ota
+
+m5stamp-pico.upload.maximum_size=1310720
+m5stamp-pico.upload.maximum_data_size=327680
+m5stamp-pico.upload.wait_for_upload_port=true
+m5stamp-pico.upload.flags=
+m5stamp-pico.upload.extra_flags=
+
+m5stamp-pico.serial.disableDTR=true
+m5stamp-pico.serial.disableRTS=true
+
+m5stamp-pico.build.tarch=xtensa
+m5stamp-pico.build.bootloader_addr=0x1000
+m5stamp-pico.build.target=esp32
+m5stamp-pico.build.mcu=esp32
+m5stamp-pico.build.core=esp32
+m5stamp-pico.build.variant=m5stack_stamp_pico
+m5stamp-pico.build.board=M5Stamp_Pico
+
+m5stamp-pico.build.f_cpu=240000000L
+m5stamp-pico.build.flash_size=4MB
+m5stamp-pico.build.flash_freq=80m
+m5stamp-pico.build.flash_mode=dio
+m5stamp-pico.build.boot=dio
+m5stamp-pico.build.partitions=default
+m5stamp-pico.build.defines=
+
+m5stamp-pico.menu.PartitionScheme.default=Default
+m5stamp-pico.menu.PartitionScheme.default.build.partitions=default
+m5stamp-pico.menu.PartitionScheme.no_ota=No OTA (Large APP)
+m5stamp-pico.menu.PartitionScheme.no_ota.build.partitions=no_ota
+m5stamp-pico.menu.PartitionScheme.no_ota.upload.maximum_size=2097152
+m5stamp-pico.menu.PartitionScheme.min_spiffs=Minimal SPIFFS (Large APPS with OTA)
+m5stamp-pico.menu.PartitionScheme.min_spiffs.build.partitions=min_spiffs
+m5stamp-pico.menu.PartitionScheme.min_spiffs.upload.maximum_size=1966080
+
+
+m5stamp-pico.menu.UploadSpeed.1500000=1500000
+m5stamp-pico.menu.UploadSpeed.1500000.upload.speed=1500000
+m5stamp-pico.menu.UploadSpeed.750000=750000
+m5stamp-pico.menu.UploadSpeed.750000.upload.speed=750000
+m5stamp-pico.menu.UploadSpeed.500000=500000
+m5stamp-pico.menu.UploadSpeed.500000.upload.speed=500000
+m5stamp-pico.menu.UploadSpeed.250000=250000
+m5stamp-pico.menu.UploadSpeed.250000.upload.speed=250000
+m5stamp-pico.menu.UploadSpeed.115200=115200
+m5stamp-pico.menu.UploadSpeed.115200.upload.speed=115200
+
+m5stamp-pico.menu.DebugLevel.none=None
+m5stamp-pico.menu.DebugLevel.none.build.code_debug=0
+m5stamp-pico.menu.DebugLevel.error=Error
+m5stamp-pico.menu.DebugLevel.error.build.code_debug=1
+m5stamp-pico.menu.DebugLevel.warn=Warn
+m5stamp-pico.menu.DebugLevel.warn.build.code_debug=2
+m5stamp-pico.menu.DebugLevel.info=Info
+m5stamp-pico.menu.DebugLevel.info.build.code_debug=3
+m5stamp-pico.menu.DebugLevel.debug=Debug
+m5stamp-pico.menu.DebugLevel.debug.build.code_debug=4
+m5stamp-pico.menu.DebugLevel.verbose=Verbose
+m5stamp-pico.menu.DebugLevel.verbose.build.code_debug=5
+
+m5stamp-pico.menu.EraseFlash.none=Disabled
+m5stamp-pico.menu.EraseFlash.none.upload.erase_cmd=
+m5stamp-pico.menu.EraseFlash.all=Enabled
+m5stamp-pico.menu.EraseFlash.all.upload.erase_cmd=-e
+
 ##############################################################
 
 odroid_esp32.name=ODROID ESP32

cores/esp32/esp32-hal-matrix.c

@@ -17,8 +17,8 @@
 
 #include "esp_system.h"
 #ifdef ESP_IDF_VERSION_MAJOR // IDF 4+
+#include "soc/gpio_pins.h"
 #if CONFIG_IDF_TARGET_ESP32 // ESP32/PICO-D4
-#include "esp32/rom/gpio.h"
 #elif CONFIG_IDF_TARGET_ESP32S2
 #include "esp32s2/rom/gpio.h"
 #elif CONFIG_IDF_TARGET_ESP32S3
@@ -30,11 +30,10 @@
 #endif
 #else // ESP32 Before IDF 4.0
 #include "rom/gpio.h"
+#define GPIO_MATRIX_CONST_ZERO_INPUT GPIO_FUNC_IN_LOW
+#define GPIO_MATRIX_CONST_ONE_INPUT GPIO_FUNC_IN_HIGH
 #endif
 
-#define MATRIX_DETACH_OUT_SIG 0x100
-#define MATRIX_DETACH_IN_LOW_PIN 0x30
-#define MATRIX_DETACH_IN_LOW_HIGH 0x38
 
 void ARDUINO_ISR_ATTR pinMatrixOutAttach(uint8_t pin, uint8_t function, bool invertOut, bool invertEnable)
 {
@@ -43,7 +42,7 @@ void ARDUINO_ISR_ATTR pinMatrixOutAttach(uint8_t pin, uint8_t function, bool inv
 
 void ARDUINO_ISR_ATTR pinMatrixOutDetach(uint8_t pin, bool invertOut, bool invertEnable)
 {
-    gpio_matrix_out(pin, MATRIX_DETACH_OUT_SIG, invertOut, invertEnable);
+    gpio_matrix_out(pin, SIG_GPIO_OUT_IDX, invertOut, invertEnable);
 }
 
 void ARDUINO_ISR_ATTR pinMatrixInAttach(uint8_t pin, uint8_t signal, bool inverted)
@@ -53,7 +52,7 @@ void ARDUINO_ISR_ATTR pinMatrixInAttach(uint8_t pin, uint8_t signal, bool invert
 
 void ARDUINO_ISR_ATTR pinMatrixInDetach(uint8_t signal, bool high, bool inverted)
 {
-    gpio_matrix_in(high?MATRIX_DETACH_IN_LOW_HIGH:MATRIX_DETACH_IN_LOW_PIN, signal, inverted);
+    gpio_matrix_in(high?GPIO_MATRIX_CONST_ONE_INPUT:GPIO_MATRIX_CONST_ZERO_INPUT, signal, inverted);
 }
 /*
 void ARDUINO_ISR_ATTR intrMatrixAttach(uint32_t source, uint32_t inum){

docs/source/api/gpio.rst

@@ -87,7 +87,7 @@ The GPIO peripheral on the ESP32 supports interruptions.
 attachInterrupt
 ***************
 
-The function ``attachInterruptArg`` is used to attach the interrupt to the defined pin.
+The function ``attachInterrupt`` is used to attach the interrupt to the defined pin.
 
 .. code-block:: arduino
 

docs/source/api/wifi.rst

@@ -222,6 +222,15 @@ Get the softAP subnet CIDR.
 
     uint8_t softAPSubnetCIDR();
 
+softAPSubnetMask
+****************
+
+Get the softAP subnet mask.
+
+.. code-block:: arduino
+
+    IPAddress softAPSubnetMask();
+
 softAPenableIpV6
 ****************
 

libraries/ESP32/examples/Serial/Serial_All_CPU_Freqs.ino renamed to libraries/ESP32/examples/Serial/Serial_All_CPU_Freqs/Serial_All_CPU_Freqs.ino

@@ -1,75 +1,75 @@
-/*
-   Simple Sketch for testing HardwareSerial with different CPU Frequencies
-   Changing the CPU Frequency may affect peripherals and Wireless functionality
-   In ESP32 Arduino, UART shall work correctly in order to let the user see DGB info
-   and other application messages.
-
-   CPU Frequency is usually lowered in sleep modes
-   and some other Low Power configurations
-
-*/
-
-int cpufreqs[6] = {240, 160, 80, 40, 20, 10};
-#define NUM_CPU_FREQS (sizeof(cpufreqs) / sizeof(int))
-
-void setup() {
-
-  Serial.begin(115200);
-  delay(1000);
-  Serial.println("\n Starting...\n");
-  Serial.flush();
-
-  // initial information
-  uint32_t Freq = getCpuFrequencyMhz();
-  Serial.print("CPU Freq = ");
-  Serial.print(Freq);
-  Serial.println(" MHz");
-  Freq = getXtalFrequencyMhz();
-  Serial.print("XTAL Freq = ");
-  Serial.print(Freq);
-  Serial.println(" MHz");
-  Freq = getApbFrequency();
-  Serial.print("APB Freq = ");
-  Serial.print(Freq);
-  Serial.println(" Hz");
-  delay(500);
-
-  // ESP32-C3 and other RISC-V target may not support 240MHz
-#ifdef CONFIG_IDF_TARGET_ESP32C3
-  uint8_t firstFreq = 1;
-#else
-  uint8_t firstFreq = 0;
-#endif
-
-  // testing HardwareSerial for all possible CPU/APB Frequencies
-  for (uint8_t i = firstFreq; i < NUM_CPU_FREQS; i++) {
-    Serial.printf("\n------- Trying CPU Freq = %d ---------\n", cpufreqs[i]);
-    Serial.flush();  // wait to empty the UART FIFO before changing the CPU Freq.
-    setCpuFrequencyMhz(cpufreqs[i]);
-    Serial.updateBaudRate(115200);
-
-    Freq = getCpuFrequencyMhz();
-    Serial.print("CPU Freq = ");
-    Serial.print(Freq);
-    Serial.println(" MHz");
-    Freq = getXtalFrequencyMhz();
-    Serial.print("XTAL Freq = ");
-    Serial.print(Freq);
-    Serial.println(" MHz");
-    Freq = getApbFrequency();
-    Serial.print("APB Freq = ");
-    Serial.print(Freq);
-    Serial.println(" Hz");
-    if (i < NUM_CPU_FREQS - 1) {
-      Serial.println("Moving to the next frequency after a pause of 2 seconds.");
-      delay(2000);
-    }
-  }
-  Serial.println("\n-------------------\n");
-  Serial.println("End of testing...");
-  Serial.println("\n-------------------\n");
-}
-
-void loop() {
-  // Nothing here so far
-}
+/*
+   Simple Sketch for testing HardwareSerial with different CPU Frequencies
+   Changing the CPU Frequency may affect peripherals and Wireless functionality
+   In ESP32 Arduino, UART shall work correctly in order to let the user see DGB info
+   and other application messages.
+
+   CPU Frequency is usually lowered in sleep modes
+   and some other Low Power configurations
+
+*/
+
+int cpufreqs[6] = {240, 160, 80, 40, 20, 10};
+#define NUM_CPU_FREQS (sizeof(cpufreqs) / sizeof(int))
+
+void setup() {
+
+  Serial.begin(115200);
+  delay(1000);
+  Serial.println("\n Starting...\n");
+  Serial.flush();
+
+  // initial information
+  uint32_t Freq = getCpuFrequencyMhz();
+  Serial.print("CPU Freq = ");
+  Serial.print(Freq);
+  Serial.println(" MHz");
+  Freq = getXtalFrequencyMhz();
+  Serial.print("XTAL Freq = ");
+  Serial.print(Freq);
+  Serial.println(" MHz");
+  Freq = getApbFrequency();
+  Serial.print("APB Freq = ");
+  Serial.print(Freq);
+  Serial.println(" Hz");
+  delay(500);
+
+  // ESP32-C3 and other RISC-V target may not support 240MHz
+#ifdef CONFIG_IDF_TARGET_ESP32C3
+  uint8_t firstFreq = 1;
+#else
+  uint8_t firstFreq = 0;
+#endif
+
+  // testing HardwareSerial for all possible CPU/APB Frequencies
+  for (uint8_t i = firstFreq; i < NUM_CPU_FREQS; i++) {
+    Serial.printf("\n------- Trying CPU Freq = %d ---------\n", cpufreqs[i]);
+    Serial.flush();  // wait to empty the UART FIFO before changing the CPU Freq.
+    setCpuFrequencyMhz(cpufreqs[i]);
+    Serial.updateBaudRate(115200);
+
+    Freq = getCpuFrequencyMhz();
+    Serial.print("CPU Freq = ");
+    Serial.print(Freq);
+    Serial.println(" MHz");
+    Freq = getXtalFrequencyMhz();
+    Serial.print("XTAL Freq = ");
+    Serial.print(Freq);
+    Serial.println(" MHz");
+    Freq = getApbFrequency();
+    Serial.print("APB Freq = ");
+    Serial.print(Freq);
+    Serial.println(" Hz");
+    if (i < NUM_CPU_FREQS - 1) {
+      Serial.println("Moving to the next frequency after a pause of 2 seconds.");
+      delay(2000);
+    }
+  }
+  Serial.println("\n-------------------\n");
+  Serial.println("End of testing...");
+  Serial.println("\n-------------------\n");
+}
+
+void loop() {
+  // Nothing here so far
+}