alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2025-09-30 19:19:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature/move_to_soc_rtc_gpio_desc' into 'master'

Browse Source 
soc: Fix check_long_hold_gpio and move def to soc

See merge request idf/esp-idf!2550
This commit is contained in:
Ivan Grokhotkov
2018-06-25 12:33:27 +08:00
parent 1cd9949f2d 32da455384
commit f525c9ef96
12 changed files with 247 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
components/bootloader_support/src/bootloader_common.c
View File

@@ -26,6 +26,7 @@
#include "esp_flash_partitions.h"
#include "bootloader_flash.h"
#include "bootloader_common.h"
#include "soc/gpio_periph.h"
static const char* TAG = "boot_comm";
@@ -42,6 +43,9 @@ bool bootloader_common_ota_select_valid(const esp_ota_select_entry_t *s)
esp_comm_gpio_hold_t bootloader_common_check_long_hold_gpio(uint32_t num_pin, uint32_t delay_sec)
{
gpio_pad_select_gpio(num_pin);
if (GPIO_PIN_MUX_REG[num_pin]) {
PIN_INPUT_ENABLE(GPIO_PIN_MUX_REG[num_pin]);
}
gpio_pad_pullup(num_pin);
uint32_t tm_start = esp_log_early_timestamp();
if (GPIO_INPUT_GET(num_pin) == 1) {