Fix CDC+JTAG is disabled when WiFi is used on ESP32-C3

me-no-dev · web-flow · commit 0aeefeb65a65 · 2022-02-15T13:26:50.000+02:00
Fixes: #6264 Thanks @Spritetm
diff --git a/libraries/WiFi/src/WiFiGeneric.cpp b/libraries/WiFi/src/WiFiGeneric.cpp
@@ -555,6 +555,10 @@ void WiFiGenericClass::useStaticBuffers(bool bufferMode){
     _wifiUseStaticBuffers = bufferMode;
 }
 
+// Temporary fix to ensure that CDC+JTAG stay on on ESP32-C3
+#if CONFIG_IDF_TARGET_ESP32C3
+extern "C" void phy_bbpll_en_usb(bool en);
+#endif
 
 bool wifiLowLevelInit(bool persistent){
     if(!lowLevelInitDone){
@@ -587,6 +591,10 @@ bool wifiLowLevelInit(bool persistent){
         	lowLevelInitDone = false;
         	return lowLevelInitDone;
         }
+// Temporary fix to ensure that CDC+JTAG stay on on ESP32-C3
+#if CONFIG_IDF_TARGET_ESP32C3
+	phy_bbpll_en_usb(true);
+#endif
         if(!persistent){
         	lowLevelInitDone = esp_wifi_set_storage(WIFI_STORAGE_RAM) == ESP_OK;
         }

Original file line number	Diff line number	Diff line change
`@@ -555,6 +555,10 @@ void WiFiGenericClass::useStaticBuffers(bool bufferMode){`
`555`	`555`	`_wifiUseStaticBuffers = bufferMode;`
`556`	`556`	`}`
`557`	`557`
	`558`	`+// Temporary fix to ensure that CDC+JTAG stay on on ESP32-C3`
	`559`	`+#if CONFIG_IDF_TARGET_ESP32C3`
	`560`	`+extern "C" void phy_bbpll_en_usb(bool en);`
	`561`	`+#endif`
`558`	`562`
`559`	`563`	`bool wifiLowLevelInit(bool persistent){`
`560`	`564`	`if(!lowLevelInitDone){`
`@@ -587,6 +591,10 @@ bool wifiLowLevelInit(bool persistent){`
`587`	`591`	`lowLevelInitDone = false;`
`588`	`592`	`return lowLevelInitDone;`
`589`	`593`	`}`
	`594`	`+// Temporary fix to ensure that CDC+JTAG stay on on ESP32-C3`
	`595`	`+#if CONFIG_IDF_TARGET_ESP32C3`
	`596`	`+ phy_bbpll_en_usb(true);`
	`597`	`+#endif`
`590`	`598`	`if(!persistent){`
`591`	`599`	`lowLevelInitDone = esp_wifi_set_storage(WIFI_STORAGE_RAM) == ESP_OK;`
`592`	`600`	`}`