Merge pull request #70 from computerlyrik/uploader-configuration

modularize nodemcu-command, add start_baud parameter
This commit is contained in:
Marcos 2016-12-17 21:40:42 -06:00 committed by GitHub
commit 241de797b0

View File

@ -7,6 +7,8 @@ NODEMCU-UPLOADER=../nodemcu-uploader/nodemcu-uploader.py
PORT=/dev/cu.SLAB_USBtoUART
SPEED=9600
NODEMCU-COMMAND=$(NODEMCU-UPLOADER) -b $(SPEED) --start_baud $(SPEED) -p $(PORT) upload
######################################################################
# End of user config
######################################################################
@ -33,17 +35,17 @@ usage:
# Upload one files only
upload:
@python $(NODEMCU-UPLOADER) -b $(SPEED) -p $(PORT) upload $(FILE)
@python $(NODEMCU-COMMAND) $(FILE)
# Upload HTTP files only
upload_http: $(HTTP_FILES)
@python $(NODEMCU-UPLOADER) -b $(SPEED) -p $(PORT) upload $(foreach f, $^, $(f))
@python $(NODEMCU-COMMAND) $(foreach f, $^, $(f))
# Upload httpserver lua files (init and server module)
upload_server: $(LUA_FILES)
@python $(NODEMCU-UPLOADER) -b $(SPEED) -p $(PORT) upload $(foreach f, $^, $(f))
@python $(NODEMCU-COMMAND) $(foreach f, $^, $(f))
# Upload all
upload_all: $(LUA_FILES) $(HTTP_FILES)
@python $(NODEMCU-UPLOADER) -b $(SPEED) -p $(PORT) upload $(foreach f, $^, $(f))
@python $(NODEMCU-COMMAND) $(foreach f, $^, $(f))