|
@@ -3,18 +3,24 @@
|
|
|
######################################################################
|
|
|
|
|
|
# Path to nodemcu-uploader (https://github.com/kmpm/nodemcu-uploader)
|
|
|
-NODEMCU-UPLOADER=../nodemcu-uploader/nodemcu-uploader.py
|
|
|
+NODEMCU-UPLOADER?=python ../nodemcu-uploader/nodemcu-uploader.py
|
|
|
|
|
|
# Serial port
|
|
|
-PORT=/dev/cu.SLAB_USBtoUART
|
|
|
-SPEED=115200
|
|
|
+PORT?=/dev/cu.SLAB_USBtoUART
|
|
|
+SPEED?=115200
|
|
|
|
|
|
-NODEMCU-COMMAND=$(NODEMCU-UPLOADER) -b $(SPEED) --start_baud $(SPEED) -p $(PORT) upload
|
|
|
+define _upload
|
|
|
+@$(NODEMCU-UPLOADER) -b $(SPEED) --start_baud $(SPEED) -p $(PORT) upload $^
|
|
|
+endef
|
|
|
|
|
|
######################################################################
|
|
|
|
|
|
+LFS_IMAGE ?= lfs.img
|
|
|
HTTP_FILES := $(wildcard http/*)
|
|
|
-LUA_FILES := $(wildcard *.lua)
|
|
|
+WIFI_CONFIG := $(wildcard *conf*.lua)
|
|
|
+SERVER_FILES := $(filter-out $(WIFI_CONFIG), $(wildcard srv/*.lua) $(wildcard *.lua))
|
|
|
+LFS_FILES := $(LFS_IMAGE) $(filter-out $(WIFI_CONFIG), $(wildcard *.lua))
|
|
|
+FILE ?=
|
|
|
|
|
|
# Print usage
|
|
|
usage:
|
|
@@ -22,21 +28,39 @@ usage:
|
|
|
@echo "make upload_http to upload files to be served"
|
|
|
@echo "make upload_server to upload the server code and init.lua"
|
|
|
@echo "make upload_all to upload all"
|
|
|
- @echo $(TEST)
|
|
|
|
|
|
# Upload one files only
|
|
|
-upload:
|
|
|
- @python $(NODEMCU-COMMAND) $(FILE)
|
|
|
+upload: $(FILE)
|
|
|
+ $(_upload)
|
|
|
|
|
|
# Upload HTTP files only
|
|
|
upload_http: $(HTTP_FILES)
|
|
|
- @python $(NODEMCU-COMMAND) $(foreach f, $^, $(f))
|
|
|
+ $(_upload)
|
|
|
|
|
|
-# Upload httpserver lua files (init and server module)
|
|
|
-upload_server: $(LUA_FILES)
|
|
|
- @python $(NODEMCU-COMMAND) $(foreach f, $^, $(f))
|
|
|
+# Upload httpserver lua files
|
|
|
+upload_server: $(SERVER_FILES)
|
|
|
+ $(_upload)
|
|
|
|
|
|
-# Upload all
|
|
|
-upload_all: $(LUA_FILES) $(HTTP_FILES)
|
|
|
- @python $(NODEMCU-COMMAND) $(foreach f, $^, $(f))
|
|
|
+# Upload wifi configuration
|
|
|
+upload_wifi_config: $(WIFI_CONFIG)
|
|
|
+ $(_upload)
|
|
|
|
|
|
+# Upload lfs image
|
|
|
+upload_lfs: $(LFS_FILES)
|
|
|
+ $(_upload)
|
|
|
+
|
|
|
+# Throw error if lfs file not found
|
|
|
+$(LFS_IMAGE):
|
|
|
+ $(error File $(LFS_IMAGE) not found)
|
|
|
+
|
|
|
+# Upload all non-lfs files
|
|
|
+upload_all: $(HTTP_FILES) $(SERVER_FILES) $(WIFI_CONFIG)
|
|
|
+ $(_upload)
|
|
|
+
|
|
|
+# Upload all lfs files
|
|
|
+upload_all_lfs: $(HTTP_FILES) $(LFS_FILES) $(WIFI_CONFIG)
|
|
|
+ $(_upload)
|
|
|
+
|
|
|
+.ENTRY: usage
|
|
|
+.PHONY: usage upload_http upload_server upload_wifi_config \
|
|
|
+upload_lfs upload_all upload_all_lfs
|