j3d1/esp-open-rtos
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

rename GPIO_CONF_DRIVER_ENABLE back to GPIO_CONF_PUSH_PULL

Browse source
This commit is contained in:
Alex Stewart 2015-08-21 09:54:20 -07:00
parent 820a7006a5
commit d79c1c3983
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/include/esp/gpio.h
View file

@ -36,7 +36,7 @@ INLINED void gpio_enable(const uint8_t gpio_num, const gpio_direction_t directio
break; break;
case GPIO_OUTPUT: case GPIO_OUTPUT:
iomux_flags = IOMUX_PIN_OUTPUT_ENABLE; iomux_flags = IOMUX_PIN_OUTPUT_ENABLE;
ctrl_val = GPIO_CONF_DRIVER_ENABLE; ctrl_val = GPIO_CONF_PUSH_PULL;
break; break;
case GPIO_OUT_OPEN_DRAIN: case GPIO_OUT_OPEN_DRAIN:
iomux_flags = IOMUX_PIN_OUTPUT_ENABLE; iomux_flags = IOMUX_PIN_OUTPUT_ENABLE;

8
core/include/esp/gpio_regs.h
View file

@ -76,7 +76,7 @@ _Static_assert(sizeof(struct GPIO_REGS) == 0x74, "GPIO_REGS is the wrong size");
* Under what conditions this GPIO input should generate an interrupt. * Under what conditions this GPIO input should generate an interrupt.
* (see gpio_inttype_t enum below for values) * (see gpio_inttype_t enum below for values)
* *
* GPIO_CONF_DRIVER_ENABLE (boolean) * GPIO_CONF_PUSH_PULL (boolean)
* When set, a high output state will pull the pin up to +Vcc (3.3V). When * When set, a high output state will pull the pin up to +Vcc (3.3V). When
* cleared, output functions in "open drain" mode (low state will pull down * cleared, output functions in "open drain" mode (low state will pull down
* to ground, but high state allows output to "float"). * to ground, but high state allows output to "float").
@ -91,9 +91,9 @@ _Static_assert(sizeof(struct GPIO_REGS) == 0x74, "GPIO_REGS is the wrong size");
#define GPIO_CONF_CONFIG_M 0x00000003 #define GPIO_CONF_CONFIG_M 0x00000003
#define GPIO_CONF_CONFIG_S 11 #define GPIO_CONF_CONFIG_S 11
#define GPIO_CONF_WAKEUP_ENABLE BIT(10) #define GPIO_CONF_WAKEUP_ENABLE BIT(10)
#define GPIO_CONF_INTTYPE_M 0x00000007 #define GPIO_CONF_INTTYPE_M 0x00000007
#define GPIO_CONF_INTTYPE_S 7 #define GPIO_CONF_INTTYPE_S 7
#define GPIO_CONF_DRIVER_ENABLE BIT(2) #define GPIO_CONF_PUSH_PULL BIT(2)
#define GPIO_CONF_SOURCE_PWM BIT(0) #define GPIO_CONF_SOURCE_PWM BIT(0)
/* Valid values for the GPIO_CONF_INTTYPE field */ /* Valid values for the GPIO_CONF_INTTYPE field */