From f59f13efd5afb2342b399e2af3d79375285fb506 Mon Sep 17 00:00:00 2001 From: Ivan Grokhotkov Date: Tue, 14 Mar 2017 21:35:20 +0800 Subject: [PATCH] examples: remove nvs_flash_init from examples which do not use NVS --- examples/get-started/blink/main/blink.c | 3 --- examples/get-started/hello_world/main/hello_world_main.c | 2 -- examples/peripherals/i2s/main/app_main.c | 3 --- .../peripherals/touch_pad_interrupt/main/tp_interrupt_main.c | 5 ----- examples/peripherals/touch_pad_read/main/tp_read_main.c | 4 ---- 5 files changed, 17 deletions(-) diff --git a/examples/get-started/blink/main/blink.c b/examples/get-started/blink/main/blink.c index f97572ac2..698bad218 100644 --- a/examples/get-started/blink/main/blink.c +++ b/examples/get-started/blink/main/blink.c @@ -9,8 +9,6 @@ #include #include "freertos/FreeRTOS.h" #include "freertos/task.h" -#include "esp_system.h" -#include "nvs_flash.h" #include "driver/gpio.h" #include "sdkconfig.h" @@ -42,6 +40,5 @@ void blink_task(void *pvParameter) void app_main() { - nvs_flash_init(); xTaskCreate(&blink_task, "blink_task", 512, NULL, 5, NULL); } diff --git a/examples/get-started/hello_world/main/hello_world_main.c b/examples/get-started/hello_world/main/hello_world_main.c index c8b9f5f0c..e1955d875 100644 --- a/examples/get-started/hello_world/main/hello_world_main.c +++ b/examples/get-started/hello_world/main/hello_world_main.c @@ -10,7 +10,6 @@ #include "freertos/FreeRTOS.h" #include "freertos/task.h" #include "esp_system.h" -#include "nvs_flash.h" void hello_task(void *pvParameter) { @@ -26,6 +25,5 @@ void hello_task(void *pvParameter) void app_main() { - nvs_flash_init(); xTaskCreate(&hello_task, "hello_task", 2048, NULL, 5, NULL); } diff --git a/examples/peripherals/i2s/main/app_main.c b/examples/peripherals/i2s/main/app_main.c index 9c8f80fd5..8072cff6a 100644 --- a/examples/peripherals/i2s/main/app_main.c +++ b/examples/peripherals/i2s/main/app_main.c @@ -11,8 +11,6 @@ #include #include "freertos/FreeRTOS.h" #include "freertos/task.h" -#include "esp_system.h" -#include "nvs_flash.h" #include "driver/i2s.h" #include @@ -48,7 +46,6 @@ void app_main() .data_in_num = -1 //Not used }; - nvs_flash_init(); i2s_driver_install(I2S_NUM, &i2s_config, 0, NULL); i2s_set_pin(I2S_NUM, &pin_config); diff --git a/examples/peripherals/touch_pad_interrupt/main/tp_interrupt_main.c b/examples/peripherals/touch_pad_interrupt/main/tp_interrupt_main.c index fd4fe5b27..90f94f65f 100644 --- a/examples/peripherals/touch_pad_interrupt/main/tp_interrupt_main.c +++ b/examples/peripherals/touch_pad_interrupt/main/tp_interrupt_main.c @@ -9,8 +9,6 @@ #include #include "freertos/FreeRTOS.h" #include "freertos/task.h" -#include "esp_system.h" -#include "nvs_flash.h" #include "esp_log.h" #include "driver/touch_pad.h" @@ -95,9 +93,6 @@ static void touch_pad_rtc_intr(void * arg) void app_main() { - ESP_LOGI(TAG, "Starting"); - nvs_flash_init(); - // Initialize touch pad peripheral ESP_LOGI(TAG, "Initializing touch pad"); touch_pad_init(); diff --git a/examples/peripherals/touch_pad_read/main/tp_read_main.c b/examples/peripherals/touch_pad_read/main/tp_read_main.c index accfe5027..69bb87d17 100644 --- a/examples/peripherals/touch_pad_read/main/tp_read_main.c +++ b/examples/peripherals/touch_pad_read/main/tp_read_main.c @@ -9,8 +9,6 @@ #include #include "freertos/FreeRTOS.h" #include "freertos/task.h" -#include "esp_system.h" -#include "nvs_flash.h" #include "driver/touch_pad.h" @@ -34,8 +32,6 @@ void touch_pad_read_task(void *pvParameter) void app_main() { - nvs_flash_init(); - // Initialize touch pad peripheral touch_pad_init();