Ivan Grokhotkov
22dd730a7c
esp_rom: convert USB related headers to SPDX, update COPYRIGHTS.rst
2023-11-21 17:33:30 +01:00
Aditya Patwardhan
514cd783a3
Merge branch 'bugfix/esp32h2_ecdsa_hardware_k_v5.1' into 'release/v5.1'
...
fix(esp32h2): program use_hardware_k efuse bit for ECDSA key purpose (v5.1)
See merge request espressif/esp-idf!27271
2023-11-21 13:57:38 +08:00
Jiang Jiang Jian
d578395041
Merge branch 'bugfix/secure_boot_v2_docs_v5.1' into 'release/v5.1'
...
fix(docs): correct the target specific macros for secure boot v2 guide (v5.1)
See merge request espressif/esp-idf!27170
2023-11-21 11:10:41 +08:00
Jiang Jiang Jian
b3479b3164
Merge branch 'bugfix/docs_hw_breakpoints_num_v5.1' into 'release/v5.1'
...
fix(docs/jtag): Fix hard-coded HW breakpoints/watchpoints number (v5.1)
See merge request espressif/esp-idf!26500
2023-11-21 11:07:13 +08:00
morris
6bc8a025d5
Merge branch 'bugfix/ledc_max_duty_cycle_v5.1' into 'release/v5.1'
...
fix(ledc): fix ledc driver 100% duty cycle configuration (backport v5.1)
See merge request espressif/esp-idf!27179
2023-11-21 10:58:16 +08:00
Mahavir Jain
78453c8918
docs(ecdsa): add a note about TRNG dependency for ECDSA peripheral
2023-11-20 16:17:51 +05:30
Mahavir Jain
d9abb44049
docs: add ECDSA peripheral chapter for H2/P4
...
- Add ECDSA peripheral chapter and instructions to program efuse key block
- Update security guide for ECDSA peripheral mention for device identity
- Link with ESP-TLS guide about using ECDSA peripheral in TLS connection
2023-11-20 16:13:35 +05:30
Harshit Malpani
7d6ef329d7
docs: Add documentation for using ECDSA peripheral with TLS
2023-11-17 16:25:58 +05:30
morris
1b3713f7cd
Merge branch 'feature/support_adc_calibration_on_h2_v5.1' into 'release/v5.1'
...
adc_cali: supported adc calibration v1 on ESP32H2 (v5.1)
See merge request espressif/esp-idf!26963
2023-11-17 16:41:00 +08:00
morris
ddb6d22468
Merge branch 'feature/gpio_dump_io_info_v5.1' into 'release/v5.1'
...
feat(gpio): add a dump API to dump IO configurations (v5.1)
See merge request espressif/esp-idf!26870
2023-11-17 16:30:22 +08:00
morris
ceb0aec0cc
Merge branch 'bugfix/rmt_stop_issue_v5.1' into 'release/v5.1'
...
fix(rmt): a disabled channel may pick up a pending transaction (v5.1)
See merge request espressif/esp-idf!26779
2023-11-17 16:27:21 +08:00
morris
a32f0cf11e
Merge branch 'feature/mcpwm_trigger_driver_v5.1' into 'release/v5.1'
...
feature(MCPWM): Add MCPWM trigger driver (v5.1)
See merge request espressif/esp-idf!26787
2023-11-17 16:17:34 +08:00
Song Ruo Jing
03299962f6
fix(ledc): fix ledc driver 100% duty cycle configuration
...
Update ledc duty cycle value range in doxygen.
Fix duty configuration error at 100% duty cycle for ESP32.
Improve LEDC API doxygen.
Closes https://github.com/espressif/esp-idf/pull/11516
Closes https://github.com/espressif/esp-idf/issues/12593
Closes https://github.com/espressif/esp-idf/issues/12083
2023-11-17 12:38:32 +08:00
Roland Dobai
53aaf3462f
Merge branch 'feature/add_qemu_to_tools-json_v5.1' into 'release/v5.1'
...
Add QEMU to tools.json (v5.1)
See merge request espressif/esp-idf!26407
2023-11-16 18:54:46 +08:00
Mahavir Jain
5f9f8ac068
fix(docs): correct the target specific macros for secure boot v2 guide
...
It appears that target specific or'ing is not supported through the
docs build. Actual text rendering on the docs site was still using
"default" field from the custom macro, rather than using target
specific.
2023-11-15 15:37:59 +05:30
morris
bfeae3857c
feat(rmt): support calling rmt_receive in ISR callback
2023-11-15 05:57:45 +00:00
morris
d260d43168
fix(rmt): a disabled channel may pick up a pending transaction
...
because in the trans_done interrupt, the driver didn't check the channel FSM
2023-11-15 05:57:45 +00:00
Chen Jichang
0ce2683d81
feature(MCPWM): Add MCPWM trigger driver and test
...
Each MCPWM operator has two Trigger (named T0 and T1), and they can be
routed to GPIO fault signal or timer sync event.Generator can be set up
to perform different action on Trigger event.
This commit add a trigger driver and a test for the driver.
2023-11-15 05:57:37 +00:00
Marius Vikhammer
3d296723f3
Merge branch 'bugfix/fix_freertos_system_task_names_v5.1' into 'release/v5.1'
...
fix(freertos): Updated IDLE task names for each core to have the coreID as a suffix (v5.1)
See merge request espressif/esp-idf!26118
2023-11-14 16:35:25 +08:00
Jiang Jiang Jian
822aa69a4b
Merge branch 'feature/support_esp32c2_rom_mbedtls_v5.1' into 'release/v5.1'
...
feat(mbedtls): support c2 mbedtls can use crypto algorithm in ROM (backport v5.1)
See merge request espressif/esp-idf!26698
2023-11-14 15:10:20 +08:00
morris
efafacae40
Merge branch 'feature/mcpwm_timer_change_freq_v5.1' into 'release/v5.1'
...
feat(mcpwm): support update timer period dynamically (v5.1)
See merge request espressif/esp-idf!26624
2023-11-13 17:55:52 +08:00
gaoxu
df46426321
docs(adc): added adc calibration doc on h2
2023-11-13 03:04:03 +00:00
Armando
6de9757a4b
fix(adc): rename ADC_ATTEN_DB_11 to ADC_ATTEN_DB_12
...
By design, it's 12 dB. There're errors among chips, so the actual
attenuation will be 11dB more or less
2023-11-07 14:09:21 +08:00
Song Ruo Jing
4892c481b5
feat(gpio): add a dump API to dump IO configurations
...
Merges https://github.com/espressif/esp-idf/pull/12511
2023-11-03 16:21:31 +08:00
Lou Tianhao
b27b124898
docs(pm): add ext1 wakeup per pin description
2023-11-03 11:02:56 +08:00
Shyamal Khachane
8bea4c4f1d
docs(esp_wifi): Fix inconsistency in NAN documentation
2023-11-01 12:53:58 +05:30
Jiang Guang Ming
76bd3ab832
docs: Update COPYRIGHT.rst since mbedtls supported in C2 ROM
2023-10-26 20:28:03 +08:00
Jiang Guang Ming
e3a6001284
docs: add the description of CONFIG_MBEDTLS_USE_CRYPTO_ROM_IMPL
2023-10-26 20:26:19 +08:00
morris
9b4a42e728
feat(mcpwm): support update timer period dynamically
...
Implement the requirement asked in
https://www.esp32.com/viewtopic.php?f=13&t=35919
2023-10-24 10:11:47 +08:00
Shen Weilong
ea06b047c2
feat(bt): Frees BLE memory when no longer in use
...
It will free libble.a & libbt all txt, data and bss segment memory.
This memory is combined into one large memory and put into the heap
pool.
2023-10-19 14:52:29 +08:00
xuxiao
bfe6a24c57
revert(lwip): Revert changes to LWIP task priority macro from MR 25020 (backport v5.1)
2023-10-17 14:39:39 +08:00
Nic Ballinger
235c82b6ee
fix(docs/jtag): Fix hard-coded HW breakpoints/watchpoints number
...
Closes https://github.com/espressif/esp-idf/pull/11986
2023-10-16 17:30:36 +03:00
Anton Maklakov
be79c75b64
feat(tools): Add QEMU 8.0.0_20230522 to tools.json
...
Process wildcards in the install and download lists of idf_tools
Fix the install and download handlers to get common behaviour
2023-10-11 12:28:47 +07:00
Jiang Jiang Jian
4b3cc2aa02
Merge branch 'feature/eth_iram_optimization_v5.1' into 'release/v5.1'
...
feat(esp_eth): added IRAM optimization option for internal EMAC (v5.1)
See merge request espressif/esp-idf!25842
2023-09-27 10:34:00 +08:00
Jiang Jiang Jian
face850973
Merge branch 'feature/rename_wpa2_ent_to_eap_client_v5.1' into 'release/v5.1'
...
WiFi: Rename WPA2 enterprise APIs to EAP Client. (v5.1)
See merge request espressif/esp-idf!26082
2023-09-26 13:30:52 +08:00
Ondrej Kosta
1199806d71
docs(esp_eth): added Ethernet to Improving Network Speed section
2023-09-25 10:54:08 +02:00
Kapil Gupta
52120cde26
change(wifi): Add supplicant's public API header files to doc
2023-09-25 10:54:52 +05:30
laokaiyao
1880ddca9e
docs(dac): added the explanation to Vref (v5.1)
2023-09-22 14:24:13 +08:00
Krzysztof Budzynski
cef55b1712
Merge branch 'docs/add_Chinese_translation_for_api-reference/peripherals/clk_trees.rst_backport_v5.1' into 'release/v5.1'
...
docs: provide CN translation for api-reference/peripherals/clk_tree.rst (Backport v5.1)
See merge request espressif/esp-idf!26108
2023-09-22 10:52:59 +08:00
Cai Xin Ying
198ea10c59
docs: provide CN translation for api-reference/peripherals/clk_tree.rst (Backport v5.1)
2023-09-22 10:52:56 +08:00
Krzysztof Budzynski
c395dd3781
Merge branch 'docs/add_Chinese_translation_for_api-reference/peripherals/spi_slave_hd.rst_backport_v5.1' into 'release/v5.1'
...
docs: provide CN translation for api-reference/peripherals/spi_slave_hd.rst (Backport v5.1)
See merge request espressif/esp-idf!26107
2023-09-22 10:52:31 +08:00
Cai Xin Ying
fb969a4411
docs: provide CN translation for api-reference/peripherals/spi_slave_hd.rst (Backport v5.1)
2023-09-22 10:52:31 +08:00
Krzysztof Budzynski
6d9046a64d
Merge branch 'docs/add_Chinese_translation_for_api-reference_peripherals_sdspi_host.rst_backport_v5.1' into 'release/v5.1'
...
docs: provide CN translation for api-reference/peripherals/sdspi_host.rst (Backport v5.1)
See merge request espressif/esp-idf!26106
2023-09-22 10:52:18 +08:00
Cai Xin Ying
44351d691b
docs: provide CN translation for api-reference/peripherals/sdspi_host.rst (Backport v5.1)
2023-09-22 10:52:18 +08:00
Krzysztof Budzynski
d3b6d0ac18
Merge branch 'docs/add_Chinese_translation_for_api-reference/peripherals/adc_oneshot.rst_backport_v5.1' into 'release/v5.1'
...
docs: provide CN translation for api-reference/peripherals/adc_oneshot.rst (Backport v5.1)
See merge request espressif/esp-idf!26105
2023-09-22 10:52:00 +08:00
Cai Xin Ying
c4df51cb66
docs: provide CN translation for api-reference/peripherals/adc_oneshot.rst (Backport v5.1)
2023-09-22 10:52:00 +08:00
Sudeep Mohanty
77492f3bc5
fix(freertos): Updated IDLE task names for each core to have the coreID as a suffix
...
This commit updates the IDLE task names for each core by concatenating
the respective coreIDs to the names.
Closes https://github.com/espressif/esp-idf/issues/12204
2023-09-21 13:07:34 +02:00
xuxiao
2a0a080c9f
feat(doc): update wifi sections for H2
2023-09-21 14:28:12 +08:00
Song Ruo Jing
da6625faae
fix(docs): update esp32h2 gpio docs about pin led out
2023-09-19 12:12:05 +08:00
Song Ruo Jing
d167087f2d
fix(docs): Improve the DFS and Peripheral Drivers section in power_management.rst
2023-09-19 12:12:05 +08:00
Jiang Jiang Jian
8ce86c32d0
Merge branch 'bugfix/fix_some_wifi_bugs_230913_v5.1' into 'release/v5.1'
...
fix(wifi): fix some wifi bugs 20230913(Backport v5.1)
See merge request espressif/esp-idf!25960
2023-09-18 12:09:31 +08:00
zhangwenxu
331cc97d01
feat(openthread): Add support to allocate message pool from PSRAM
2023-09-15 18:30:42 +08:00
Li Xiaoyi
dcddd48d6a
Docs: add CN translation for api-guides/performance/speed.rst
2023-09-15 10:53:07 +08:00
Jiang Jiang Jian
bb8f10533f
Merge branch 'docs/docker_image_flashing_v5.1' into 'release/v5.1'
...
docs(docker): Update Using Remote Serial Port chapter (backport v5.1)
See merge request espressif/esp-idf!25852
2023-09-15 10:26:37 +08:00
xuxiao
b74c293505
feat(wifi): optimize esp32c6 iperf performance
2023-09-14 10:14:13 +08:00
Shreyas Sheth
05915fee6e
docs(wifi): Update wifi and wifi security documentation
...
1. Update documentation for WPA3 Enterprise and WPA3 Enterprise 192-bit
mode
2. Update documentation for WPA3 OWE and OWE transition mode
3. Update documentation related to SAE PK, SAE PWE and Transition Disable
4. Update documnetation for wifi connect API
5. Fix config paramter information for wifi scan start
6. Fix documentation related to scan threshold config setting
7. Replace ESP_ERR_WIFI_ARG error code as ESP_ERR_INVALID_ARG
8. Update documentation for 802.11R Fast transition
2023-09-14 10:14:13 +08:00
Kapil Gupta
4756c22ffa
change(esp_wifi): Port fast_pbkdf2 implementation for mbedlts
...
Add changes to use fast_pbkdf2 as default for PMK calculations.
fast_pbkdf2 is significantly faster than current implementations
for esp chips.
Also removes unnecessary code for pbkdf-sha256 and pbkdf-sha512.
2023-09-13 16:33:19 +08:00
Jiang Jiang Jian
111779db5a
Merge branch 'feature/configurable_wpa2_ent_v5.1' into 'release/v5.1'
...
Make enterprise support configurable to save binary size.(v5.1)
See merge request espressif/esp-idf!25558
2023-09-13 10:18:05 +08:00
KonstantinKondrashov
d612db3bca
fix(doc): Fix incorrect description for xts_key_length_256 efuse
2023-09-12 14:52:48 +08:00
morris
5baf0197f0
Merge branch 'feature/modify_mcpwm_clock_pre_scale_v5.1' into 'release/v5.1'
...
feat(mcpwm): Make the MCPWM capture timer's resolution configurable (v5.1)
See merge request espressif/esp-idf!25904
2023-09-12 11:30:39 +08:00
aleks
4c06791a40
docs: updated modbus api reference documents for target esp32h2
2023-09-11 13:41:07 +00:00
Chen Jichang
d8e5b2ac41
feat(mcpwm): Set group clock prescale dynamically
...
MCPWM group clock pre scale was originally fixed to 2, which is
inconvenient. Set group clock prescale dynamically. Now the maximum
resolution of the MCPWM timer is up to 160MHz(when the prescale set
to 1). And add a resulotion config for MCPWM capture.
2023-09-11 11:29:28 +08:00
Jakub Kocka
2c3c4adaa3
docs(docker): Update Using Remote Serial Port chapter
...
By default some shells such as zsh has NOMATCH option set (https://zsh.sourceforge.io/Doc/Release/Options.html ).
The root cause of the problem is that while bash expands the parameter to itself if it does not match any filename, the zsh reports an error. IOW if we do % setopt nonomatch it will work even in zsh.
Closes https://github.com/espressif/esp-idf/issues/12060
2023-09-08 09:15:30 +02:00
Jiang Jiang Jian
b3717678c3
Merge branch 'docs/update_multi_antenna_switch_docs_v5.1' into 'release/v5.1'
...
Docs/update multi antenna switch docs v5.1(Backport v5.1)
See merge request espressif/esp-idf!25822
2023-09-08 10:18:43 +08:00
Krzysztof Budzynski
752a99d3d1
Merge branch 'docs/add_Chinese_translation_for_api-reference/peripherals/temp_sensor.rst_backport_v5.1' into 'release/v5.1'
...
docs: provide CN translation for api-reference/peripherals/temp_sensor.rst (backport v5.1)
See merge request espressif/esp-idf!25821
2023-09-07 18:05:02 +08:00
Cai Xin Ying
f0dec1b1a6
docs: provide CN translation for api-reference/peripherals/temp_sensor.rst (backport v5.1)
2023-09-07 18:05:01 +08:00
morris
fefa61a7c7
Merge branch 'feature/esp_lcd_st7789_rgb_data_endian_config_v5.1' into 'release/v5.1'
...
feat(st7789): add data endian config (v5.1)
See merge request espressif/esp-idf!25802
2023-09-07 16:33:49 +08:00
Krzysztof Budzynski
63bc27fb2d
Merge branch 'docs/add_Chinese_translation_for_api-reference/peripherals/adc_calibration.rst_backport_v5.1' into 'release/v5.1'
...
docs: provide CN translation for api-reference/peripherals/adc_calibration.rst (backport v5.1)
See merge request espressif/esp-idf!25820
2023-09-07 14:02:24 +08:00
Cai Xin Ying
3c0e72887a
docs: provide CN translation for api-reference/peripherals/adc_calibration.rst (backport v5.1)
2023-09-07 14:02:24 +08:00
Krzysztof Budzynski
cbee3f67b2
Merge branch 'docs/add_Chinese_translation_for_api-guides/cplusplus.rst_backport_v5.1' into 'release/v5.1'
...
docs: provide CN translation for api-guides/cplusplus.rst (backport v5.1)
See merge request espressif/esp-idf!25755
2023-09-07 13:15:27 +08:00
Cai Xin Ying
36376e0eab
docs: provide CN translation for api-guides/cplusplus.rst (backport v5.1)
2023-09-07 13:15:27 +08:00
muhaidong
01ebf0775e
esp_wifi: update multi antenna switch docs
2023-09-07 11:06:28 +08:00
Planck (Lu Zeyu)
9d535c05f7
feat(st7789): add data endian config
...
Closes https://github.com/espressif/esp-idf/issues/11416
2023-09-06 16:59:13 +08:00
Krzysztof Budzynski
0954c0a231
Merge branch 'docs/add_Chinese_translation_for_api-guides/core_dump.rst_backport_v5.1' into 'release/v5.1'
...
docs: provide CN translation for api-guides/core_dump.rst and api-guides/core_dump_internals.rst (Backport v5.1)
See merge request espressif/esp-idf!25740
2023-09-05 14:44:29 +08:00
Cai Xin Ying
75e176fd21
docs: provide CN translation for api-guides/core_dump.rst and api-guides/core_dump_internals.rst (Backport v5.1)
2023-09-05 14:44:29 +08:00
morris
aec971572f
Merge branch 'feature/specify_rmt_intr_priority_v5.1' into 'release/v5.1'
...
feat(rmt): specify interrupt priority (v5.1)
See merge request espressif/esp-idf!25718
2023-09-05 12:09:44 +08:00
morris
537198b15d
Merge branch 'docs/add_Chinese_translation_for_three_short_docs_of_api-guides_backport_v5.1' into 'release/v5.1'
...
docs: provide CN translation for three short docs of api-guides (backport v5.1)
See merge request espressif/esp-idf!25743
2023-09-05 11:11:27 +08:00
Cai Xin Ying
ef5c85158d
docs: provide CN translation for three short docs of api-guides (backport v5.1)
2023-09-05 11:11:27 +08:00
Krzysztof Budzynski
cc27c579ad
Merge branch 'docs/add_Chinese_translation_for_api-reference/peripherals/touch_element.rst_backport_v5.1' into 'release/v5.1'
...
docs: provide CN translation for api-reference/peripherals/touch_element.rst (backport v5.1)
See merge request espressif/esp-idf!25746
2023-09-05 10:22:17 +08:00
Cai Xin Ying
b93ffc1cb4
docs: provide CN translation for api-reference/peripherals/touch_element.rst (backport v5.1)
2023-09-05 10:22:16 +08:00
Cai Xin Ying
1e656013d7
docs: provide CN translation for api-reference/peripherals/etm.rst (backport v5.1)
2023-09-05 10:21:17 +08:00
Planck (Lu Zeyu)
3b9c57ac32
feat(rmt): specify interrupt priority
2023-09-04 13:12:02 +08:00
Jiang Jiang Jian
5fa0d2a83d
Merge branch 'contrib/github_pr_9694_v5.1' into 'release/v5.1'
...
add low power doc and picture (GitHub PR)(backport v5.1)
See merge request espressif/esp-idf!25590
2023-08-30 14:56:31 +08:00
chenjianxing
2fa873408c
docs: update power save part
2023-08-28 14:08:02 +08:00
wang tao
164d5df66a
add low power doc and picture
...
Merges https://github.com/espressif/esp-idf/pull/9694
2023-08-28 14:07:45 +08:00
Jiang Jiang Jian
3eed68cc9c
Merge branch 'bugfix/update_supplicant_copyrights_v5.1' into 'release/v5.1'
...
Update copyright info for wpa_supplicant (v5.1)
See merge request espressif/esp-idf!25526
2023-08-28 13:49:25 +08:00
morris
8da2c57889
Merge branch 'feature/mcpwm_interrupt_prioity_v5.1' into 'release/v5.1'
...
feat(MCPWM): Support set interrupt priority(v5.1)
See merge request espressif/esp-idf!25573
2023-08-28 11:21:55 +08:00
morris
2a80451b24
Merge branch 'feature/add_mcpwm_carrier_clk_source_v5.1' into 'release/v5.1'
...
feat(MCPWM): Add mcpwm carrier clk source(v5.1)
See merge request espressif/esp-idf!25572
2023-08-28 11:11:04 +08:00
morris
dabbc8b70e
Merge branch 'feature/pcnt_interrupt_prioity_v5.1' into 'release/v5.1'
...
feat(pcnt): support set interrupt priority(v5.1)
See merge request espressif/esp-idf!25575
2023-08-28 10:58:25 +08:00
Jiang Jiang Jian
69d0872cd6
Merge branch 'docs/fatfs_add_api_reference_v5.1' into 'release/v5.1'
...
docs(fatfs): Move mentioned APIs to a separate API reference section (v5.1)
See merge request espressif/esp-idf!25349
2023-08-28 10:24:53 +08:00
Jiang Jiang Jian
6e403fb140
Merge branch 'docs/add_protocomm_trans_backport_v5.1' into 'release/v5.1'
...
Docs: add CN translation for api-reference/provisioning/protocomm.rst (backport v5.1)
See merge request espressif/esp-idf!25037
2023-08-28 10:23:21 +08:00
Cai Xin Ying
67f59c8ddb
Docs: add CN translation for api-reference/provisioning/protocomm.rst (backport v5.1)
2023-08-28 10:23:21 +08:00
Chen Jichang
92cc9fca07
feat(pcnt): support set interrupt priority
2023-08-25 17:47:52 +08:00
Chen Jichang
d3aba34baa
feat(MCPWM): Support set interrupt priority
2023-08-25 17:41:31 +08:00
Chen Jichang
c240a1f46b
feat(MCPWM): Add mcpwm carrier clk source
...
The MCPWM carrier is part of the operator and can work independently
without the MCPWM timer being enabled. This commit add the MCPWM
carrier clk source.
2023-08-25 17:34:58 +08:00
Roland Dobai
84e5d91b4e
Merge branch 'docs/uninstall_idf_v5.1' into 'release/v5.1'
...
docs(idf-tools): Add uninstallation instructions (backport v5.1)
See merge request espressif/esp-idf!25494
2023-08-25 14:27:54 +08:00
Roland Dobai
cc380696e4
Merge branch 'docs/monitor_rom_address_decoding_v5.1' into 'release/v5.1'
...
docs(esp_idf_monitor): ROM ELF address decoding (backport v5.1)
See merge request espressif/esp-idf!24856
2023-08-25 14:19:44 +08:00
aditi_lonkar
0624d5e58f
esp_wifi: Make enterprise support configurable to save binary size.
2023-08-25 11:20:58 +05:30
morris
667493584c
Merge branch 'bugfix/fix_psram_size_doc_s3_v5.1' into 'release/v5.1'
...
doc: update s3 psram vaddr max range size (v5.1)
See merge request espressif/esp-idf!25503
2023-08-24 17:36:48 +08:00
Kapil Gupta
a22ba76f33
change(esp_wifi): Update copyright info for wpa_supplicant
2023-08-24 10:05:39 +05:30