]> granicus.if.org Git - esp-idf/commitdiff
Merge branch 'bugfix/touch_change_default_enable_value' into 'master'
authorJiang Jiang Jian <jack@espressif.com>
Wed, 16 May 2018 09:40:18 +0000 (17:40 +0800)
committerJiang Jiang Jian <jack@espressif.com>
Wed, 16 May 2018 09:40:18 +0000 (17:40 +0800)
bugfix(touch): change the default value for sar_touch_enable register.

See merge request idf/esp-idf!1870

1  2 
components/driver/rtc_module.c

Simple merge