Răsfoiți Sursa

Merge branch 'feature/cleanup_examples' into 'master'

Minor example cleanup

Remove deprecated system_init, fix app_main prototype

See merge request !197

Angus Gratton 9 ani în urmă
părinte
comite
c36a3e7d06

+ 0 - 1
examples/01_hello_world/main/hello_world_main.c

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

+ 0 - 1
examples/02_blink/main/blink.c

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

+ 0 - 1
examples/03_http_request/main/http_request_main.c

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

+ 0 - 1
examples/04_https_request/main/https_request_main.c

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

+ 1 - 2
examples/05_ble_adv/main/app_bt.c

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

+ 0 - 1
examples/06_sntp/main/sntp_main.c

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