Skip to content

Commit f77ce04

Browse files
me-no-devme-no-dev
committedAug 19, 2024·
fix(build): Fix many warnings
·
3.2.03.1.0-RC1
1 parent e1673e4 commit f77ce04

File tree

7 files changed

+37
-35
lines changed

7 files changed

+37
-35
lines changed
 

Diff for: ‎cores/esp32/esp32-hal-cpu.c

+4-4
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
#include "soc/rtc.h"
2222
#if !defined(CONFIG_IDF_TARGET_ESP32C2) && !defined(CONFIG_IDF_TARGET_ESP32C6) && !defined(CONFIG_IDF_TARGET_ESP32H2)
2323
#include "soc/rtc_cntl_reg.h"
24-
#include "soc/apb_ctrl_reg.h"
24+
#include "soc/syscon_reg.h"
2525
#endif
2626
#include "soc/efuse_reg.h"
2727
#include "esp32-hal.h"
@@ -30,13 +30,13 @@
3030
#include "esp_system.h"
3131
#ifdef ESP_IDF_VERSION_MAJOR // IDF 4+
3232
#if CONFIG_IDF_TARGET_ESP32 // ESP32/PICO-D4
33-
#include "freertos/xtensa_timer.h"
33+
#include "xtensa_timer.h"
3434
#include "esp32/rom/rtc.h"
3535
#elif CONFIG_IDF_TARGET_ESP32S2
36-
#include "freertos/xtensa_timer.h"
36+
#include "xtensa_timer.h"
3737
#include "esp32s2/rom/rtc.h"
3838
#elif CONFIG_IDF_TARGET_ESP32S3
39-
#include "freertos/xtensa_timer.h"
39+
#include "xtensa_timer.h"
4040
#include "esp32s3/rom/rtc.h"
4141
#elif CONFIG_IDF_TARGET_ESP32C2
4242
#include "esp32c2/rom/rtc.h"

Diff for: ‎cores/esp32/esp32-hal-misc.c

