From d1dda25c6dd74fb404732cf565284593764f1c97 Mon Sep 17 00:00:00 2001
From: Andy Green <andy@warmcat.com>
Date: Tue, 4 Apr 2017 08:46:51 +0800
Subject: [PATCH] esp32: allow no factory upload info

---
 plugins/protocol_esp32_lws_scan.c | 4 +++-
 scripts/esp32.mk                  | 8 +++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/plugins/protocol_esp32_lws_scan.c b/plugins/protocol_esp32_lws_scan.c
index d463040..51c808c 100644
--- a/plugins/protocol_esp32_lws_scan.c
+++ b/plugins/protocol_esp32_lws_scan.c
@@ -173,6 +173,8 @@ static void reboot_timer_cb(TimerHandle_t t)
 static int
 client_connection(struct per_vhost_data__esplws_scan *vhd, const char *file)
 {
+#if CONFIG_LWS_IS_FACTORY_APPLICATION == 'y' && defined(CONFIG_LWS_OTA_SERVER_BASE_URL) &&
+    defined(CONFIG_LWS_OTA_SERVER_FQDN)
 	static struct lws_client_connect_info i;
 	char path[256];
 
@@ -199,7 +201,7 @@ client_connection(struct per_vhost_data__esplws_scan *vhd, const char *file)
 		lwsl_notice("NULL return\n");
 		return 1; /* fail */
 	}
-
+#endif
 	return 0; /* ongoing */
 }
 
diff --git a/scripts/esp32.mk b/scripts/esp32.mk
index 03a79cc..e2423ae 100644
--- a/scripts/esp32.mk
+++ b/scripts/esp32.mk
@@ -8,6 +8,12 @@
 
 jbi=$(COMPONENT_PATH)/../build/json-buildinfo
 
+FAC=$(CONFIG_LWS_IS_FACTORY_APPLICATION)
+ifeq ($(FAC),)
+	FAC=0
+endif
+export FAC
+
 .PHONY: romfs.img
 pack.img:
 	DIRNAME=$$(basename $$(pwd) | tr -d '\n') ;\
@@ -36,7 +42,7 @@ pack.img:
 	echo -n -e "\",\r\n \"unixtime\": \"" >> $(jbi) ;\
 	echo -n $$UNIXTIME >> $(jbi) ;\
 	echo -n -e "\",\r\n \"file\": \""$$DIRNAME-$$UNIXTIME.bin >> $(jbi) ;\
-	echo -n -e "\",\r\n \"factory\": \"$(LWS_IS_FACTORY_APPLICATION)" >> $(jbi) ;\
+	echo -n -e "\",\r\n \"factory\": \"$(FAC)" >> $(jbi) ;\
 	echo -n -e "\"\r\n}"  >> $(jbi) ;\
 	JLEN=$$(stat -c %s $(jbi)) ;\
 	printf %02x $$(( $$JLEN % 256 )) | xxd -r -p >> $(COMPONENT_PATH)/../build/$$DIRNAME.bin ;\
-- 
2.7.4