Skip to content

Commit c23d33b

Browse files
committed
Merge branch 'feat/add_5g_wifi_support' into 'master'
feat(ESPAT-2056): Added 5g wifi support See merge request application/esp-at!1911
2 parents 7cfe831 + fd810d1 commit c23d33b

File tree

9 files changed

+20
-4
lines changed

9 files changed

+20
-4
lines changed

components/at/include/esp_at.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,10 @@
1414
#define ESP_AT_PORT_TX_WAIT_MS_MAX 3000 // 3s
1515
#define AT_BUFFER_ON_STACK_SIZE 128 // default maximum buffer size on task stack
1616

17+
#if defined(CONFIG_IDF_TARGET_ESP32) || defined(CONFIG_IDF_TARGET_ESP32S2) || defined(CONFIG_IDF_TARGET_ESP32C2) || defined(CONFIG_IDF_TARGET_ESP32C3) || defined(CONFIG_IDF_TARGET_ESP32C6)
18+
#define ESP_AT_LEGACY_SUPPORT
19+
#endif
20+
1721
/**
1822
* @brief Same to ESP_LOG_BUFFER_HEXDUMP, but only output when buffer is not NULL
1923
*/

components/at/lib/VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
ESP32: 098bc1a
22
ESP32C3: 098bc1a
33
ESP32C2: 098bc1a
4-
ESP32C5: 098bc1a
4+
ESP32C5: 175238e
55
ESP32C6: 098bc1a
66
ESP32S2: 098bc1a
-15.9 KB
Binary file not shown.
-14.1 KB
Binary file not shown.

components/at/src/at_init.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,8 @@ static esp_err_t at_module_config_init(void)
162162
}
163163
esp_at_set_module_id_by_str(buffer);
164164
nvs_close(handle);
165+
166+
#ifdef ESP_AT_LEGACY_SUPPORT
165167
} else if (mode == AT_PARAMS_IN_PARTITION) {
166168
// deprecated way
167169
const esp_partition_t *partition = esp_at_custom_partition_find(0x40, 0xff, "factory_param");
@@ -183,6 +185,7 @@ static esp_err_t at_module_config_init(void)
183185
const char *module_name = buffer + 56;
184186
esp_at_set_module_id_by_str(module_name);
185187
}
188+
#endif
186189
} else {
187190
return ESP_FAIL;
188191
}
@@ -235,6 +238,8 @@ static esp_err_t at_wifi_config_init(void)
235238
country.policy = WIFI_COUNTRY_POLICY_MANUAL;
236239
esp_wifi_set_country(&country);
237240
nvs_close(handle);
241+
242+
#ifdef ESP_AT_LEGACY_SUPPORT
238243
} else if (mode == AT_PARAMS_IN_PARTITION) {
239244
// deprecated way
240245
const esp_partition_t *partition = esp_at_custom_partition_find(0x40, 0xff, "factory_param");
@@ -274,6 +279,7 @@ static esp_err_t at_wifi_config_init(void)
274279
country.policy = WIFI_COUNTRY_POLICY_MANUAL;
275280
esp_wifi_set_country(&country);
276281
}
282+
#endif
277283
} else {
278284
return ESP_FAIL;
279285
}

main/interface/uart/at_uart_api.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,7 @@ static int32_t at_mfg_uart_baudrate_get(void)
113113
return baud_rate;
114114
}
115115

116+
#ifdef ESP_AT_LEGACY_SUPPORT
116117
} else if (mode == AT_PARAMS_IN_PARTITION) {
117118
char data[AT_BUFFER_ON_STACK_SIZE] = {0};
118119
const esp_partition_t *partition = esp_at_custom_partition_find(0x40, 0xff, "factory_param");
@@ -129,6 +130,7 @@ static int32_t at_mfg_uart_baudrate_get(void)
129130
baud_rate = *(int32_t *)&data[12];
130131
}
131132
}
133+
#endif
132134
} else {
133135
return baud_rate;
134136
}
@@ -186,6 +188,7 @@ esp_err_t at_mfg_uart_port_pins_get(at_uart_port_pins_t *config)
186188
return ESP_FAIL;
187189
}
188190

191+
#ifdef ESP_AT_LEGACY_SUPPORT
189192
} else if (mode == AT_PARAMS_IN_PARTITION) {
190193
char data[AT_BUFFER_ON_STACK_SIZE] = {0};
191194
const esp_partition_t *partition = esp_at_custom_partition_find(0x40, 0xff, "factory_param");
@@ -216,6 +219,7 @@ esp_err_t at_mfg_uart_port_pins_get(at_uart_port_pins_t *config)
216219
rts_pin = -1;
217220
}
218221
}
222+
#endif
219223
} else {
220224
return ESP_FAIL;
221225
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
branch:release/v5.5
2-
commit:a3ca8669f244b5515114b2a3cb4c8e14b372b132
2+
commit:fcae32885b0296b32044cb99ecbdc50d98dddb83
33
repository:https://github.com/espressif/esp-idf.git

module_config/module_esp32c5_default/sdkconfig.defaults

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,7 @@ CONFIG_AT_OTA_SSL_TOKEN_KEY="dd93253c287f725de50d4071a05dd28b72056ca7"
132132
CONFIG_AT_SOCKET_MAX_CONN_NUM=5
133133
CONFIG_AT_BLE_HID_COMMAND_SUPPORT=n
134134
CONFIG_AT_BLUFI_COMMAND_SUPPORT=y
135+
CONFIG_AT_SIGNALING_COMMAND_SUPPORT=n
135136

136137
# Application manager
137138
CONFIG_APP_PROJECT_VER_FROM_CONFIG=y
@@ -145,7 +146,7 @@ CONFIG_FATFS_LFN_HEAP=y
145146
CONFIG_VFS_SUPPORT_TERMIOS=n
146147

147148
# Newlib
148-
CONFIG_NEWLIB_NANO_FORMAT=y
149+
CONFIG_LIBC_NEWLIB_NANO_FORMAT=y
149150

150151
# Common ESP-related
151152
CONFIG_ESP_TASK_WDT_TIMEOUT_S=60

module_config/module_esp32c5_default/sdkconfig_silence.defaults

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,7 @@ CONFIG_AT_OTA_SSL_TOKEN_KEY="dd93253c287f725de50d4071a05dd28b72056ca7"
135135
CONFIG_AT_SOCKET_MAX_CONN_NUM=5
136136
CONFIG_AT_BLE_HID_COMMAND_SUPPORT=n
137137
CONFIG_AT_BLUFI_COMMAND_SUPPORT=y
138+
CONFIG_AT_SIGNALING_COMMAND_SUPPORT=n
138139

139140
# Application manager
140141
CONFIG_APP_PROJECT_VER_FROM_CONFIG=y
@@ -148,7 +149,7 @@ CONFIG_FATFS_LFN_HEAP=y
148149
CONFIG_VFS_SUPPORT_TERMIOS=n
149150

150151
# Newlib
151-
CONFIG_NEWLIB_NANO_FORMAT=y
152+
CONFIG_LIBC_NEWLIB_NANO_FORMAT=y
152153

153154
# Common ESP-related
154155
CONFIG_ESP_TASK_WDT_TIMEOUT_S=60

0 commit comments

Comments
 (0)