fix(wifi): Fix WiFi setTxPower and getTxPower (espressif#9862)

me-no-dev · pre-commit-ci-lite[bot] · web-flow · commit c43187a3864b · 2024-06-17T22:47:12.000+03:00
* fix(wifi): Fix WiFi setTxPower and getTxPower

We need to wait for the interface to be started in order to be able to set/get TX Power. Code was returning too early, so calling the functions after `begin()` resulted in failure.

* ci(pre-commit): Apply automatic fixes

---------

Co-authored-by: pre-commit-ci-lite[bot] &lt;117423508+pre-commit-ci-lite[bot]@users.noreply.github.com&gt;
diff --git a/libraries/WiFi/src/AP.cpp b/libraries/WiFi/src/AP.cpp
@@ -187,6 +187,10 @@ bool APClass::begin() {
     log_e("AP enable failed!");
     return false;
   }
+  if (!waitStatusBits(ESP_NETIF_STARTED_BIT, 1000)) {
+    log_e("Failed to start AP!");
+    return false;
+  }
   return true;
 }
 
diff --git a/libraries/WiFi/src/STA.cpp b/libraries/WiFi/src/STA.cpp
@@ -298,6 +298,10 @@ bool STAClass::begin(bool tryConnect) {
     log_e("STA enable failed!");
     return false;
   }
+  if (!waitStatusBits(ESP_NETIF_STARTED_BIT, 1000)) {
+    log_e("Failed to start STA!");
+    return false;
+  }
   if (tryConnect) {
     return connect();
   }
diff --git a/libraries/WiFi/src/WiFiGeneric.cpp b/libraries/WiFi/src/WiFiGeneric.cpp
@@ -639,7 +639,11 @@ bool WiFiGenericClass::setTxPower(wifi_power_t power) {
     log_w("Neither AP or STA has been started");
     return false;
   }
-  return esp_wifi_set_max_tx_power(power) == ESP_OK;
+  esp_err_t err = esp_wifi_set_max_tx_power(power);
+  if (err != ESP_OK) {
+    log_e("Failed to set TX Power: 0x%x: %s", err, esp_err_to_name(err));
+  }
+  return err == ESP_OK;
 }
 
 wifi_power_t WiFiGenericClass::getTxPower() {
@@ -648,7 +652,9 @@ wifi_power_t WiFiGenericClass::getTxPower() {
     log_w("Neither AP or STA has been started");
     return WIFI_POWER_19_5dBm;
   }
-  if (esp_wifi_get_max_tx_power(&power)) {
+  esp_err_t err = esp_wifi_get_max_tx_power(&power);
+  if (err != ESP_OK) {
+    log_e("Failed to get TX Power: 0x%x: %s", err, esp_err_to_name(err));
     return WIFI_POWER_19_5dBm;
   }
   return (wifi_power_t)power;
diff --git a/libraries/WiFi/src/WiFiGeneric.h b/libraries/WiFi/src/WiFiGeneric.h
@@ -44,6 +44,9 @@
 #define wifi_event_id_t network_event_handle_t
 
 typedef enum {
+  WIFI_POWER_21dBm = 84,      // 21dBm
+  WIFI_POWER_20_5dBm = 82,    // 20.5dBm
+  WIFI_POWER_20dBm = 80,      // 20dBm
   WIFI_POWER_19_5dBm = 78,    // 19.5dBm
   WIFI_POWER_19dBm = 76,      // 19dBm
   WIFI_POWER_18_5dBm = 74,    // 18.5dBm

Original file line number	Diff line number	Diff line change
`@@ -187,6 +187,10 @@ bool APClass::begin() {`
`187`	`187`	`log_e("AP enable failed!");`
`188`	`188`	`return false;`
`189`	`189`	`}`
	`190`	`+ if (!waitStatusBits(ESP_NETIF_STARTED_BIT, 1000)) {`
	`191`	`+ log_e("Failed to start AP!");`
	`192`	`+ return false;`
	`193`	`+ }`
`190`	`194`	`return true;`
`191`	`195`	`}`
`192`	`196`
Original file line number	Diff line number	Diff line change
`@@ -298,6 +298,10 @@ bool STAClass::begin(bool tryConnect) {`
`298`	`298`	`log_e("STA enable failed!");`
`299`	`299`	`return false;`
`300`	`300`	`}`
	`301`	`+ if (!waitStatusBits(ESP_NETIF_STARTED_BIT, 1000)) {`
	`302`	`+ log_e("Failed to start STA!");`
	`303`	`+ return false;`
	`304`	`+ }`
`301`	`305`	`if (tryConnect) {`
`302`	`306`	`return connect();`
`303`	`307`	`}`
Original file line number	Diff line number	Diff line change
`@@ -639,7 +639,11 @@ bool WiFiGenericClass::setTxPower(wifi_power_t power) {`
`639`	`639`	`log_w("Neither AP or STA has been started");`
`640`	`640`	`return false;`
`641`	`641`	`}`
`642`		`- return esp_wifi_set_max_tx_power(power) == ESP_OK;`
	`642`	`+ esp_err_t err = esp_wifi_set_max_tx_power(power);`
	`643`	`+ if (err != ESP_OK) {`
	`644`	`+ log_e("Failed to set TX Power: 0x%x: %s", err, esp_err_to_name(err));`
	`645`	`+ }`
	`646`	`+ return err == ESP_OK;`
`643`	`647`	`}`
`644`	`648`
`645`	`649`	`wifi_power_t WiFiGenericClass::getTxPower() {`
`@@ -648,7 +652,9 @@ wifi_power_t WiFiGenericClass::getTxPower() {`
`648`	`652`	`log_w("Neither AP or STA has been started");`
`649`	`653`	`return WIFI_POWER_19_5dBm;`
`650`	`654`	`}`
`651`		`- if (esp_wifi_get_max_tx_power(&power)) {`
	`655`	`+ esp_err_t err = esp_wifi_get_max_tx_power(&power);`
	`656`	`+ if (err != ESP_OK) {`
	`657`	`+ log_e("Failed to get TX Power: 0x%x: %s", err, esp_err_to_name(err));`
`652`	`658`	`return WIFI_POWER_19_5dBm;`
`653`	`659`	`}`
`654`	`660`	`return (wifi_power_t)power;`