stv0g/libwebsockets
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

esp32: allow no factory upload info

Browse source
This commit is contained in:
Andy Green 2017-04-04 08:46:51 +08:00
parent 34822f190d
commit d1dda25c6d
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
plugins/protocol_esp32_lws_scan.c
View file

@ -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 */
}

8
scripts/esp32.mk
View file

@ -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 ;\