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

Merge branch 'iomux-set-func' of https://github.com/ourairquality/esp-open-rtos into ourairquality-iomux-set-func

Browse source 
Conflicts:
	core/include/esp/iomux.h
This commit is contained in:
sheinz 2016-08-17 14:36:46 +03:00
commit 0875e5d55b
4 changed files with 24 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

4
core/include/esp/iomux.h
View file

@ -82,8 +82,8 @@ inline static void iomux_set_pullup_flags(uint8_t iomux_num, uint32_t pullup_fla
inline static void iomux_set_gpio_function(uint8_t gpio_number, bool output_enable)
{
const uint8_t iomux_num = gpio_to_iomux(gpio_number);
const uint32_t func = iomux_num > 11 ? 0 : 3;
iomux_set_function(iomux_num, IOMUX_FUNC(func));
const uint32_t func = iomux_num > 11 ? IOMUX_FUNC(0) : IOMUX_FUNC(3);
iomux_set_function(iomux_num, func);
iomux_set_direction_flags(iomux_num, output_enable ? IOMUX_PIN_OUTPUT_ENABLE : 0);
}