Merge branch 'master' into wifi_init_status_idle

SuGlider · web-flow · commit 373889a9fb41 · 2023-11-09T09:38:40.000-03:00
diff --git a/README.md b/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
 
diff --git a/cores/esp32/HardwareSerial.cpp b/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();
 }
diff --git a/cores/esp32/chip-debug-report.cpp b/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));
   }
 }
 
diff --git a/cores/esp32/esp32-hal-periman.c b/cores/esp32/esp32-hal-periman.c
@@ -18,6 +18,59 @@ static peripheral_pin_item_t pins[SOC_GPIO_PIN_COUNT];
 
 #define GPIO_NOT_VALID(p) ((p >= SOC_GPIO_PIN_COUNT) || ((SOC_GPIO_VALID_GPIO_MASK & (1ULL << p)) == 0))
 
+const char* perimanGetTypeName(peripheral_bus_type_t type) {
+	switch(type) {
+		case ESP32_BUS_TYPE_INIT: return "INIT";
+		case ESP32_BUS_TYPE_GPIO: return "GPIO";
+		case ESP32_BUS_TYPE_UART_RX: return "UART_RX";
+		case ESP32_BUS_TYPE_UART_TX: return "UART_TX";
+		case ESP32_BUS_TYPE_UART_CTS: return "UART_CTS";
+		case ESP32_BUS_TYPE_UART_RTS: return "UART_RTS";
+#if SOC_SDM_SUPPORTED
+		case ESP32_BUS_TYPE_SIGMADELTA: return "SIGMADELTA";
+#endif
+#if SOC_ADC_SUPPORTED
+		case ESP32_BUS_TYPE_ADC_ONESHOT: return "ADC_ONESHOT";
+		case ESP32_BUS_TYPE_ADC_CONT: return "ADC_CONT";
+#endif
+#if SOC_DAC_SUPPORTED
+		case ESP32_BUS_TYPE_DAC_ONESHOT: return "DAC_ONESHOT";
+		case ESP32_BUS_TYPE_DAC_CONT: return "DAC_CONT";
+		case ESP32_BUS_TYPE_DAC_COSINE: return "DAC_COSINE";
+#endif
+#if SOC_LEDC_SUPPORTED
+		case ESP32_BUS_TYPE_LEDC: return "LEDC";
+#endif
+#if SOC_RMT_SUPPORTED
+		case ESP32_BUS_TYPE_RMT_TX: return "RMT_TX";
+		case ESP32_BUS_TYPE_RMT_RX: return "RMT_RX";
+#endif
+#if SOC_I2S_SUPPORTED
+		case ESP32_BUS_TYPE_I2S_STD: return "I2S_STD";
+		case ESP32_BUS_TYPE_I2S_TDM: return "I2S_TDM";
+		case ESP32_BUS_TYPE_I2S_PDM_TX: return "I2S_PDM_TX";
+		case ESP32_BUS_TYPE_I2S_PDM_RX: return "I2S_PDM_RX";
+#endif
+#if SOC_I2C_SUPPORTED
+		case ESP32_BUS_TYPE_I2C_MASTER: return "I2C_MASTER";
+		case ESP32_BUS_TYPE_I2C_SLAVE: return "I2C_SLAVE";
+#endif
+#if SOC_GPSPI_SUPPORTED
+		case ESP32_BUS_TYPE_SPI_MASTER: return "SPI_MASTER";
+#endif
+#if SOC_SDMMC_HOST_SUPPORTED
+		case ESP32_BUS_TYPE_SDMMC: return "SDMMC";
+#endif
+#if SOC_TOUCH_SENSOR_SUPPORTED
+		case ESP32_BUS_TYPE_TOUCH: return "TOUCH";
+#endif
+#if SOC_USB_SERIAL_JTAG_SUPPORTED || SOC_USB_OTG_SUPPORTED
+		case ESP32_BUS_TYPE_USB: return "USB";
+#endif
+		default: return "UNKNOWN";
+    }
+}
+
 bool perimanSetPinBus(uint8_t pin, peripheral_bus_type_t type, void * bus){
 	peripheral_bus_type_t otype = ESP32_BUS_TYPE_INIT;
 	void * obus = NULL;
@@ -26,37 +79,38 @@ bool perimanSetPinBus(uint8_t pin, peripheral_bus_type_t type, void * bus){
 		return false;
 	}
 	if(type >= ESP32_BUS_TYPE_MAX){
-		log_e("Invalid type: %u", (unsigned int)type);
+		log_e("Invalid type: %s (%u) when setting pin %u", perimanGetTypeName(type), (unsigned int)type, pin);
 		return false;
 	}
 	if(type > ESP32_BUS_TYPE_GPIO && bus == NULL){
-		log_e("Bus is NULL");
+		log_e("Bus is NULL for pin %u with type %s (%u)", pin, perimanGetTypeName(type), (unsigned int)type);
 		return false;
 	}
 	if (type == ESP32_BUS_TYPE_INIT && bus != NULL){
-		log_e("Can't set a Bus to INIT Type");
+		log_e("Can't set a Bus to INIT Type (pin %u)", pin);
 		return false;
-	}	
+	}
 	otype = pins[pin].type;
 	obus = pins[pin].bus;
 	if(type == otype && bus == obus){
 		if (type != ESP32_BUS_TYPE_INIT) {
-		        log_i("Bus already set");
+		    log_i("Pin %u already has type %s (%u) with bus %p", pin, perimanGetTypeName(type), (unsigned int)type, bus);
 		}
 		return true;
 	}
 	if(obus != NULL){
 		if(deinit_functions[otype] == NULL){
-			log_e("Bus does not have deinit function set");
+			log_e("No deinit function for type %s (%u) (pin %u)", perimanGetTypeName(otype), (unsigned int)otype, pin);
 			return false;
 		}
 		if(!deinit_functions[otype](obus)){
-			log_e("Previous bus failed to deinit");
+			log_e("Deinit function for previous bus type %s (%u) failed (pin %u)", perimanGetTypeName(otype), (unsigned int)otype, pin);
 			return false;
 		}
 	}
 	pins[pin].type = type;
 	pins[pin].bus = bus;
