From eb83924e95c97e3033917e91eb3d85176408ec57 Mon Sep 17 00:00:00 2001 From: Dan <14043624+delivrance@users.noreply.github.com> Date: Wed, 6 Mar 2019 11:12:23 +0100 Subject: [PATCH 1/3] Fix math: 8192 = 2 ** 13 Merges https://github.com/espressif/esp-idf/pull/3133 --- docs/en/api-reference/peripherals/ledc.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/en/api-reference/peripherals/ledc.rst b/docs/en/api-reference/peripherals/ledc.rst index fe17cc425..61ad949b9 100644 --- a/docs/en/api-reference/peripherals/ledc.rst +++ b/docs/en/api-reference/peripherals/ledc.rst @@ -139,7 +139,7 @@ For additional details regarding speed modes please refer to `ESP32 Technical Re Supported Range of Frequency and Duty Resolution ------------------------------------------------ -The LED PWM Controller is designed primarily to drive LEDs and provides wide resolution of PWM duty settings. For instance for the PWM frequency at 5 kHz, the maximum duty resolution is 13 bits. It means that the duty may be set anywhere from 0 to 100% with resolution of ~0.012% (13 ** 2 = 8192 discrete levels of the LED intensity). +The LED PWM Controller is designed primarily to drive LEDs and provides wide resolution of PWM duty settings. For instance for the PWM frequency at 5 kHz, the maximum duty resolution is 13 bits. It means that the duty may be set anywhere from 0 to 100% with resolution of ~0.012% (2 ** 13 = 8192 discrete levels of the LED intensity). The LEDC may be used for providing signals at much higher frequencies to clock other devices, e.g. a digital camera module. In such a case the maximum available frequency is 40 MHz with duty resolution of 1 bit. This means that duty is fixed at 50% and cannot be adjusted. From 955aa2e4e004e38c16c07c686d0fad6d9cf0f68d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B9=AC?= Date: Wed, 27 Feb 2019 20:02:57 +0800 Subject: [PATCH 2/3] Update README.md Merges https://github.com/espressif/esp-idf/pull/3104 --- examples/peripherals/mcpwm/mcpwm_servo_control/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/peripherals/mcpwm/mcpwm_servo_control/README.md b/examples/peripherals/mcpwm/mcpwm_servo_control/README.md index cafab4d71..791360937 100644 --- a/examples/peripherals/mcpwm/mcpwm_servo_control/README.md +++ b/examples/peripherals/mcpwm/mcpwm_servo_control/README.md @@ -6,11 +6,11 @@ Assign pulse width range and the maximum degree, accordingly the servo will move ## Step 1: Pin assignment -* GPIO15 is assigned as the MCPWM signal for servo motor +* GPIO18 is assigned as the MCPWM signal for servo motor ## Step 2: Connection -* connect GPIO15 with servo pwm signal +* connect GPIO18 with servo pwm signal * other two wires of servo motor are VCC and GND From eb5abca23dc4ecb4f05f88cc952984cf16f7656e Mon Sep 17 00:00:00 2001 From: Tim Nordell Date: Thu, 21 Mar 2019 14:29:08 -0500 Subject: [PATCH 3/3] nvs_flash: Fix typo in README.rst Merges https://github.com/espressif/esp-idf/pull/3216 This should read "except for the new key-value pair" instead of "expect for the new key-value pair". Signed-off-by: Tim Nordell --- components/nvs_flash/README.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/nvs_flash/README.rst b/components/nvs_flash/README.rst index 2e85d0481..7a8b9033f 100644 --- a/components/nvs_flash/README.rst +++ b/components/nvs_flash/README.rst @@ -51,7 +51,7 @@ NVS is not directly compatible with the ESP32 flash encryption system. However, If NVS encryption is not used, it is possible for anyone with physical access to the flash chip to alter, erase, or add key-value pairs. With NVS encryption enabled, it is not possible to alter or add a key-value pair and get recognized as a valid pair without knowing corresponding NVS encryption keys. However, there is no tamper-resistance against erase operation. -The library does try to recover from conditions when flash memory is in an inconsistent state. In particular, one should be able to power off the device at any point and time and then power it back on. This should not result in loss of data, expect for the new key-value pair if it was being written at the moment of power off. The library should also be able to initialize properly with any random data present in flash memory. +The library does try to recover from conditions when flash memory is in an inconsistent state. In particular, one should be able to power off the device at any point and time and then power it back on. This should not result in loss of data, except for the new key-value pair if it was being written at the moment of power off. The library should also be able to initialize properly with any random data present in flash memory. Internals ---------