Merge branch 'master' into feature/esp32s2beta_update

This commit is contained in:
Angus Gratton
2019-08-08 14:00:45 +10:00
committed by Angus Gratton
657 changed files with 6814 additions and 7534 deletions

View File

@@ -46,14 +46,14 @@ static void tp_example_read_task(void *pvParameter)
}
}
static void tp_example_touch_pad_init()
static void tp_example_touch_pad_init(void)
{
for (int i = 0;i< TOUCH_PAD_MAX;i++) {
touch_pad_config(i, TOUCH_THRESH_NO_USE);
}
}
void app_main()
void app_main(void)
{
// Initialize touch pad peripheral.
// The default fsm mode is software trigger mode.