Skip to content

Fix ota when password is empty. #113

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
plerup merged 2 commits into from
Jun 9, 2019
Merged

Fix ota when password is empty. #113

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
52bfa81
Fix `ota` when password is empty.
reitermarkus Feb 24, 2019
e8b35e1
Let `espota.py` use its own defaults.
reitermarkus Feb 24, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 15 additions & 6 deletions makeEspArduino.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,18 @@ UPLOAD_VERB ?= -v

# OTA parameters
ESP_ADDR ?= ESP_123456
ESP_PORT ?= 8266
ESP_PWD ?= 123
ESP_PORT ?=
ESP_PWD ?=

OTA_ARGS = --progress --ip="$(ESP_ADDR)"

ifneq ($(ESP_PORT),)
OTA_ARGS += --port="$(ESP_PORT)"
endif

ifneq ($(ESP_PWD),)
OTA_ARGS += --auth="$(ESP_PWD)"
endif

# HTTP update parameters
HTTP_ADDR ?= ESP_123456
Expand Down Expand Up @@ -155,7 +165,7 @@ DEP_EXT = .d
ARDUINO_MK = $(BUILD_DIR)/arduino.mk

# Special tool definitions
OTA_TOOL ?= $(TOOLS_ROOT)/espota.py
OTA_TOOL ?= python $(TOOLS_ROOT)/espota.py
HTTP_TOOL ?= curl

# Core source files
Expand Down Expand Up @@ -184,7 +194,6 @@ ifeq ($(LIBS),)
LIBS += $(EX_LIB)
endif
endif

endif

IGNORE_PATTERN := $(foreach dir,$(EXCLUDE_DIRS),$(dir)/%)
Expand Down Expand Up @@ -294,7 +303,7 @@ upload flash: all
$(UPLOAD_COM)

ota: all
$(OTA_TOOL) -r -i $(ESP_ADDR) -p $(ESP_PORT) -a $(ESP_PWD) -f $(MAIN_EXE)
$(OTA_TOOL) $(OTA_ARGS) --file="$(MAIN_EXE)"

http: all
$(HTTP_TOOL) --verbose -F image=@$(MAIN_EXE) --user $(HTTP_USR):$(HTTP_PWD) http://$(HTTP_ADDR)$(HTTP_URI)
Expand All @@ -310,7 +319,7 @@ upload_fs flash_fs: $(FS_IMAGE)
$(FS_UPLOAD_COM)

ota_fs: $(FS_IMAGE)
$(OTA_TOOL) -r -i $(ESP_ADDR) -p $(ESP_PORT) -a $(ESP_PWD) -s -f $(FS_IMAGE)
$(OTA_TOOL) $(OTA_ARGS) --spiffs --file="$(FS_IMAGE)"

run: flash
python -m serial.tools.miniterm --rts=0 --dtr=0 $(UPLOAD_PORT) 115200
Expand Down