+	log_v("Pin %u successfully set to type %s (%u) with bus %p", pin, perimanGetTypeName(type), (unsigned int)type, bus);
 	return true;
 }
 
@@ -66,7 +120,7 @@ void * perimanGetPinBus(uint8_t pin, peripheral_bus_type_t type){
 		return NULL;
 	}
 	if(type >= ESP32_BUS_TYPE_MAX  || type  == ESP32_BUS_TYPE_INIT){
-		log_e("Invalid type: %u", (unsigned int)type);
+		log_e("Invalid type %s (%u) for pin %u", perimanGetTypeName(type), (unsigned int)type, pin);
 		return NULL;
 	}
 	if(pins[pin].type == type){
@@ -85,14 +139,15 @@ peripheral_bus_type_t perimanGetPinBusType(uint8_t pin){
 
 bool perimanSetBusDeinit(peripheral_bus_type_t type, peripheral_bus_deinit_cb_t cb){
 	if(type >= ESP32_BUS_TYPE_MAX || type == ESP32_BUS_TYPE_INIT){
-		log_e("Invalid type: %u", (unsigned int)type);
+		log_e("Invalid type: %s (%u)", perimanGetTypeName(type), (unsigned int)type);
 		return false;
 	}
 	if(cb == NULL){
-		log_e("Callback is NULL");
+		log_e("Callback is NULL when setting deinit function for type %s (%u)", perimanGetTypeName(type), (unsigned int)type);
 		return false;
 	}
 	deinit_functions[type] = cb;
+	log_v("Deinit function for type %s (%u) successfully set to %p", perimanGetTypeName(type), (unsigned int)type, cb);
 	return true;
 }
 
diff --git a/cores/esp32/esp32-hal-periman.h b/cores/esp32/esp32-hal-periman.h
@@ -70,6 +70,8 @@ typedef enum {
 
 typedef bool (*peripheral_bus_deinit_cb_t)(void * bus);
 
+const char* perimanGetTypeName(peripheral_bus_type_t type);
+
 // Sets the bus type and bus handle for given pin.
 bool perimanSetPinBus(uint8_t pin, peripheral_bus_type_t type, void * bus);
 
diff --git a/cores/esp32/esp32-hal-uart.c b/cores/esp32/esp32-hal-uart.c
@@ -184,6 +184,8 @@ static bool _uartAttachPins(uint8_t uart_num, int8_t rxPin, int8_t txPin, int8_t
 
     bool retCode = true;
     if (rxPin >= 0) {
+        // forces a clean detaching from a previous peripheral
+        if (perimanGetPinBusType(rxPin) != ESP32_BUS_TYPE_INIT) perimanSetPinBus(rxPin, ESP32_BUS_TYPE_INIT, NULL);
         // connect RX Pad
         bool ret = ESP_OK == uart_set_pin(uart->num, UART_PIN_NO_CHANGE, rxPin, UART_PIN_NO_CHANGE, UART_PIN_NO_CHANGE);
         if (ret) {
@@ -196,6 +198,8 @@ static bool _uartAttachPins(uint8_t uart_num, int8_t rxPin, int8_t txPin, int8_t
         retCode &= ret;
     }
     if (txPin >= 0) {
+        // forces a clean detaching from a previous peripheral
+        if (perimanGetPinBusType(txPin) != ESP32_BUS_TYPE_INIT) perimanSetPinBus(txPin, ESP32_BUS_TYPE_INIT, NULL);
         // connect TX Pad
         bool ret = ESP_OK == uart_set_pin(uart->num, txPin, UART_PIN_NO_CHANGE, UART_PIN_NO_CHANGE, UART_PIN_NO_CHANGE);
         if (ret) {
@@ -208,6 +212,8 @@ static bool _uartAttachPins(uint8_t uart_num, int8_t rxPin, int8_t txPin, int8_t
         retCode &= ret;
     }
     if (ctsPin >= 0) {
+        // forces a clean detaching from a previous peripheral
+        if (perimanGetPinBusType(ctsPin) != ESP32_BUS_TYPE_INIT) perimanSetPinBus(ctsPin, ESP32_BUS_TYPE_INIT, NULL);
         // connect CTS Pad
         bool ret = ESP_OK == uart_set_pin(uart->num, UART_PIN_NO_CHANGE, UART_PIN_NO_CHANGE, UART_PIN_NO_CHANGE, ctsPin);
         if (ret) {
@@ -220,6 +226,8 @@ static bool _uartAttachPins(uint8_t uart_num, int8_t rxPin, int8_t txPin, int8_t
         retCode &= ret;
     }
     if (rtsPin >= 0) {
+        // forces a clean detaching from a previous peripheral
+        if (perimanGetPinBusType(rtsPin) != ESP32_BUS_TYPE_INIT) perimanSetPinBus(rtsPin, ESP32_BUS_TYPE_INIT, NULL);
         // connect RTS Pad
         bool ret = ESP_OK == uart_set_pin(uart->num, UART_PIN_NO_CHANGE, UART_PIN_NO_CHANGE, rtsPin, UART_PIN_NO_CHANGE);
         if (ret) {
@@ -759,12 +767,14 @@ int log_printfv(const char *format, va_list arg)
             return 0;
         }
     }
+/*
+// This causes dead locks with logging in specific cases and also with C++ constructors that may send logs
 #if !CONFIG_DISABLE_HAL_LOCKS
     if(s_uart_debug_nr != -1 && _uart_bus_array[s_uart_debug_nr].lock){
         xSemaphoreTake(_uart_bus_array[s_uart_debug_nr].lock, portMAX_DELAY);
     }
 #endif
-    
+*/
 #if CONFIG_IDF_TARGET_ESP32C3
     vsnprintf(temp, len+1, format, arg);
     ets_printf("%s", temp);
@@ -774,15 +784,19 @@ int log_printfv(const char *format, va_list arg)
         ets_write_char_uart(temp[i]);
     }
 #endif
-
+/*
+// This causes dead locks with logging and also with constructors that may send logs
 #if !CONFIG_DISABLE_HAL_LOCKS
     if(s_uart_debug_nr != -1 && _uart_bus_array[s_uart_debug_nr].lock){
         xSemaphoreGive(_uart_bus_array[s_uart_debug_nr].lock);
     }
 #endif
+*/
     if(len >= sizeof(loc_buf)){
         free(temp);
     }
+    // flushes TX - make sure that the log message is completely sent.
+    if(s_uart_debug_nr != -1) while(!uart_ll_is_tx_idle(UART_LL_GET_HW(s_uart_debug_nr)));
     return len;
 }
 
diff --git a/cores/esp32/main.cpp b/cores/esp32/main.cpp
@@ -45,6 +45,8 @@ __attribute__((weak)) bool shouldPrintChipDebugReport(void) {
 
 void loopTask(void *pvParameters)
 {
+    // sets UART0 (default console) RX/TX pins as already configured in boot or as defined in variants/pins_arduino.h
+    Serial0.setPins(SOC_RX0, SOC_TX0);
 #if ARDUHAL_LOG_LEVEL >= ARDUHAL_LOG_LEVEL_DEBUG
     printBeforeSetupInfo();
 #else

Original file line number	Diff line number	Diff line change
`@@ -107,10 +107,6 @@ _eventTask(NULL)`
`107`	`107`	`}`
`108`	`108`	`}`
`109`	`109`	`#endif`
`110`		`- // sets UART0 (default console) RX/TX pins as already configured in boot`
`111`		`- if (uart_nr == 0) {`
`112`		`- setPins(SOC_RX0, SOC_TX0);`
`113`		`- }`
`114`	`110`	`// set deinit function in the Peripheral Manager`
`115`	`111`	`uart_init_PeriMan();`
`116`	`112`	`}`
Original file line number	Diff line number	Diff line change
`@@ -45,6 +45,8 @@ __attribute__((weak)) bool shouldPrintChipDebugReport(void) {`
`45`	`45`
`46`	`46`	`void loopTask(void *pvParameters)`
`47`	`47`	`{`
	`48`	`+ // sets UART0 (default console) RX/TX pins as already configured in boot or as defined in variants/pins_arduino.h`
	`49`	`+ Serial0.setPins(SOC_RX0, SOC_TX0);`
`48`	`50`	`#if ARDUHAL_LOG_LEVEL >= ARDUHAL_LOG_LEVEL_DEBUG`
`49`	`51`	`printBeforeSetupInfo();`
`50`	`52`	`#else`