alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'feature/cleanup_examples' into 'master'

Browse Source 
Minor example cleanup

Remove deprecated system_init, fix app_main prototype

See merge request !197
This commit is contained in:
Angus Gratton 2016-11-15 07:08:33 +08:00
commit c36a3e7d06
6 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
examples/01_hello_world/main/hello_world_main.c
View File

@ -27,6 +27,5 @@ void hello_task(void *pvParameter)
void app_main() void app_main()
{ {
nvs_flash_init(); nvs_flash_init();
system_init();
xTaskCreate(&hello_task, "hello_task", 2048, NULL, 5, NULL); xTaskCreate(&hello_task, "hello_task", 2048, NULL, 5, NULL);
} }

1
examples/02_blink/main/blink.c
View File

@ -43,6 +43,5 @@ void blink_task(void *pvParameter)
void app_main() void app_main()
{ {
nvs_flash_init(); nvs_flash_init();
system_init();
xTaskCreate(&blink_task, "blink_task", 512, NULL, 5, NULL); xTaskCreate(&blink_task, "blink_task", 512, NULL, 5, NULL);
} }

1
examples/03_http_request/main/http_request_main.c
View File

@ -175,7 +175,6 @@ static void http_get_task(void *pvParameters)
void app_main() void app_main()
{ {
nvs_flash_init(); nvs_flash_init();
system_init();
initialise_wifi(); initialise_wifi();
xTaskCreate(&http_get_task, "http_get_task", 2048, NULL, 5, NULL); xTaskCreate(&http_get_task, "http_get_task", 2048, NULL, 5, NULL);
} }

1
examples/04_https_request/main/https_request_main.c
View File

@ -369,7 +369,6 @@ static void https_get_task(void *pvParameters)
void app_main() void app_main()
{ {
nvs_flash_init(); nvs_flash_init();
system_init();
initialise_wifi(); initialise_wifi();
xTaskCreate(&https_get_task, "https_get_task", 8192, NULL, 5, NULL); xTaskCreate(&https_get_task, "https_get_task", 8192, NULL, 5, NULL);
} }

3
examples/05_ble_adv/main/app_bt.c
View File

@ -197,10 +197,9 @@ void bleAdvtTask(void *pvParameters)
} }
} }
int app_main() void app_main()
{ {
bt_controller_init(); bt_controller_init();
xTaskCreatePinnedToCore(&bleAdvtTask, "bleAdvtTask", 2048, NULL, 5, NULL, 0); xTaskCreatePinnedToCore(&bleAdvtTask, "bleAdvtTask", 2048, NULL, 5, NULL, 0);
return 0;
} }

1
examples/06_sntp/main/sntp_main.c
View File

@ -94,7 +94,6 @@ void app_main()
static void obtain_time(void) static void obtain_time(void)
{ {
nvs_flash_init(); nvs_flash_init();
system_init();
initialise_wifi(); initialise_wifi();
xEventGroupWaitBits(wifi_event_group, CONNECTED_BIT, xEventGroupWaitBits(wifi_event_group, CONNECTED_BIT,
false, true, portMAX_DELAY); false, true, portMAX_DELAY);