Skip to content

Commit 2a09234

Browse files
MaxwellAlanMaxwellAlan
committed
esp_phy: rename esp_phy component prefix
1 parent c898810 commit 2a09234

File tree

14 files changed

+118
-109
lines changed

14 files changed

+118
-109
lines changed

‎components/esp_phy/CMakeLists.txt‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@ endif()
1616

1717
idf_build_get_property(build_dir BUILD_DIR)
1818

19-
if(CONFIG_ESP32_SUPPORT_MULTIPLE_PHY_INIT_DATA_BIN)
19+
if(CONFIG_ESP_PHY_MULTIPLE_INIT_DATA_BIN)
2020
if(NOT EXISTS "${build_dir}/phy_multiple_init_data.bin")
2121
file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/${idf_target}/phy_multiple_init_data.bin DESTINATION "${build_dir}")
2222
endif()
2323
endif()
2424

25-
if(CONFIG_ESP32_MULTIPLE_PHY_DATA_BIN_EMBEDDED)
25+
if(CONFIG_ESP_PHY_MULTIPLE_INIT_DATA_BIN_EMBED)
2626
idf_component_register(SRCS "${srcs}"
2727
INCLUDE_DIRS "include" "${idf_target}/include"
2828
PRIV_REQUIRES nvs_flash
@@ -63,13 +63,13 @@ if(link_binary_libs)
6363
endif()
6464
endif()
6565

66-
if(CONFIG_ESP32_PHY_INIT_DATA_IN_PARTITION)
66+
if(CONFIG_ESP_PHY_INIT_DATA_IN_PARTITION)
6767
idf_component_get_property(esp_common_dir esp_common COMPONENT_DIR)
6868
partition_table_get_partition_info(phy_partition_offset "--partition-type data --partition-subtype phy" "offset")
6969

70-
if(CONFIG_ESP32_SUPPORT_MULTIPLE_PHY_INIT_DATA_BIN)
70+
if(CONFIG_ESP_PHY_MULTIPLE_INIT_DATA_BIN)
7171
set(phy_init_data_bin "${build_dir}/phy_multiple_init_data.bin")
72-
if(CONFIG_ESP32_MULTIPLE_PHY_DATA_BIN_EMBEDDED)
72+
if(CONFIG_ESP_PHY_MULTIPLE_INIT_DATA_BIN_EMBED)
7373
set(COMPONENT_EMBED_FILES "${build_dir}/phy_multiple_init_data.bin")
7474
endif()
7575
else()

‎components/esp_phy/Kconfig‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
menu "PHY"
22

3-
config ESP32_PHY_CALIBRATION_AND_DATA_STORAGE
3+
config ESP_PHY_CALIBRATION_AND_DATA_STORAGE
44
bool "Store phy calibration data in NVS"
55
default y
66
help
@@ -15,7 +15,7 @@ menu "PHY"
1515
2.Because of your board design, each time when you do calibration, the result are too unstable.
1616
If unsure, choose 'y'.
1717

18-
menuconfig ESP32_PHY_INIT_DATA_IN_PARTITION
18+
menuconfig ESP_PHY_INIT_DATA_IN_PARTITION
1919
bool "Use a partition to store PHY init data"
2020
default n
2121
help
@@ -31,20 +31,20 @@ menu "PHY"
3131

3232
If unsure, choose 'n'.
3333

34-
config ESP32_PHY_DEFAULT_INIT_IF_INVALID
34+
config ESP_PHY_DEFAULT_INIT_IF_INVALID
3535
bool "Reset default PHY init data if invalid"
3636
default n
37-
depends on ESP32_PHY_INIT_DATA_IN_PARTITION
37+
depends on ESP_PHY_INIT_DATA_IN_PARTITION
3838
help
3939
If enabled, PHY init data will be restored to default if
4040
it cannot be verified successfully to avoid endless bootloops.
4141

4242
If unsure, choose 'n'.
4343

44-
if ESP32_PHY_INIT_DATA_IN_PARTITION
45-
config ESP32_SUPPORT_MULTIPLE_PHY_INIT_DATA_BIN
44+
if ESP_PHY_INIT_DATA_IN_PARTITION
45+
config ESP_PHY_MULTIPLE_INIT_DATA_BIN
4646
bool "Support multiple PHY init data bin"
47-
depends on ESP32_PHY_INIT_DATA_IN_PARTITION
47+
depends on ESP_PHY_INIT_DATA_IN_PARTITION
4848
default n
4949
help
5050
If enabled, the corresponding PHY init data type can be automatically switched
@@ -57,37 +57,37 @@ menu "PHY"
5757
3. Country configured by API esp_wifi_set_country()
5858
and the parameter policy is WIFI_COUNTRY_POLICY_AUTO.
5959

60-
config ESP32_MULTIPLE_PHY_DATA_BIN_EMBEDDED
60+
config ESP_PHY_MULTIPLE_INIT_DATA_BIN_EMBED
6161
bool "Support embedded multiple phy init data bin to app bin"
62-
depends on ESP32_SUPPORT_MULTIPLE_PHY_INIT_DATA_BIN
62+
depends on ESP_PHY_MULTIPLE_INIT_DATA_BIN
6363
default n
6464
help
6565
If enabled, multiple phy init data bin will embedded into app bin
6666
If not enabled, multiple phy init data bin will still leave alone, and need to be flashed by users.
6767

68-
config ESP32_PHY_INIT_DATA_ERROR
68+
config ESP_PHY_INIT_DATA_ERROR
6969
bool "Terminate operation when PHY init data error"
70-
depends on ESP32_SUPPORT_MULTIPLE_PHY_INIT_DATA_BIN
70+
depends on ESP_PHY_MULTIPLE_INIT_DATA_BIN
7171
default n
7272
help
7373
If enabled, when an error occurs while the PHY init data is updated,
7474
the program will terminate and restart.
7575
If not enabled, the PHY init data will not be updated when an error occurs.
7676
endif
7777

78-
config ESP32_PHY_MAX_WIFI_TX_POWER
78+
config ESP_PHY_MAX_WIFI_TX_POWER
7979
int "Max WiFi TX power (dBm)"
8080
range 10 20
8181
default 20
8282
help
8383
Set maximum transmit power for WiFi radio. Actual transmit power for high
8484
data rates may be lower than this setting.
8585

86-
config ESP32_PHY_MAX_TX_POWER
86+
config ESP_PHY_MAX_TX_POWER
8787
int
88-
default ESP32_PHY_MAX_WIFI_TX_POWER
88+
default ESP_PHY_MAX_WIFI_TX_POWER
8989

90-
config ESP32_PHY_MAC_BB_PD
90+
config ESP_PHY_MAC_BB_PD
9191
bool "Power down MAC and baseband of Wi-Fi and Bluetooth when PHY is disabled"
9292
depends on ((IDF_TARGET_ESP32C3 || IDF_TARGET_ESP32S3) && FREERTOS_USE_TICKLESS_IDLE)
9393
default n
@@ -97,7 +97,7 @@ menu "PHY"
9797
by a small amount but increases RAM use by approximately 4 KB(Wi-Fi only),
9898
2 KB(Bluetooth only) or 5.3 KB(Wi-Fi + Bluetooth).
9999

100-
config ESP32_REDUCE_PHY_TX_POWER
100+
config ESP_PHY_REDUCE_TX_POWER
101101
bool "Reduce PHY TX power when brownout reset"
102102
depends on ESP32_BROWNOUT_DET
103103
default y

‎components/esp_phy/Makefile.projbuild‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
ifdef CONFIG_ESP32_PHY_INIT_DATA_IN_PARTITION
1+
ifdef CONFIG_ESP_PHY_INIT_DATA_IN_PARTITION
22

33
ESP_PHY_COMPONENT_PATH := $(COMPONENT_PATH)
44

5-
ifdef CONFIG_ESP32_SUPPORT_MULTIPLE_PHY_INIT_DATA_BIN
5+
ifdef CONFIG_ESP_PHY_MULTIPLE_INIT_DATA_BIN
66
PHY_INIT_DATA_BIN = $(ESP_PHY_COMPONENT_PATH)/$(IDF_TARGET)/phy_multiple_init_data.bin
77
else
88
PHY_INIT_DATA_OBJ = $(BUILD_DIR_BASE)/phy_init_data.o
@@ -27,7 +27,7 @@ phy_init_data-flash: $(PHY_INIT_DATA_BIN)
2727
@echo "Flashing PHY init data..."
2828
$(PHY_INIT_DATA_FLASH_CMD)
2929

30-
ifndef CONFIG_ESP32_SUPPORT_MULTIPLE_PHY_INIT_DATA_BIN
30+
ifndef CONFIG_ESP_PHY_MULTIPLE_INIT_DATA_BIN
3131
phy_init_data-clean:
3232
rm -f $(PHY_INIT_DATA_BIN) $(PHY_INIT_DATA_OBJ)
3333

@@ -37,4 +37,4 @@ endif
3737
all: phy_init_data
3838
flash: phy_init_data
3939

40-
endif # CONFIG_ESP32_PHY_INIT_DATA_IN_PARTITION
40+
endif # CONFIG_ESP_PHY_INIT_DATA_IN_PARTITION

‎components/esp_phy/esp32/include/phy_init_data.h‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@
2323
#define PHY_INIT_MAGIC "PHYINIT"
2424

2525
// define the lowest tx power as LOWEST_PHY_TX_POWER
26-
#define PHY_TX_POWER_LOWEST LIMIT(CONFIG_ESP32_PHY_MAX_TX_POWER * 4, 0, 52)
26+
#define PHY_TX_POWER_LOWEST LIMIT(CONFIG_ESP_PHY_MAX_TX_POWER * 4, 0, 52)
2727
#define PHY_TX_POWER_OFFSET 44
2828
#define PHY_TX_POWER_NUM 5
2929

30-
#if CONFIG_ESP32_SUPPORT_MULTIPLE_PHY_INIT_DATA_BIN
30+
#if CONFIG_ESP_PHY_MULTIPLE_INIT_DATA_BIN
3131
#define PHY_CRC_ALGORITHM 1
3232
#define PHY_COUNTRY_CODE_LEN 2
3333
#define PHY_INIT_DATA_TYPE_OFFSET 126
@@ -83,12 +83,12 @@ static const esp_phy_init_data_t phy_init_data= { {
8383
0x18,
8484
0x18,
8585
0x18,
86-
LIMIT(CONFIG_ESP32_PHY_MAX_TX_POWER * 4, 40, 78),
87-
LIMIT(CONFIG_ESP32_PHY_MAX_TX_POWER * 4, 40, 72),
88-
LIMIT(CONFIG_ESP32_PHY_MAX_TX_POWER * 4, 40, 66),
89-
LIMIT(CONFIG_ESP32_PHY_MAX_TX_POWER * 4, 40, 60),
90-
LIMIT(CONFIG_ESP32_PHY_MAX_TX_POWER * 4, 40, 56),
91-
LIMIT(CONFIG_ESP32_PHY_MAX_TX_POWER * 4, 40, 52),
86+
LIMIT(CONFIG_ESP_PHY_MAX_TX_POWER * 4, 40, 78),
87+
LIMIT(CONFIG_ESP_PHY_MAX_TX_POWER * 4, 40, 72),
88+
LIMIT(CONFIG_ESP_PHY_MAX_TX_POWER * 4, 40, 66),
89+
LIMIT(CONFIG_ESP_PHY_MAX_TX_POWER * 4, 40, 60),
90+
LIMIT(CONFIG_ESP_PHY_MAX_TX_POWER * 4, 40, 56),
91+
LIMIT(CONFIG_ESP_PHY_MAX_TX_POWER * 4, 40, 52),
9292
0,
9393
1,
9494
1,
@@ -150,7 +150,7 @@ static const esp_phy_init_data_t phy_init_data= { {
150150

151151
static const char phy_init_magic_post[] = PHY_INIT_MAGIC;
152152

153-
#if CONFIG_ESP32_SUPPORT_MULTIPLE_PHY_INIT_DATA_BIN
153+
#if CONFIG_ESP_PHY_MULTIPLE_INIT_DATA_BIN
154154
/**
155155
* @brief PHY init data control infomation structure
156156
*/

‎components/esp_phy/esp32c3/include/phy_init_data.h‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@ extern "C" {
2727
#define PHY_INIT_MAGIC "PHYINIT"
2828

2929
// define the lowest tx power as LOWEST_PHY_TX_POWER
30-
#define PHY_TX_POWER_LOWEST LIMIT(CONFIG_ESP32_PHY_MAX_TX_POWER * 4, 0, 52)
30+
#define PHY_TX_POWER_LOWEST LIMIT(CONFIG_ESP_PHY_MAX_TX_POWER * 4, 0, 52)
3131
#define PHY_TX_POWER_OFFSET 44
3232
#define PHY_TX_POWER_NUM 5
3333

34-
#if CONFIG_ESP32_SUPPORT_MULTIPLE_PHY_INIT_DATA_BIN
34+
#if CONFIG_ESP_PHY_MULTIPLE_INIT_DATA_BIN
3535
#define PHY_CRC_ALGORITHM 1
3636
#define PHY_COUNTRY_CODE_LEN 2
3737
#define PHY_INIT_DATA_TYPE_OFFSET 126
@@ -46,20 +46,20 @@ static const char __attribute__((section(".rodata"))) phy_init_magic_pre[] = PHY
4646
static const esp_phy_init_data_t phy_init_data= { {
4747
0x00,
4848
0x00,
49-
LIMIT(CONFIG_ESP32_PHY_MAX_TX_POWER * 4, 0, 0x50),
50-
LIMIT(CONFIG_ESP32_PHY_MAX_TX_POWER * 4, 0, 0x50),
51-
LIMIT(CONFIG_ESP32_PHY_MAX_TX_POWER * 4, 0, 0x50),
52-
LIMIT(CONFIG_ESP32_PHY_MAX_TX_POWER * 4, 0, 0x4c),
53-
LIMIT(CONFIG_ESP32_PHY_MAX_TX_POWER * 4, 0, 0x4c),
54-
LIMIT(CONFIG_ESP32_PHY_MAX_TX_POWER * 4, 0, 0x48),
55-
LIMIT(CONFIG_ESP32_PHY_MAX_TX_POWER * 4, 0, 0x4c),
56-
LIMIT(CONFIG_ESP32_PHY_MAX_TX_POWER * 4, 0, 0x48),
57-
LIMIT(CONFIG_ESP32_PHY_MAX_TX_POWER * 4, 0, 0x48),
58-
LIMIT(CONFIG_ESP32_PHY_MAX_TX_POWER * 4, 0, 0x44),
59-
LIMIT(CONFIG_ESP32_PHY_MAX_TX_POWER * 4, 0, 0x4a),
60-
LIMIT(CONFIG_ESP32_PHY_MAX_TX_POWER * 4, 0, 0x46),
61-
LIMIT(CONFIG_ESP32_PHY_MAX_TX_POWER * 4, 0, 0x46),
62-
LIMIT(CONFIG_ESP32_PHY_MAX_TX_POWER * 4, 0, 0x42),
49+
LIMIT(CONFIG_ESP_PHY_MAX_TX_POWER * 4, 0, 0x50),
50+
LIMIT(CONFIG_ESP_PHY_MAX_TX_POWER * 4, 0, 0x50),
51+
LIMIT(CONFIG_ESP_PHY_MAX_TX_POWER * 4, 0, 0x50),
52+
LIMIT(CONFIG_ESP_PHY_MAX_TX_POWER * 4, 0, 0x4c),
53+
LIMIT(CONFIG_ESP_PHY_MAX_TX_POWER * 4, 0, 0x4c),
54+
LIMIT(CONFIG_ESP_PHY_MAX_TX_POWER * 4, 0, 0x48),
55+
LIMIT(CONFIG_ESP_PHY_MAX_TX_POWER * 4, 0, 0x4c),
56+
LIMIT(CONFIG_ESP_PHY_MAX_TX_POWER * 4, 0, 0x48),
57+
LIMIT(CONFIG_ESP_PHY_MAX_TX_POWER * 4, 0, 0x48),
58+
LIMIT(CONFIG_ESP_PHY_MAX_TX_POWER * 4, 0, 0x44),
59+
LIMIT(CONFIG_ESP_PHY_MAX_TX_POWER * 4, 0, 0x4a),
60+
LIMIT(CONFIG_ESP_PHY_MAX_TX_POWER * 4, 0, 0x46),
61+
LIMIT(CONFIG_ESP_PHY_MAX_TX_POWER * 4, 0, 0x46),
62+
LIMIT(CONFIG_ESP_PHY_MAX_TX_POWER * 4, 0, 0x42),
6363
0x00,
6464
0x00,
6565
0x00,
@@ -160,7 +160,7 @@ static const esp_phy_init_data_t phy_init_data= { {
160160

161161
static const char __attribute__((section(".rodata"))) phy_init_magic_post[] = PHY_INIT_MAGIC;
162162

163-
#if CONFIG_ESP32_SUPPORT_MULTIPLE_PHY_INIT_DATA_BIN
163+
#if CONFIG_ESP_PHY_MULTIPLE_INIT_DATA_BIN
164164
/**
165165
* @brief PHY init data control infomation structure
166166
*/

‎components/esp_phy/esp32s2/include/phy_init_data.h‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@ extern "C" {
2727
#define PHY_INIT_MAGIC "PHYINIT"
2828

2929
// define the lowest tx power as LOWEST_PHY_TX_POWER
30-
#define PHY_TX_POWER_LOWEST LIMIT(CONFIG_ESP32_PHY_MAX_TX_POWER * 4, 0, 52)
30+
#define PHY_TX_POWER_LOWEST LIMIT(CONFIG_ESP_PHY_MAX_TX_POWER * 4, 0, 52)
3131
#define PHY_TX_POWER_OFFSET 44
3232
#define PHY_TX_POWER_NUM 5
3333

34-
#if CONFIG_ESP32_SUPPORT_MULTIPLE_PHY_INIT_DATA_BIN
34+
#if CONFIG_ESP_PHY_MULTIPLE_INIT_DATA_BIN
3535
#define PHY_CRC_ALGORITHM 1
3636
#define PHY_COUNTRY_CODE_LEN 2
3737
#define PHY_INIT_DATA_TYPE_OFFSET 126
@@ -88,12 +88,12 @@ static const esp_phy_init_data_t phy_init_data= { {
8888
0x18,
8989
0x18,
9090
0x18,
91-
LIMIT(CONFIG_ESP32_PHY_MAX_TX_POWER * 4, 0, 84),
92-
LIMIT(CONFIG_ESP32_PHY_MAX_TX_POWER * 4, 0, 72),
93-
LIMIT(CONFIG_ESP32_PHY_MAX_TX_POWER * 4, 0, 66),
94-
LIMIT(CONFIG_ESP32_PHY_MAX_TX_POWER * 4, 0, 60),
95-
LIMIT(CONFIG_ESP32_PHY_MAX_TX_POWER * 4, 0, 56),
96-
LIMIT(CONFIG_ESP32_PHY_MAX_TX_POWER * 4, 0, 52),
91+
LIMIT(CONFIG_ESP_PHY_MAX_TX_POWER * 4, 0, 84),
92+
LIMIT(CONFIG_ESP_PHY_MAX_TX_POWER * 4, 0, 72),
93+
LIMIT(CONFIG_ESP_PHY_MAX_TX_POWER * 4, 0, 66),
94+
LIMIT(CONFIG_ESP_PHY_MAX_TX_POWER * 4, 0, 60),
95+
LIMIT(CONFIG_ESP_PHY_MAX_TX_POWER * 4, 0, 56),
96+
LIMIT(CONFIG_ESP_PHY_MAX_TX_POWER * 4, 0, 52),
9797
0,
9898
1,
9999
1,
@@ -155,7 +155,7 @@ static const esp_phy_init_data_t phy_init_data= { {
155155

156156
static const char phy_init_magic_post[] = PHY_INIT_MAGIC;
157157

158-
#if CONFIG_ESP32_SUPPORT_MULTIPLE_PHY_INIT_DATA_BIN
158+
#if CONFIG_ESP_PHY_MULTIPLE_INIT_DATA_BIN
159159
/**
160160
* @brief PHY init data control infomation structure
161161
*/

‎components/esp_phy/esp32s3/include/phy_init_data.h‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@ extern "C" {
2727
#define PHY_INIT_MAGIC "PHYINIT"
2828

2929
// define the lowest tx power as LOWEST_PHY_TX_POWER
30-
#define PHY_TX_POWER_LOWEST LIMIT(CONFIG_ESP32_PHY_MAX_TX_POWER * 4, 0, 52)
30+
#define PHY_TX_POWER_LOWEST LIMIT(CONFIG_ESP_PHY_MAX_TX_POWER * 4, 0, 52)
3131
#define PHY_TX_POWER_OFFSET 44
3232
#define PHY_TX_POWER_NUM 5
3333

34-
#if CONFIG_ESP32_SUPPORT_MULTIPLE_PHY_INIT_DATA_BIN
34+
#if CONFIG_ESP_PHY_MULTIPLE_INIT_DATA_BIN
3535
#define PHY_CRC_ALGORITHM 1
3636
#define PHY_COUNTRY_CODE_LEN 2
3737
#define PHY_INIT_DATA_TYPE_OFFSET 126
@@ -46,20 +46,20 @@ static const char phy_init_magic_pre[] = PHY_INIT_MAGIC;
4646
static const esp_phy_init_data_t phy_init_data= { {
4747
0x00,
4848
0x00,
49-
LIMIT(CONFIG_ESP32_PHY_MAX_TX_POWER * 4, 0, 0x50),
50-
LIMIT(CONFIG_ESP32_PHY_MAX_TX_POWER * 4, 0, 0x50),
51-
LIMIT(CONFIG_ESP32_PHY_MAX_TX_POWER * 4, 0, 0x50),
52-
LIMIT(CONFIG_ESP32_PHY_MAX_TX_POWER * 4, 0, 0x4c),
53-
LIMIT(CONFIG_ESP32_PHY_MAX_TX_POWER * 4, 0, 0x4c),
54-
LIMIT(CONFIG_ESP32_PHY_MAX_TX_POWER * 4, 0, 0x48),
55-
LIMIT(CONFIG_ESP32_PHY_MAX_TX_POWER * 4, 0, 0x4c),
56-
LIMIT(CONFIG_ESP32_PHY_MAX_TX_POWER * 4, 0, 0x48),
57-
LIMIT(CONFIG_ESP32_PHY_MAX_TX_POWER * 4, 0, 0x48),
58-
LIMIT(CONFIG_ESP32_PHY_MAX_TX_POWER * 4, 0, 0x44),
59-
LIMIT(CONFIG_ESP32_PHY_MAX_TX_POWER * 4, 0, 0x4a),
60-
LIMIT(CONFIG_ESP32_PHY_MAX_TX_POWER * 4, 0, 0x46),
61-
LIMIT(CONFIG_ESP32_PHY_MAX_TX_POWER * 4, 0, 0x46),
62-
LIMIT(CONFIG_ESP32_PHY_MAX_TX_POWER * 4, 0, 0x42),
49+
LIMIT(CONFIG_ESP_PHY_MAX_TX_POWER * 4, 0, 0x50),
50+
LIMIT(CONFIG_ESP_PHY_MAX_TX_POWER * 4, 0, 0x50),
51+
LIMIT(CONFIG_ESP_PHY_MAX_TX_POWER * 4, 0, 0x50),
52+
LIMIT(CONFIG_ESP_PHY_MAX_TX_POWER * 4, 0, 0x4c),
53+
LIMIT(CONFIG_ESP_PHY_MAX_TX_POWER * 4, 0, 0x4c),
54+
LIMIT(CONFIG_ESP_PHY_MAX_TX_POWER * 4, 0, 0x48),
55+
LIMIT(CONFIG_ESP_PHY_MAX_TX_POWER * 4, 0, 0x4c),
56+
LIMIT(CONFIG_ESP_PHY_MAX_TX_POWER * 4, 0, 0x48),
57+
LIMIT(CONFIG_ESP_PHY_MAX_TX_POWER * 4, 0, 0x48),
58+
LIMIT(CONFIG_ESP_PHY_MAX_TX_POWER * 4, 0, 0x44),
59+
LIMIT(CONFIG_ESP_PHY_MAX_TX_POWER * 4, 0, 0x4a),
60+
LIMIT(CONFIG_ESP_PHY_MAX_TX_POWER * 4, 0, 0x46),
61+
LIMIT(CONFIG_ESP_PHY_MAX_TX_POWER * 4, 0, 0x46),
62+
LIMIT(CONFIG_ESP_PHY_MAX_TX_POWER * 4, 0, 0x42),
6363
0x00,
6464
0x00,
6565
0x00,
@@ -160,7 +160,7 @@ static const esp_phy_init_data_t phy_init_data= { {
160160

161161
static const char phy_init_magic_post[] = PHY_INIT_MAGIC;
162162

163-
#if CONFIG_ESP32_SUPPORT_MULTIPLE_PHY_INIT_DATA_BIN
163+
#if CONFIG_ESP_PHY_MULTIPLE_INIT_DATA_BIN
164164
/**
165165
* @brief PHY init data control infomation structure
166166
*/

‎components/esp_phy/include/esp_phy_init.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ typedef enum {
4848
PHY_RF_CAL_FULL = 0x00000002 /*!< Do full RF calibration. Produces best results, but also consumes a lot of time and current. Suggested to be used once. */
4949
} esp_phy_calibration_mode_t;
5050

51-
#if CONFIG_ESP32_SUPPORT_MULTIPLE_PHY_INIT_DATA_BIN
51+
#if CONFIG_ESP_PHY_MULTIPLE_INIT_DATA_BIN
5252
/**
5353
* @brief PHY init data type
5454
*/
@@ -220,7 +220,7 @@ int64_t esp_phy_rf_get_on_ts(void);
220220
esp_err_t esp_phy_update_country_info(const char *country);
221221

222222

223-
#if CONFIG_ESP32_SUPPORT_MULTIPLE_PHY_INIT_DATA_BIN
223+
#if CONFIG_ESP_PHY_MULTIPLE_INIT_DATA_BIN
224224
/**
225225
* @brief Apply PHY init bin to PHY
226226
* @return ESP_OK on success.

‎components/esp_phy/sdkconfig.rename‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
# sdkconfig replacement configurations for deprecated options formatted as
22
# CONFIG_DEPRECATED_OPTION CONFIG_NEW_OPTION
33

4-
CONFIG_MAC_BB_PD CONFIG_ESP32_PHY_MAC_BB_PD
5-
CONFIG_REDUCE_PHY_TX_POWER CONFIG_ESP32_REDUCE_PHY_TX_POWER
4+
CONFIG_MAC_BB_PD CONFIG_ESP32_PHY_MAC_BB_PD
5+
CONFIG_REDUCE_PHY_TX_POWER CONFIG_ESP32_REDUCE_PHY_TX_POWER
6+
CONFIG_ESP32_PHY_MAC_BB_PD CONFIG_ESP_PHY_MAC_BB_PD
7+
CONFIG_ESP32_REDUCE_PHY_TX_POWER CONFIG_ESP_PHY_REDUCE_TX_POWER
8+
CONFIG_ESP32_PHY_CALIBRATION_AND_DATA_STORAGE CONFIG_ESP_PHY_CALIBRATION_AND_DATA_STORAGE
9+
CONFIG_ESP32_PHY_INIT_DATA_IN_PARTITION CONFIG_ESP_PHY_INIT_DATA_IN_PARTITION
10+
CONFIG_ESP32_PHY_DEFAULT_INIT_IF_INVALID CONFIG_ESP_PHY_DEFAULT_INIT_IF_INVALID
11+
CONFIG_ESP32_SUPPORT_MULTIPLE_PHY_INIT_DATA_BIN CONFIG_ESP_PHY_MULTIPLE_INIT_DATA_BIN
12+
CONFIG_ESP32_PHY_INIT_DATA_ERROR CONFIG_ESP_PHY_INIT_DATA_ERROR
13+
CONFIG_ESP32_PHY_MAX_WIFI_TX_POWER CONFIG_ESP_PHY_MAX_WIFI_TX_POWER
14+
CONFIG_ESP32_PHY_MAX_TX_POWER CONFIG_ESP_PHY_MAX_TX_POWER

0 commit comments

Comments
 (0)