|
@@ -1,3 +1,4 @@
|
|
|
+<<<<<<< HEAD:Makefile
|
|
|
######################################################################
|
|
|
# User configuration
|
|
|
######################################################################
|
|
@@ -34,3 +35,39 @@ upload: $(LUA_FILES) $(HTTP_FILES)
|
|
|
#test
|
|
|
test: $(LUA_FILES) $(HTTP_FILES)
|
|
|
echo -b $(SPEED) -p $(PORT) upload $(foreach f, $^, -f $(f) -d $(f))
|
|
|
+=======
|
|
|
+######################################################################
|
|
|
+# User configuration
|
|
|
+######################################################################
|
|
|
+# Path to nodemcu-uploader (https://github.com/kmpm/nodemcu-uploader)
|
|
|
+NODEMCU-UPLOADER=../nodemcu-uploader/nodemcu-uploader.py
|
|
|
+# Serial port
|
|
|
+PORT=/dev/cu.usbserial-A602HRAZ
|
|
|
+# Bauds for the serial connection
|
|
|
+SPEED=115200
|
|
|
+
|
|
|
+######################################################################
|
|
|
+# End of user config
|
|
|
+######################################################################
|
|
|
+HTTP_FILES := $(wildcard http/*)
|
|
|
+LUA_FILES := init.lua httpserver.lua httpserver-request.lua httpserver-static.lua httpserver-error.lua
|
|
|
+
|
|
|
+# Print usage
|
|
|
+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 to upload all"
|
|
|
+
|
|
|
+# Upload HTTP files only
|
|
|
+upload_http: $(HTTP_FILES)
|
|
|
+ @$(NODEMCU-UPLOADER) -b $(SPEED) -p $(PORT) upload $(foreach f, $^, $(f))
|
|
|
+
|
|
|
+# Upload httpserver lua files (init and server module)
|
|
|
+upload_server: $(LUA_FILES)
|
|
|
+ @$(NODEMCU-UPLOADER) -b $(SPEED) -p $(PORT) upload $(foreach f, $^, $(f))
|
|
|
+
|
|
|
+# Upload all
|
|
|
+upload: $(LUA_FILES) $(HTTP_FILES)
|
|
|
+ @$(NODEMCU-UPLOADER) -b $(SPEED) -p $(PORT) upload $(foreach f, $^, $(f))
|
|
|
+
|
|
|
+>>>>>>> 2357415466bb24cba8ee33109146f6a6a2df0282:makefile
|