Skip to content

Commit a70741b

Browse files
sylvioalvesmmahadevan108
authored andcommitted
west.yml: update hal_espressif to latest version
- Update GDMA and ADC drivers and remove deprecated entries. - Rebased hal_espressif to latest bump sync. - Added ESP Timer and Radio common config values Signed-off-by: Sylvio Alves <[email protected]>
1 parent b5c53d6 commit a70741b

File tree

5 files changed

+34
-13
lines changed

5 files changed

+34
-13
lines changed

drivers/adc/adc_esp32.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ LOG_MODULE_REGISTER(adc_esp32, CONFIG_ADC_LOG_LEVEL);
4141
* clip the value instead of yet another correction. The IDF implementation
4242
* for ESP32-S2 is doing it, so we copy that approach in Zephyr driver
4343
*/
44-
#define ADC_CLIP_MVOLT_11DB 2550
44+
#define ADC_CLIP_MVOLT_12DB 2550
4545
#elif CONFIG_SOC_SERIES_ESP32S3
4646
#define ADC_CALI_SCHEME ESP_ADC_CAL_VAL_EFUSE_TP_FIT
4747
#else
@@ -95,7 +95,7 @@ static inline int gain_to_atten(enum adc_gain gain, adc_atten_t *atten)
9595
*atten = ADC_ATTEN_DB_6;
9696
break;
9797
case ADC_GAIN_1_4:
98-
*atten = ADC_ATTEN_DB_11;
98+
*atten = ADC_ATTEN_DB_12;
9999
break;
100100
default:
101101
return -ENOTSUP;
@@ -117,7 +117,7 @@ static void atten_to_gain(adc_atten_t atten, uint32_t *val_mv)
117117
case ADC_ATTEN_DB_6:
118118
*val_mv = *val_mv >> 1; /* 1/ADC_GAIN_1_2 */
119119
break;
120-
case ADC_ATTEN_DB_11:
120+
case ADC_ATTEN_DB_12:
121121
*val_mv = *val_mv / 4; /* 1/ADC_GAIN_1_4 */
122122
break;
123123
case ADC_ATTEN_DB_0: /* 1/ADC_GAIN_1 */
@@ -458,9 +458,9 @@ static int adc_esp32_read(const struct device *dev, const struct adc_sequence *s
458458
cal = cal_mv = esp_adc_cal_raw_to_voltage(reading, &data->chars[channel_id]);
459459

460460
#if CONFIG_SOC_SERIES_ESP32
461-
if (data->attenuation[channel_id] == ADC_ATTEN_DB_11) {
462-
if (cal > ADC_CLIP_MVOLT_11DB) {
463-
cal = ADC_CLIP_MVOLT_11DB;
461+
if (data->attenuation[channel_id] == ADC_ATTEN_DB_12) {
462+
if (cal > ADC_CLIP_MVOLT_12DB) {
463+
cal = ADC_CLIP_MVOLT_12DB;
464464
}
465465
}
466466
#endif /* CONFIG_SOC_SERIES_ESP32 */

drivers/dma/dma_esp32_gdma.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,7 @@ LOG_MODULE_REGISTER(dma_esp32_gdma, CONFIG_DMA_LOG_LEVEL);
3333
#define ISR_HANDLER intr_handler_t
3434
#endif
3535

36-
#if defined(CONFIG_SOC_SERIES_ESP32C6)
37-
#define DMA_MAX_CHANNEL SOC_GDMA_PAIRS_PER_GROUP_MAX
38-
#else
3936
#define DMA_MAX_CHANNEL SOC_GDMA_PAIRS_PER_GROUP
40-
#endif
4137

4238
#define ESP_DMA_M2M_ON 0
4339
#define ESP_DMA_M2M_OFF 1

soc/espressif/common/Kconfig

Lines changed: 26 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,32 @@ config ESP_HEAP_RUNTIME
3232
ending by a last memory location that can be safely accesed (depending on a boot mode).
3333
This is a memory pool used in runtime to create a new heap memory.
3434

35+
config ESP32_TIMER_TASK_STACK_SIZE
36+
int "Stack size of the high resolution ESP Timer"
37+
default 4096
38+
help
39+
Set the stack size for the internal high resolution ESP Timer
40+
used in Wi-Fi and BLE peripherals.
41+
42+
config ESP32_TIMER_TASK_PRIO
43+
int "Task priority of the high resolution ESP Timer"
44+
default 3
45+
help
46+
Set the task priority for the internal high resolution ESP Timer
47+
used in Wi-Fi and BLE peripherals.
48+
49+
if (BT_ESP32 || WIFI_ESP32)
50+
51+
config ESP32_PHY_MAX_TX_POWER
52+
int "Max Wi-Fi/BLE TX power (dBm)"
53+
range 10 20
54+
default 20
55+
help
56+
Set maximum transmit power for Wi-Fi radio. Actual transmit power for high
57+
data rates may be lower than this setting.
58+
59+
endif
60+
3561
rsource "Kconfig.spiram"
3662
rsource "Kconfig.esptool"
3763
rsource "Kconfig.flash"
38-
rsource "Kconfig.wifi"

soc/espressif/common/Kconfig.esptool

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ endchoice # ESPTOOLPY_FLASHFREQ
114114

115115
config ESPTOOLPY_FLASHFREQ_80M_DEFAULT
116116
bool
117-
default y if SOC_SERIES_ESP32S2 || SOC_SERIES_ESP32S3 || SOC_SERIES_ESP32C3
117+
default y if SOC_SERIES_ESP32S2 || SOC_SERIES_ESP32S3 || SOC_SERIES_ESP32C3 || SOC_SERIES_ESP32C6
118118
help
119119
This is an invisible item, used to define the targets that defaults to use 80MHz Flash SPI speed.
120120

west.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ manifest:
157157
groups:
158158
- hal
159159
- name: hal_espressif
160-
revision: 09676fc39bde2c38d6cd40912875cf78ee76126e
160+
revision: 0f1874284f5dee0d49cb23f44f756e7be404e7b7
161161
path: modules/hal/espressif
162162
west-commands: west/west-commands.yml
163163
groups:

0 commit comments

Comments
 (0)