Merge branch 'master' of https://github.com/parallaxinc/Parallax-ESP

Author: dbetz

Makefile.ota

@@ -44,7 +44,7 @@ $(3): $(1)
 	$$(Q) cd build; COMPILE=gcc PATH=$$(XTENSA_TOOLS_ROOT):$$(PATH) python $$(APPGEN) $(1:build/%=%) 2 $$(ESP_FLASH_MODE) $$(ESP_FLASH_FREQ_DIV) $$(ESP_FLASH_SIZE_IX) $(4)
 	$$(Q) rm -f eagle.app.v6.*.bin
 	$$(Q) mv build/eagle.app.flash.bin $$@
-	@echo "** user1.bin uses $$$$(stat -c '%s' $$@) bytes of" $$(ESP_FLASH_MAX) "available"
+	@echo "** "$$@ " uses $$$$(stat -c '%s' $$@) bytes of" $$(ESP_FLASH_MAX) "available"
 endef
 
 $(eval $(call genappbin,$(TARGET_OUT_USR1),$$(LD_SCRIPT_USR1),$$(TARGET_BIN_USR1),1))

README.md

@@ -38,12 +38,6 @@ Check out the submodules of Parallax-ESP:
     git submodule init
     git submodule update
 
-Check out the correct ESP SDK version:
-
-    cd ESP8266_NONOS_SDK
-    git checkout v2.2.1
-    cd ..
-
 Build the firmware (from the Parallax-ESP directory) for Parallax WX Module:
 
     make

release/Makefile

@@ -10,7 +10,8 @@ release/Parallax-ESP.ota \
 release/blank.bin \
 release/esp_init_data_default_v08.bin
 
-IMAGES+=release/boot_v1.6.bin
+BOOTBIN=boot_v1.7.bin
+IMAGES+=release/$(BOOTBIN)
 
 CP=cp
 
@@ -32,7 +33,7 @@ staged-files:	release release/release-notes.txt $(IMAGES)
 release/release-notes.txt:	release-notes.txt
 	$(CP) release-notes.txt release
 
-release/boot_v1.%.bin:	$(SDK)/bin/boot_v1.%.bin patch
+release/$(BOOTBIN):	$(SDK)/bin/$(BOOTBIN) patch
 	./patch $< $@ 2M
 
 release/%:	../build/%