From bfb5c92740c1b4d2a918b2ac6c385d5f8bd51d06 Mon Sep 17 00:00:00 2001 From: Alex Kaariainen Date: Sat, 24 Feb 2018 22:21:16 -0600 Subject: [PATCH 1/2] Update adc.rst. Merges https://github.com/espressif/esp-idf/pull/1657 --- docs/api-reference/peripherals/adc.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/api-reference/peripherals/adc.rst b/docs/api-reference/peripherals/adc.rst index fa6a6497c9..3ac2b17543 100644 --- a/docs/api-reference/peripherals/adc.rst +++ b/docs/api-reference/peripherals/adc.rst @@ -6,7 +6,7 @@ Overview ESP32 integrates two 12-bit SAR (`Successive Approximation Register `_) ADCs (Analog to Digital Converters) and supports measurements on 18 channels (analog enabled pins). Some of these pins can be used to build a programmable gain amplifier which is used for the measurement of small analog signals. -The ADC driver API supports ADC1 (9 channels, attached to GPIOs 32 - 39), and ADC2 (10 channels, attached to GPIOs 0, 2, 4, 12 - 15 and 25 - 27). +The ADC driver API supports ADC1 (8 channels, attached to GPIOs 32 - 39), and ADC2 (10 channels, attached to GPIOs 0, 2, 4, 12 - 15 and 25 - 27). However, there're some restrictions for the application to use ADC2: 1. The application can use ADC2 only when Wi-Fi driver is not started, since the ADC is also used by the Wi-Fi driver, which has higher priority. From 9b2bce2c1726066f89406bd6e3530f7934ba265e Mon Sep 17 00:00:00 2001 From: XuanZe <119524428@qq.com> Date: Mon, 5 Mar 2018 13:51:10 +0800 Subject: [PATCH 2/2] Fix missing 'cpp:func:'. Merges https://github.com/espressif/esp-idf/pull/1680 --- docs/api-reference/peripherals/uart.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/api-reference/peripherals/uart.rst b/docs/api-reference/peripherals/uart.rst index da75b08432..d7c82c37ed 100644 --- a/docs/api-reference/peripherals/uart.rst +++ b/docs/api-reference/peripherals/uart.rst @@ -116,7 +116,7 @@ The API provides a convenient way to handle specific interrupts discussed above * **FIFO space threshold or transmission timeout reached** - the interrupts on TX or Rx FIFO buffer being filled with specific number of characters or on a timeout of sending or receiving data. To use these interrupts, first configure respective threshold values of the buffer length and the timeout by entering them in :cpp:type:`uart_intr_config_t` structure and calling :cpp:func:`uart_intr_config`. Then enable interrupts with functions :cpp:func:`uart_enable_rx_intr` and :cpp:func:`uart_enable_tx_intr`. To disable these interrupts there are corresponding functions :cpp:func:`uart_disable_rx_intr` or :cpp:func:`uart_disable_tx_intr`. -* **Pattern detection** - an interrupt triggered on detecting a 'pattern' of the same character being sent number of times. The functions that allow to configure, enable and disable this interrupt are :cpp:func:`uart_enable_pattern_det_intr` and uart_disable_pattern_det_intr`. +* **Pattern detection** - an interrupt triggered on detecting a 'pattern' of the same character being sent number of times. The functions that allow to configure, enable and disable this interrupt are :cpp:func:`uart_enable_pattern_det_intr` and cpp:func:`uart_disable_pattern_det_intr`. Macros