Browse Source

Changed upload to upload_all which is more clear. You can now use make upload to upload a specific file

Marcos Kirsch 9 years ago
parent
commit
3125f997f7
1 changed files with 13 additions and 7 deletions
  1. 13 7
      Makefile

+ 13 - 7
Makefile

@@ -2,10 +2,10 @@
 # User configuration
 ######################################################################
 # Path to nodemcu-uploader (https://github.com/kmpm/nodemcu-uploader)
-NODEMCU-UPLOADER=nodemcu-uploader.py
+NODEMCU-UPLOADER=../nodemcu-uploader/nodemcu-uploader.py
 # Serial port
-PORT=/dev/ttyUSB0
-SPEED=460800
+PORT=/dev/cu.usbserial-A602HRAZ
+SPEED=9600
 
 ######################################################################
 # End of user config
@@ -15,9 +15,15 @@ LUA_FILES := init.lua httpserver.lua httpserver-request.lua httpserver-static.lu
 
 # 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"
+	@echo "make upload FILE:=<file>  to upload a specific file (i.e make upload FILE:=init.lua)"
+	@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:
+	@$(NODEMCU-UPLOADER) -b $(SPEED) -p $(PORT) upload $(FILE)
 
 # Upload HTTP files only
 upload_http: $(HTTP_FILES)
@@ -28,6 +34,6 @@ upload_server: $(LUA_FILES)
 	@$(NODEMCU-UPLOADER) -b $(SPEED) -p $(PORT) upload $(foreach f, $^, $(f))
 
 # Upload all
-upload: $(LUA_FILES) $(HTTP_FILES)
+upload_all: $(LUA_FILES) $(HTTP_FILES)
 	@$(NODEMCU-UPLOADER) -b $(SPEED) -p $(PORT) upload $(foreach f, $^, $(f))