Merge branch 'master' into ov5640-save-button

Fix missing mdns dependency
fix bug in mdns json generator
2020-03-27 13:42:27 +02:00 · 2020-03-27 13:39:50 +02:00 · 2020-03-27 10:59:57 +02:00 · 2020-03-27 01:58:36 +02:00 · 2020-03-26 15:30:39 +02:00 · 2020-03-12 19:12:43 +02:00
2 changed files with 2 additions and 1 deletions
--- a/examples/single_chip/camera_web_server/main/CMakeLists.txt
+++ b/examples/single_chip/camera_web_server/main/CMakeLists.txt
@ -7,6 +7,7 @@ set(COMPONENT_REQUIRES
    nvs_flash
    esp_http_server
    fb_gfx
+    mdns
    )

 set(COMPONENT_EMBED_FILES
--- a/examples/single_chip/camera_web_server/main/app_mdns.c
+++ b/examples/single_chip/camera_web_server/main/app_mdns.c
@ -97,7 +97,7 @@ const char * app_mdns_query(size_t * out_len)
    p += sprintf(p, "\"framesize\":\"%s\",", framesize);
    p += sprintf(p, "\"stream_port\":\"81\",");
    p += sprintf(p, "\"board\":\"%s\",", CAM_BOARD);
-    p += sprintf(p, "\"model\":\"%s\",", model);
+    p += sprintf(p, "\"model\":\"%s\"", model);
    *p++ = '}';
    *p++ = ',';
 	p += sprintf(p, "\"ip\":\"" IPSTR "\",", IP2STR(&(ip.ip)));
Author	SHA1	Message	Date
me-no-dev	a3814db087	Merge branch 'master' into ov5640-save-button	2020-03-27 13:42:27 +02:00
me-no-dev	d78fddb4fb	Fix missing mdns dependency	2020-03-27 13:39:50 +02:00
me-no-dev	662c5eea06	fix bug in mdns json generator	2020-03-27 10:59:57 +02:00
me-no-dev	a982c7e329	Add mDNS Camera Query	2020-03-27 01:58:36 +02:00
me-no-dev	69d9d66faa	Add MDNS feature that allows the cameras to be found	2020-03-26 15:30:39 +02:00
me-no-dev	cfa42f74fe	Add the missing Save button to the web UI for OV5640	2020-03-12 19:12:43 +02:00