+5-5
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
#include "soc/rtc.h"
3232
#if !defined(CONFIG_IDF_TARGET_ESP32C2) && !defined(CONFIG_IDF_TARGET_ESP32C6) && !defined(CONFIG_IDF_TARGET_ESP32H2)
3333
#include "soc/rtc_cntl_reg.h"
34-
#include "soc/apb_ctrl_reg.h"
34+
#include "soc/syscon_reg.h"
3535
#endif
3636
#include "esp_task_wdt.h"
3737
#include "esp32-hal.h"
@@ -147,29 +147,29 @@ void feedLoopWDT() {
147147
#endif
148148

149149
void enableCore0WDT() {
150-
TaskHandle_t idle_0 = xTaskGetIdleTaskHandleForCPU(0);
150+
TaskHandle_t idle_0 = xTaskGetIdleTaskHandleForCore(0);
151151
if (idle_0 == NULL || esp_task_wdt_add(idle_0) != ESP_OK) {
152152
log_e("Failed to add Core 0 IDLE task to WDT");
153153
}
154154
}
155155

156156
void disableCore0WDT() {
157-
TaskHandle_t idle_0 = xTaskGetIdleTaskHandleForCPU(0);
157+
TaskHandle_t idle_0 = xTaskGetIdleTaskHandleForCore(0);
158158
if (idle_0 == NULL || esp_task_wdt_delete(idle_0) != ESP_OK) {
159159
log_e("Failed to remove Core 0 IDLE task from WDT");
160160
}
161161
}
162162

163163
#ifndef CONFIG_FREERTOS_UNICORE
164164
void enableCore1WDT() {
165-
TaskHandle_t idle_1 = xTaskGetIdleTaskHandleForCPU(1);
165+
TaskHandle_t idle_1 = xTaskGetIdleTaskHandleForCore(1);
166166
if (idle_1 == NULL || esp_task_wdt_add(idle_1) != ESP_OK) {
167167
log_e("Failed to add Core 1 IDLE task to WDT");
168168
}
169169
}
170170

171171
void disableCore1WDT() {
172-
TaskHandle_t idle_1 = xTaskGetIdleTaskHandleForCPU(1);
172+
TaskHandle_t idle_1 = xTaskGetIdleTaskHandleForCore(1);
173173
if (idle_1 == NULL || esp_task_wdt_delete(idle_1) != ESP_OK) {
174174
log_e("Failed to remove Core 1 IDLE task from WDT");
175175
}

Diff for: ‎libraries/BluetoothSerial/src/BluetoothSerial.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -698,7 +698,7 @@ static bool _init_bt(const char *deviceName, bt_mode mode) {
698698
}
699699

700700
log_i("device name set");
701-
esp_bt_dev_set_device_name(deviceName);
701+
esp_bt_gap_set_device_name(deviceName);
702702

703703
if (_enableSSP) {
704704
log_i("Simple Secure Pairing");

Diff for: ‎libraries/ESP_I2S/src/ESP_I2S.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
#define I2S_READ_CHUNK_SIZE 1920
1313

1414
#define I2S_DEFAULT_CFG() \
15-
{ .id = I2S_NUM_AUTO, .role = I2S_ROLE_MASTER, .dma_desc_num = 6, .dma_frame_num = 240, .auto_clear = true, }
15+
{ .id = I2S_NUM_AUTO, .role = I2S_ROLE_MASTER, .dma_desc_num = 6, .dma_frame_num = 240, .auto_clear = true, .auto_clear_before_cb = false, .intr_priority = 0 }
1616

1717
#define I2S_STD_CHAN_CFG(_sample_rate, _data_bit_width, _slot_mode) \
1818
{ \

Diff for: ‎libraries/Ethernet/src/ETH.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -181,8 +181,8 @@ bool ETHClass::begin(eth_phy_type_t type, int32_t phy_addr, int mdc, int mdio, i
181181
: (2 == clock_mode) ? EMAC_CLK_OUT_GPIO
182182
: (3 == clock_mode) ? EMAC_CLK_OUT_180_GPIO
183183
: EMAC_CLK_IN_GPIO;
184-
mac_config.smi_mdc_gpio_num = digitalPinToGPIONumber(mdc);
185-
mac_config.smi_mdio_gpio_num = digitalPinToGPIONumber(mdio);
184+
mac_config.smi_gpio.mdc_num = digitalPinToGPIONumber(mdc);
185+
mac_config.smi_gpio.mdio_num = digitalPinToGPIONumber(mdio);
186186

187187
_pin_mcd = digitalPinToGPIONumber(mdc);
188188
_pin_mdio = digitalPinToGPIONumber(mdio);

Diff for: ‎libraries/SD_MMC/src/SD_MMC.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,8 @@ bool SDMMCFS::begin(const char *mountpoint, bool mode1bit, bool format_if_mount_
175175
_mode1bit = mode1bit;
176176

177177
esp_vfs_fat_sdmmc_mount_config_t mount_config = {
178-
.format_if_mount_failed = format_if_mount_failed, .max_files = maxOpenFiles, .allocation_unit_size = 0, .disk_status_check_enable = false
178+
.format_if_mount_failed = format_if_mount_failed, .max_files = maxOpenFiles, .allocation_unit_size = 0, .disk_status_check_enable = false,
179+
.use_one_fat = false
179180
};
180181

181182
esp_err_t ret = esp_vfs_fat_sdmmc_mount(mountpoint, &host, &slot_config, &mount_config, &_card);

Diff for: ‎libraries/WiFi/src/WiFiGeneric.cpp

+22-21
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ extern "C" {
3939
#include <esp_event.h>
4040
#include <esp_mac.h>
4141
#include <esp_netif.h>
42+
#include <esp_phy.h>
4243
#include "lwip/ip_addr.h"
4344
#include "lwip/opt.h"
4445
#include "lwip/err.h"
@@ -693,9 +694,9 @@ bool WiFiGenericClass::initiateFTM(uint8_t frm_count, uint16_t burst_period, uin
693694
*/
694695
bool WiFiGenericClass::setDualAntennaConfig(uint8_t gpio_ant1, uint8_t gpio_ant2, wifi_rx_ant_t rx_mode, wifi_tx_ant_t tx_mode) {
695696

696-
wifi_ant_gpio_config_t wifi_ant_io;
697+
esp_phy_ant_gpio_config_t wifi_ant_io;
697698

698-
if (ESP_OK != esp_wifi_get_ant_gpio(&wifi_ant_io)) {
699+
if (ESP_OK != esp_phy_get_ant_gpio(&wifi_ant_io)) {
699700
log_e("Failed to get antenna configuration");
700701
return false;
701702
}
@@ -705,56 +706,56 @@ bool WiFiGenericClass::setDualAntennaConfig(uint8_t gpio_ant1, uint8_t gpio_ant2
705706
wifi_ant_io.gpio_cfg[1].gpio_num = gpio_ant2;
706707
wifi_ant_io.gpio_cfg[1].gpio_select = 1;
707708

708-
if (ESP_OK != esp_wifi_set_ant_gpio(&wifi_ant_io)) {
709+
if (ESP_OK != esp_phy_set_ant_gpio(&wifi_ant_io)) {
709710
log_e("Failed to set antenna GPIO configuration");
710711
return false;
711712
}
712713

713714
// Set antenna default configuration
714-
wifi_ant_config_t ant_config = {
715-
.rx_ant_mode = WIFI_ANT_MODE_AUTO,
716-
.rx_ant_default = WIFI_ANT_MAX, // Ignored in AUTO mode
717-
.tx_ant_mode = WIFI_ANT_MODE_AUTO,
715+
esp_phy_ant_config_t ant_config = {
716+
.rx_ant_mode = ESP_PHY_ANT_MODE_AUTO,
717+
.rx_ant_default = ESP_PHY_ANT_MAX, // Ignored in AUTO mode
718+
.tx_ant_mode = ESP_PHY_ANT_MODE_AUTO,
718719
.enabled_ant0 = 1,
719720
.enabled_ant1 = 2,
720721
};
721722

722723
switch (rx_mode) {
723-
case WIFI_RX_ANT0: ant_config.rx_ant_mode = WIFI_ANT_MODE_ANT0; break;
724-
case WIFI_RX_ANT1: ant_config.rx_ant_mode = WIFI_ANT_MODE_ANT1; break;
724+
case WIFI_RX_ANT0: ant_config.rx_ant_mode = ESP_PHY_ANT_MODE_ANT0; break;
725+
case WIFI_RX_ANT1: ant_config.rx_ant_mode = ESP_PHY_ANT_MODE_ANT1; break;
725726
case WIFI_RX_ANT_AUTO:
726727
log_i("TX Antenna will be automatically selected");
727-
ant_config.rx_ant_default = WIFI_ANT_ANT0;
728-
ant_config.rx_ant_mode = WIFI_ANT_MODE_AUTO;
728+
ant_config.rx_ant_default = ESP_PHY_ANT_ANT0;
729+
ant_config.rx_ant_mode = ESP_PHY_ANT_MODE_AUTO;
729730
// Force TX for AUTO if RX is AUTO
730-
ant_config.tx_ant_mode = WIFI_ANT_MODE_AUTO;
731+
ant_config.tx_ant_mode = ESP_PHY_ANT_MODE_AUTO;
731732
goto set_ant;
732733
break;
733734
default:
734735
log_e("Invalid default antenna! Falling back to AUTO");
735-
ant_config.rx_ant_mode = WIFI_ANT_MODE_AUTO;
736+
ant_config.rx_ant_mode = ESP_PHY_ANT_MODE_AUTO;
736737
break;
737738
}
738739

739740
switch (tx_mode) {
740-
case WIFI_TX_ANT0: ant_config.tx_ant_mode = WIFI_ANT_MODE_ANT0; break;
741-
case WIFI_TX_ANT1: ant_config.tx_ant_mode = WIFI_ANT_MODE_ANT1; break;
741+
case WIFI_TX_ANT0: ant_config.tx_ant_mode = ESP_PHY_ANT_MODE_ANT0; break;
742+
case WIFI_TX_ANT1: ant_config.tx_ant_mode = ESP_PHY_ANT_MODE_ANT1; break;
742743
case WIFI_TX_ANT_AUTO:
743744
log_i("RX Antenna will be automatically selected");
744-
ant_config.rx_ant_default = WIFI_ANT_ANT0;
745-
ant_config.tx_ant_mode = WIFI_ANT_MODE_AUTO;
745+
ant_config.rx_ant_default = ESP_PHY_ANT_ANT0;
746+
ant_config.tx_ant_mode = ESP_PHY_ANT_MODE_AUTO;
746747
// Force RX for AUTO if RX is AUTO
747-
ant_config.rx_ant_mode = WIFI_ANT_MODE_AUTO;
748+
ant_config.rx_ant_mode = ESP_PHY_ANT_MODE_AUTO;
748749
break;
749750
default:
750751
log_e("Invalid default antenna! Falling back to AUTO");
751-
ant_config.rx_ant_default = WIFI_ANT_ANT0;
752-
ant_config.tx_ant_mode = WIFI_ANT_MODE_AUTO;
752+
ant_config.rx_ant_default = ESP_PHY_ANT_ANT0;
753+
ant_config.tx_ant_mode = ESP_PHY_ANT_MODE_AUTO;
753754
break;
754755
}
755756

756757
set_ant:
757-
if (ESP_OK != esp_wifi_set_ant(&ant_config)) {
758+
if (ESP_OK != esp_phy_set_ant(&ant_config)) {
758759
log_e("Failed to set antenna configuration");
759760
return false;
760761
}

0 commit comments

Comments
 (0)
Please sign in to comment.