diff --git a/bouffalo.mk b/bouffalo.mk index c3c071464..6e7f27659 100644 --- a/bouffalo.mk +++ b/bouffalo.mk @@ -1,10 +1,10 @@ # Component Makefile # ## These include paths would be exported to project level -COMPONENT_ADD_INCLUDEDIRS += src/ src/httpserver/ src/cmnds/ src/logging/ src/hal/bl602/ src/mqtt/ +COMPONENT_ADD_INCLUDEDIRS += src/ src/httpserver/ src/cmnds/ src/logging/ src/hal/bl602/ src/mqtt/ src/cJSON ## not be exported to project level -COMPONENT_PRIV_INCLUDEDIRS := +COMPONENT_PRIV_INCLUDEDIRS := ## This component's src @@ -14,7 +14,7 @@ COMPONENT_SRCS := COMPONENT_OBJS := $(patsubst %.c,%.o, $(COMPONENT_SRCS)) COMPONENT_OBJS := $(patsubst %.S,%.o, $(COMPONENT_OBJS)) -COMPONENT_SRCDIRS := src/ src/httpserver/ src/cmnds/ src/logging/ src/hal/bl602/ src/mqtt/ +COMPONENT_SRCDIRS := src/ src/httpserver/ src/cmnds/ src/logging/ src/hal/bl602/ src/mqtt/ src/cJSON diff --git a/src/httpserver/hass.c b/src/httpserver/hass.c index af3ccb3fa..cafdeaaa8 100644 --- a/src/httpserver/hass.c +++ b/src/httpserver/hass.c @@ -68,7 +68,11 @@ cJSON *hass_build_device_node(const char *baseName, cJSON *ids) { cJSON *dev = cJSON_CreateObject(); cJSON_AddItemToObject(dev, "ids", ids); //identifiers cJSON_AddStringToObject(dev, "name", baseName); + + #ifdef USER_SW_VER cJSON_AddStringToObject(dev, "sw", USER_SW_VER); //sw_version + #endif + cJSON_AddStringToObject(dev, "mf", MANUFACTURER); //manufacturer cJSON_AddStringToObject(dev, "mdl", PLATFORM_MCU_NAME); //Using chipset for model return dev;