Merge branch 'master' into wifi_init_status_idle

CMakeLists.txt

@@ -254,21 +254,9 @@ function(maybe_add_component component_name)
     endif()
 endfunction()
 
-maybe_add_component(esp-dsp)
-
-if(CONFIG_ESP_INSIGHTS_ENABLED)
-    maybe_add_component(esp_insights)
-endif()
-if(CONFIG_ESP_RMAKER_WORK_QUEUE_TASK_STACK)
-    maybe_add_component(esp_rainmaker)
-    maybe_add_component(qrcode)
-endif()
 if(IDF_TARGET MATCHES "esp32s2|esp32s3" AND CONFIG_TINYUSB_ENABLED)
     maybe_add_component(arduino_tinyusb)
 endif()
 if(NOT CONFIG_ARDUINO_SELECTIVE_COMPILATION OR CONFIG_ARDUINO_SELECTIVE_ArduinoOTA)
     maybe_add_component(esp_https_ota)
 endif()
-if(NOT CONFIG_ARDUINO_SELECTIVE_COMPILATION OR CONFIG_ARDUINO_SELECTIVE_LITTLEFS)
-    maybe_add_component(esp_littlefs)
-endif()

README.md

@@ -25,12 +25,18 @@ Latest Development Release  [![Release Version](https://img.shields.io/github/re
 
 Our Development is fully tracked on this public **[Roadmap 🎉](https://github.com/orgs/espressif/projects/3)**
 
-For even more information you can take a look at [Sprint Meeting notes](https://github.com/espressif/arduino-esp32/discussions/categories/sprints-meeting-notes) or join [Monthly Community Meetings 🔔](https://github.com/espressif/arduino-esp32/discussions/categories/monthly-community-meetings)
+For even more information you can join our **[Monthly Community Meetings 🔔](https://github.com/espressif/arduino-esp32/discussions/categories/monthly-community-meetings).**
 
 ### Documentation
 
 You can use the [Arduino-ESP32 Online Documentation](https://docs.espressif.com/projects/arduino-esp32/en/latest/) to get all information about this project.
 
+---
+
+**Migration guide from version 2.x to 3.x is available [here](https://docs.espressif.com/projects/arduino-esp32/en/latest/migration_guides/2.x_to_3.0.html).**
+
+---
+
 * [Getting Started](https://docs.espressif.com/projects/arduino-esp32/en/latest/getting_started.html)
 * [Installing (Windows, Linux and macOS)](https://docs.espressif.com/projects/arduino-esp32/en/latest/installing.html)
 * [Libraries](https://docs.espressif.com/projects/arduino-esp32/en/latest/libraries.html)
@@ -40,7 +46,18 @@ You can use the [Arduino-ESP32 Online Documentation](https://docs.espressif.com/
 
 ### Supported Chips
 
-Visit the [supported chips](https://docs.espressif.com/projects/arduino-esp32/en/latest/getting_started.html#supported-soc-s) documentation to see the list of current supported ESP32 SoCs.
+Here are the ESP32 series supported by the Arduino-ESP32 project:
+
+| **SoC**  | **Stable** | **Development** |                                           **Datasheet**                                           |
+|----------|:----------:|:---------------:|:-------------------------------------------------------------------------------------------------:|
+| ESP32    |     Yes    |       Yes       |    [ESP32](https://www.espressif.com/sites/default/files/documentation/esp32_datasheet_en.pdf)    |
+| ESP32-S2 |     Yes    |       Yes       | [ESP32-S2](https://www.espressif.com/sites/default/files/documentation/esp32-s2_datasheet_en.pdf) |
+| ESP32-C3 |     Yes    |       Yes       | [ESP32-C3](https://www.espressif.com/sites/default/files/documentation/esp32-c3_datasheet_en.pdf) |
+| ESP32-S3 |     Yes    |       Yes       | [ESP32-S3](https://www.espressif.com/sites/default/files/documentation/esp32-s3_datasheet_en.pdf) |
+| ESP32-C6 |     No     |       Yes       | [ESP32-C6](https://www.espressif.com/sites/default/files/documentation/esp32-c6_datasheet_en.pdf) |
+| ESP32-H2 |     No     |       Yes       | [ESP32-H2](https://www.espressif.com/sites/default/files/documentation/esp32-h2_datasheet_en.pdf) |
+
+For more details visit the [supported chips](https://docs.espressif.com/projects/arduino-esp32/en/latest/getting_started.html#supported-soc-s) documentation page.
 
 ### Decoding exceptions
 

boards.txt

@@ -17,6 +17,7 @@ menu.EventsCore=Events Run On
 menu.MemoryType=Memory Type
 menu.EraseFlash=Erase All Flash Before Sketch Upload
 menu.JTAGAdapter=JTAG Adapter
+menu.ZigbeeMode=Zigbee Mode
 
 # Custom options
 menu.Revision=Board Revision
@@ -122,6 +123,12 @@ esp32h2.menu.PartitionScheme.app3M_fat9M_16MB.upload.maximum_size=3145728
 esp32h2.menu.PartitionScheme.rainmaker=RainMaker
 esp32h2.menu.PartitionScheme.rainmaker.build.partitions=rainmaker
 esp32h2.menu.PartitionScheme.rainmaker.upload.maximum_size=3145728
+esp32h2.menu.PartitionScheme.zigbee=Zigbee 4MB with spiffs
+esp32h2.menu.PartitionScheme.zigbee.build.partitions=zigbee
+esp32h2.menu.PartitionScheme.zigbee.upload.maximum_size=1310720
+esp32h2.menu.PartitionScheme.zigbee_zczr=Zigbee ZCZR 4MB with spiffs
+esp32h2.menu.PartitionScheme.zigbee_zczr.build.partitions=zigbee_zczr
+esp32h2.menu.PartitionScheme.zigbee_zczr.upload.maximum_size=1310720
 esp32h2.menu.PartitionScheme.custom=Custom
 esp32h2.menu.PartitionScheme.custom.build.partitions=
 esp32h2.menu.PartitionScheme.custom.upload.maximum_size=16777216
@@ -187,6 +194,20 @@ esp32h2.menu.EraseFlash.none.upload.erase_cmd=
 esp32h2.menu.EraseFlash.all=Enabled
 esp32h2.menu.EraseFlash.all.upload.erase_cmd=-e
 
+esp32h2.menu.ZigbeeMode.default=Disabled
+esp32h2.menu.ZigbeeMode.default.build.zigbee_mode=
+esp32h2.menu.ZigbeeMode.default.build.zigbee_libs=
+esp32h2.menu.ZigbeeMode.ed=Zigbee ED (end device)
+esp32h2.menu.ZigbeeMode.ed.build.zigbee_mode=-DZIGBEE_MODE_ED
+esp32h2.menu.ZigbeeMode.ed.build.zigbee_libs=-lesp_zb_api_ed -lesp_zb_cli_command -lzboss_stack.ed.trace -lzboss_stack.ed -lzboss_port
+esp32h2.menu.ZigbeeMode.zczr=Zigbee ZCZR (coordinator)
+esp32h2.menu.ZigbeeMode.zczr.build.zigbee_mode=-DZIGBEE_MODE_ZCZR
+esp32h2.menu.ZigbeeMode.zczr.build.zigbee_libs=-lesp_zb_api_zczr -lesp_zb_cli_command -lzboss_stack.zczr.trace -lzboss_stack.zczr -lzboss_port
+esp32h2.menu.ZigbeeMode.rcp=Zigbee RCP (radio co-processor)
+esp32h2.menu.ZigbeeMode.rcp.build.zigbee_mode=-DZIGBEE_MODE_RCP
+esp32h2.menu.ZigbeeMode.rcp.build.zigbee_libs=-lesp_zb_api_rcp -lesp_zb_cli_command -lzboss_stack.rcp -lzboss_port
+
+
 ##############################################################
 
 esp32c6.name=ESP32C6 Dev Module
@@ -281,6 +302,12 @@ esp32c6.menu.PartitionScheme.app3M_fat9M_16MB.upload.maximum_size=3145728
 esp32c6.menu.PartitionScheme.rainmaker=RainMaker
 esp32c6.menu.PartitionScheme.rainmaker.build.partitions=rainmaker
 esp32c6.menu.PartitionScheme.rainmaker.upload.maximum_size=3145728
+esp32c6.menu.PartitionScheme.zigbee=Zigbee 4MB with spiffs
+esp32c6.menu.PartitionScheme.zigbee.build.partitions=zigbee
+esp32c6.menu.PartitionScheme.zigbee.upload.maximum_size=1310720
+esp32c6.menu.PartitionScheme.zigbee_zczr=Zigbee ZCZR 4MB with spiffs
+esp32c6.menu.PartitionScheme.zigbee_zczr.build.partitions=zigbee_zczr
+esp32c6.menu.PartitionScheme.zigbee_zczr.upload.maximum_size=1310720
 esp32c6.menu.PartitionScheme.custom=Custom
 esp32c6.menu.PartitionScheme.custom.build.partitions=
 esp32c6.menu.PartitionScheme.custom.upload.maximum_size=16777216
@@ -352,6 +379,19 @@ esp32c6.menu.EraseFlash.none.upload.erase_cmd=
 esp32c6.menu.EraseFlash.all=Enabled
 esp32c6.menu.EraseFlash.all.upload.erase_cmd=-e
 
+esp32c6.menu.ZigbeeMode.default=Disabled
+esp32c6.menu.ZigbeeMode.default.build.zigbee_mode=
+esp32c6.menu.ZigbeeMode.default.build.zigbee_libs=
+esp32c6.menu.ZigbeeMode.ed=Zigbee ED (end device)
+esp32c6.menu.ZigbeeMode.ed.build.zigbee_mode=-DZIGBEE_MODE_ED
+esp32c6.menu.ZigbeeMode.ed.build.zigbee_libs=-lesp_zb_api_ed -lesp_zb_cli_command -lzboss_stack.ed.trace -lzboss_stack.ed -lzboss_port
+esp32c6.menu.ZigbeeMode.zczr=Zigbee ZCZR (coordinator)
+esp32c6.menu.ZigbeeMode.zczr.build.zigbee_mode=-DZIGBEE_MODE_ZCZR
+esp32c6.menu.ZigbeeMode.zczr.build.zigbee_libs=-lesp_zb_api_zczr -lesp_zb_cli_command -lzboss_stack.zczr.trace -lzboss_stack.zczr -lzboss_port
+esp32c6.menu.ZigbeeMode.rcp=Zigbee RCP (radio co-processor)
+esp32c6.menu.ZigbeeMode.rcp.build.zigbee_mode=-DZIGBEE_MODE_RCP
+esp32c6.menu.ZigbeeMode.rcp.build.zigbee_libs=-lesp_zb_api_rcp -lesp_zb_cli_command -lzboss_stack.rcp -lzboss_port
+
 ##############################################################
 
 esp32s3.name=ESP32S3 Dev Module
@@ -538,6 +578,9 @@ esp32s3.menu.PartitionScheme.esp_sr_16=ESP SR 16M (3MB APP/7MB SPIFFS/2.9MB MODE
 esp32s3.menu.PartitionScheme.esp_sr_16.upload.maximum_size=3145728
 esp32s3.menu.PartitionScheme.esp_sr_16.upload.extra_flags=0xD10000 {build.path}/srmodels.bin
 esp32s3.menu.PartitionScheme.esp_sr_16.build.partitions=esp_sr_16
+esp32s3.menu.PartitionScheme.zigbee_zczr=Zigbee ZCZR 4MB with spiffs
+esp32s3.menu.PartitionScheme.zigbee_zczr.build.partitions=zigbee_zczr
+esp32s3.menu.PartitionScheme.zigbee_zczr.upload.maximum_size=1310720
 esp32s3.menu.PartitionScheme.custom=Custom
 esp32s3.menu.PartitionScheme.custom.build.partitions=
 esp32s3.menu.PartitionScheme.custom.upload.maximum_size=16777216
@@ -588,6 +631,13 @@ esp32s3.menu.EraseFlash.none.upload.erase_cmd=
 esp32s3.menu.EraseFlash.all=Enabled
 esp32s3.menu.EraseFlash.all.upload.erase_cmd=-e
 
+esp32s3.menu.ZigbeeMode.default=Disabled
+esp32s3.menu.ZigbeeMode.default.build.zigbee_mode=
+esp32s3.menu.ZigbeeMode.default.build.zigbee_libs=
+esp32s3.menu.ZigbeeMode.zczr=Zigbee ZCZR (coordinator)
+esp32s3.menu.ZigbeeMode.zczr.build.zigbee_mode=-DZIGBEE_MODE_ZCZR
+esp32s3.menu.ZigbeeMode.zczr.build.zigbee_libs=-lesp_zb_api_zczr -lesp_zb_cli_command -lzboss_stack.zczr.trace -lzboss_stack.zczr -lzboss_port
+
 ##############################################################
 
 esp32c3.name=ESP32C3 Dev Module
@@ -682,6 +732,9 @@ esp32c3.menu.PartitionScheme.app3M_fat9M_16MB.upload.maximum_size=3145728
 esp32c3.menu.PartitionScheme.rainmaker=RainMaker
 esp32c3.menu.PartitionScheme.rainmaker.build.partitions=rainmaker
 esp32c3.menu.PartitionScheme.rainmaker.upload.maximum_size=3145728
+esp32c3.menu.PartitionScheme.zigbee_zczr=Zigbee ZCZR 4MB with spiffs
+esp32c3.menu.PartitionScheme.zigbee_zczr.build.partitions=zigbee_zczr
+esp32c3.menu.PartitionScheme.zigbee_zczr.upload.maximum_size=1310720
 esp32c3.menu.PartitionScheme.custom=Custom
 esp32c3.menu.PartitionScheme.custom.build.partitions=
 esp32c3.menu.PartitionScheme.custom.upload.maximum_size=16777216
@@ -753,6 +806,12 @@ esp32c3.menu.EraseFlash.none.upload.erase_cmd=
 esp32c3.menu.EraseFlash.all=Enabled
 esp32c3.menu.EraseFlash.all.upload.erase_cmd=-e
 
+esp32c3.menu.ZigbeeMode.default=Disabled
+esp32c3.menu.ZigbeeMode.default.build.zigbee_mode=
+esp32c3.menu.ZigbeeMode.default.build.zigbee_libs=
+esp32c3.menu.ZigbeeMode.zczr=Zigbee ZCZR (coordinator)
+esp32c3.menu.ZigbeeMode.zczr.build.zigbee_mode=-DZIGBEE_MODE_ZCZR
+esp32c3.menu.ZigbeeMode.zczr.build.zigbee_libs=-lesp_zb_api_zczr -lesp_zb_cli_command -lzboss_stack.zczr.trace -lzboss_stack.zczr -lzboss_port
 ##############################################################
 
 esp32s2.name=ESP32S2 Dev Module
@@ -868,6 +927,9 @@ esp32s2.menu.PartitionScheme.app3M_fat9M_16MB.upload.maximum_size=3145728
 esp32s2.menu.PartitionScheme.rainmaker=RainMaker
 esp32s2.menu.PartitionScheme.rainmaker.build.partitions=rainmaker
 esp32s2.menu.PartitionScheme.rainmaker.upload.maximum_size=3145728
+esp32s2.menu.PartitionScheme.zigbee_zczr=Zigbee ZCZR 4MB with spiffs
+esp32s2.menu.PartitionScheme.zigbee_zczr.build.partitions=zigbee_zczr
+esp32s2.menu.PartitionScheme.zigbee_zczr.upload.maximum_size=1310720
 esp32s2.menu.PartitionScheme.custom=Custom
 esp32s2.menu.PartitionScheme.custom.build.partitions=
 esp32s2.menu.PartitionScheme.custom.upload.maximum_size=16777216
@@ -941,6 +1003,13 @@ esp32s2.menu.EraseFlash.none.upload.erase_cmd=
 esp32s2.menu.EraseFlash.all=Enabled
 esp32s2.menu.EraseFlash.all.upload.erase_cmd=-e
 
+esp32s2.menu.ZigbeeMode.default=Disabled
+esp32s2.menu.ZigbeeMode.default.build.zigbee_mode=
+esp32s2.menu.ZigbeeMode.default.build.zigbee_libs=
+esp32s2.menu.ZigbeeMode.zczr=Zigbee ZCZR (coordinator)
+esp32s2.menu.ZigbeeMode.zczr.build.zigbee_mode=-DZIGBEE_MODE_ZCZR
+esp32s2.menu.ZigbeeMode.zczr.build.zigbee_libs=-lesp_zb_api_zczr -lesp_zb_cli_command -lzboss_stack.zczr.trace -lzboss_stack.zczr -lzboss_port
+
 ##############################################################
 
 esp32.name=ESP32 Dev Module
@@ -1031,6 +1100,9 @@ esp32.menu.PartitionScheme.app3M_fat9M_16MB.upload.maximum_size=3145728
 esp32.menu.PartitionScheme.rainmaker=RainMaker
 esp32.menu.PartitionScheme.rainmaker.build.partitions=rainmaker
 esp32.menu.PartitionScheme.rainmaker.upload.maximum_size=3145728
+esp32.menu.PartitionScheme.zigbee_zczr=Zigbee ZCZR 4MB with spiffs
+esp32.menu.PartitionScheme.zigbee_zczr.build.partitions=zigbee_zczr
+esp32.menu.PartitionScheme.zigbee_zczr.upload.maximum_size=1310720
 esp32.menu.PartitionScheme.custom=Custom
 esp32.menu.PartitionScheme.custom.build.partitions=
 esp32.menu.PartitionScheme.custom.upload.maximum_size=16777216
@@ -1118,6 +1190,13 @@ esp32.menu.EraseFlash.none.upload.erase_cmd=
 esp32.menu.EraseFlash.all=Enabled
 esp32.menu.EraseFlash.all.upload.erase_cmd=-e
 
+esp32.menu.ZigbeeMode.default=Disabled
+esp32.menu.ZigbeeMode.default.build.zigbee_mode=
+esp32.menu.ZigbeeMode.default.build.zigbee_libs=
+esp32.menu.ZigbeeMode.zczr=Zigbee ZCZR (coordinator)
+esp32.menu.ZigbeeMode.zczr.build.zigbee_mode=-DZIGBEE_MODE_ZCZR
+esp32.menu.ZigbeeMode.zczr.build.zigbee_libs=-lesp_zb_api_zczr -lesp_zb_cli_command -lzboss_stack.zczr.trace -lzboss_stack.zczr -lzboss_port
+
 ##############################################################
 
 esp32da.name=ESP32-WROOM-DA Module

cores/esp32/HardwareSerial.cpp

@@ -107,10 +107,6 @@ _eventTask(NULL)
         }
     }
 #endif
-    // sets UART0 (default console) RX/TX pins as already configured in boot
-    if (uart_nr == 0) {
-        setPins(SOC_RX0, SOC_TX0);
-    }
     // set deinit function in the Peripheral Manager
     uart_init_PeriMan();
 }

cores/esp32/chip-debug-report.cpp

@@ -251,55 +251,7 @@ static void printPerimanInfo(void){
       continue;//unused pin
     }
     chip_report_printf("  %17u : ", i);
-    switch(type){
-      case ESP32_BUS_TYPE_GPIO: chip_report_printf("GPIO\n"); break;
-      case ESP32_BUS_TYPE_UART_RX: chip_report_printf("UART_RX\n"); break;
-      case ESP32_BUS_TYPE_UART_TX: chip_report_printf("UART_TX\n"); break;
-      case ESP32_BUS_TYPE_UART_CTS: chip_report_printf("UART_CTS\n"); break;
-      case ESP32_BUS_TYPE_UART_RTS: chip_report_printf("UART_RTS\n"); break;
-#if SOC_SDM_SUPPORTED
-      case ESP32_BUS_TYPE_SIGMADELTA: chip_report_printf("SIGMADELTA\n"); break;
-#endif
-#if SOC_ADC_SUPPORTED
-      case ESP32_BUS_TYPE_ADC_ONESHOT: chip_report_printf("ADC_ONESHOT\n"); break;
-      case ESP32_BUS_TYPE_ADC_CONT: chip_report_printf("ADC_CONT\n"); break;
-#endif
-#if SOC_DAC_SUPPORTED
-      case ESP32_BUS_TYPE_DAC_ONESHOT: chip_report_printf("DAC_ONESHOT\n"); break;
-      case ESP32_BUS_TYPE_DAC_CONT: chip_report_printf("DAC_CONT\n"); break;
-      case ESP32_BUS_TYPE_DAC_COSINE: chip_report_printf("DAC_COSINE\n"); break;
-#endif
-#if SOC_LEDC_SUPPORTED
-      case ESP32_BUS_TYPE_LEDC: chip_report_printf("LEDC\n"); break;
-#endif
-#if SOC_RMT_SUPPORTED
-      case ESP32_BUS_TYPE_RMT_TX: chip_report_printf("RMT_TX\n"); break;
-      case ESP32_BUS_TYPE_RMT_RX: chip_report_printf("RMT_RX\n"); break;
-#endif
-#if SOC_I2S_SUPPORTED
-      case ESP32_BUS_TYPE_I2S_STD: chip_report_printf("I2S_STD\n"); break;
-      case ESP32_BUS_TYPE_I2S_TDM: chip_report_printf("I2S_TDM\n"); break;
-      case ESP32_BUS_TYPE_I2S_PDM_TX: chip_report_printf("I2S_PDM_TX\n"); break;
-      case ESP32_BUS_TYPE_I2S_PDM_RX: chip_report_printf("I2S_PDM_RX\n"); break;
-#endif
-#if SOC_I2C_SUPPORTED
-      case ESP32_BUS_TYPE_I2C_MASTER: chip_report_printf("I2C_MASTER\n"); break;
-      case ESP32_BUS_TYPE_I2C_SLAVE: chip_report_printf("I2C_SLAVE\n"); break;
-#endif
-#if SOC_GPSPI_SUPPORTED
-      case ESP32_BUS_TYPE_SPI_MASTER: chip_report_printf("SPI_MASTER\n"); break;
-#endif
-#if SOC_SDMMC_HOST_SUPPORTED
-      case ESP32_BUS_TYPE_SDMMC: chip_report_printf("SDMMC\n"); break;
-#endif
-#if SOC_TOUCH_SENSOR_SUPPORTED
-      case ESP32_BUS_TYPE_TOUCH: chip_report_printf("TOUCH\n"); break;
-#endif
-#if SOC_USB_SERIAL_JTAG_SUPPORTED || SOC_USB_OTG_SUPPORTED
-      case ESP32_BUS_TYPE_USB: chip_report_printf("USB\n"); break;
-#endif
-      default: chip_report_printf("%d\n", type); break;
-    }
+    chip_report_printf("%s\n", perimanGetTypeName(type));
   }
 }