Fix build for ESP person detector example (#2)

Author: fredrec

tensorflow/lite/micro/examples/person_detection/esp/Makefile.inc

@@ -5,11 +5,27 @@ tensorflow/lite/micro/examples/person_detection/esp/app_camera_esp.c
 ESP_PERSON_DETECTION_HDRS := \
 tensorflow/lite/micro/examples/person_detection/esp/app_camera_esp.h
 
-CCFLAGS += -Wno-nonnull
-CXXFLAGS += -Wno-return-type -Wno-strict-aliasing
 person_detection_SRCS += $(ESP_PERSON_DETECTION_SRCS)
 person_detection_HDRS += $(ESP_PERSON_DETECTION_HDRS)
 MAIN_SRCS += $(ESP_PERSON_DETECTION_SRCS)
-GRAYSCALE_SRCS := tensorflow/lite/micro/tools/make/downloads/person_model_grayscale/person_detect_model_data.cc
-person_detection_SRCS := $(filter-out $(GRAYSCALE_SRCS), $(person_detection_SRCS))
-MICROLITE_CC_SRCS += $(GRAYSCALE_SRCS)
+
+# ESP specific flags and files
+CCFLAGS += -Wno-nonnull
+CXXFLAGS += -Wno-return-type -Wno-strict-aliasing
+ESP_PROJECT_FILES += \
+  sdkconfig.defaults \
+  main/Kconfig.projbuild
+
+# Remap downloaded model files as if they were in tensorflow/lite/micro/examples/..
+MODEL_DOWNLOADS_DIR := tensorflow/lite/micro/tools/make/downloads/person_model_grayscale
+MODEL_EXAMPLES_DIR := tensorflow/lite/micro/examples/person_detection/person_model_grayscale
+person_detection_SRCS := $(patsubst $(MODEL_DOWNLOADS_DIR)/%,$(MODEL_EXAMPLES_DIR)/%,$(person_detection_SRCS))
+
+# Custom rule to transform downloaded model files
+$(PRJDIR)person_detection/esp-idf/main/person_model_grayscale/%: $(MODEL_DOWNLOADS_DIR)/%
+	@mkdir -p $(dir $@)
+	@python tensorflow/lite/micro/tools/make/transform_source.py \
+        --platform=esp \
+        --is_example_source \
+        --source_path="$(patsubst $(MODEL_DOWNLOADS_DIR)/%,$(MODEL_EXAMPLES_DIR)/%,$<)" \
+        < $< > $@

tensorflow/lite/micro/examples/person_detection/esp/Kconfig.projbuild renamed to tensorflow/lite/micro/examples/person_detection/esp/main/Kconfig.projbuild

@@ -293,6 +293,10 @@ $(PRJDIR)$(2)/esp-idf/LICENSE: LICENSE
 	@mkdir -p $$(dir $$@)
 	@cp $$< $$@
 
+$(PRJDIR)$(2)/esp-idf/%: tensorflow/lite/micro/examples/$(2)/esp/%
+	@mkdir -p $$(dir $$@)
+	@cp $$< $$@
+
 $(PRJDIR)$(2)/esp-idf/main/%.cc: tensorflow/lite/micro/examples/$(2)/%.cc
 	@mkdir -p $$(dir $$@)
 	@python tensorflow/lite/micro/tools/make/transform_source.py \
@@ -309,6 +313,14 @@ $(PRJDIR)$(2)/esp-idf/main/%.h: tensorflow/lite/micro/examples/$(2)/%.h
         --source_path="$$<" \
         < $$< > $$@
 
+$(PRJDIR)$(2)/esp-idf/main/%.h: tensorflow/lite/micro/examples/$(2)/%.h
+	@mkdir -p $$(dir $$@)
+	@python tensorflow/lite/micro/tools/make/transform_source.py \
+        --platform=esp \
+        --is_example_source \
+        --source_path="$$<" \
+        < $$< > $$@
+
 $(PRJDIR)$(2)/esp-idf/main/%: tensorflow/lite/micro/examples/$(2)/%
 	@mkdir -p $$(dir $$@)
 	@cp $$< $$@