Merge branch 'master' into feature/esp32s2beta_update

examples/provisioning/custom_config/README.md

@@ -29,7 +29,7 @@ To provision the device running this example, the `esp_prov.py` script needs to
 ### Configure the project
 
 ```
-make menuconfig
+idf.py menuconfig
 ```
 
 * Set serial port under Serial Flasher Options.
@@ -45,7 +45,7 @@ make menuconfig
 Build the project and flash it to the board, then run monitor tool to view serial output:
 
 ```
-make -j4 flash monitor
+idf.py -p PORT flash monitor
 ```
 
 (To exit the serial monitor, type ``Ctrl-]``.)
@@ -138,7 +138,7 @@ It means the Wi-Fi credentials were already set by some other application flashe
 
 ```
 make erase_flash
-make -j4 flash monitor
+idf.py -p PORT flash monitor
 ```
 
 Or, enable `Reset Provisioning` option under `Example Configuration` under menuconfig. But this will erase the saved Wi-Fi credentials every time the device boots, so this is not the preferred solution.

examples/provisioning/custom_config/main/app_main.c

@@ -47,7 +47,7 @@ static void event_handler(void* arg, esp_event_base_t event_base,
     }
 }
 
-static void wifi_init_sta()
+static void wifi_init_sta(void)
 {
     /* Set our event handling */
     ESP_ERROR_CHECK(esp_event_handler_register(WIFI_EVENT, ESP_EVENT_ANY_ID, event_handler, NULL));
@@ -58,7 +58,7 @@ static void wifi_init_sta()
     ESP_ERROR_CHECK(esp_wifi_start());
 }
 
-static void start_softap_provisioning()
+static void start_softap_provisioning(void)
 {
     /* Security version */
     int security = 0;
@@ -82,7 +82,7 @@ static void start_softap_provisioning()
         CONFIG_EXAMPLE_SSID, CONFIG_EXAMPLE_PASS, security, pop));
 }
 
-void app_main()
+void app_main(void)
 {
     /* Initialize networking stack */
     tcpip_adapter_init();