Merge branch 'master' into feature/esp32s2beta_update · 04ae56806c - esp-idf - Anton pioduino

pioduino/esp-idf

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

parent 24d26fccde 51d811a71c

commit 04ae56806c

657 changed files with 6814 additions and 7534 deletions

									
										examples/system/ota/advanced_https_ota/main/advanced_https_ota_example.c
									
		+1
		-1
	
												View File
												
				@@ -103,7 +103,7 @@ ota_end:

				    }

				}

				void app_main()

				void app_main(void)

				{

				    // Initialize NVS.

				    esp_err_t err = nvs_flash_init();