esp8266 v2.5.0 with boards manager

jscrane · May 28, 2019 · f284324 · f284324
1 parent 26e437e
commit f284324
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/arduino-esp8266.mk b/arduino-esp8266.mk
@@ -1,11 +1,13 @@
-
 IDE_HOME ?= /usr/local/arduino
 SKETCHBOOK ?= $(HOME)/sketchbook
 UPLOAD_PORT ?= /dev/ttyUSB0
+PLATFORM_VERSION ?= 2.5.0
+
 PROCESSOR_FAMILY := esp8266
 PLATFORM := esp8266com
+PLATFORM_PACKAGE := $(HOME)/.arduino15/packages/$(PROCESSOR_FAMILY)
 PLATFORM_HEADER := Arduino.h
-HARDWARE_FAMILY := $(SKETCHBOOK)/hardware/$(PLATFORM)/$(PROCESSOR_FAMILY)
+HARDWARE_FAMILY := $(PLATFORM_PACKAGE)/hardware/$(PROCESSOR_FAMILY)/$(PLATFORM_VERSION)
 CORE := $(HARDWARE_FAMILY)/cores/$(PROCESSOR_FAMILY)
 CPPFLAGS += -DARDUINO=10805
 SKETCH_PRE = $(BUILD_DIR)/local.eagle.app.v6.common.ld

diff --git a/esp8266.mk b/esp8266.mk
@@ -1,7 +1,8 @@
 COMPILER_FAMILY := xtensa-lx106-elf
-TOOL_DIR := $(HARDWARE_FAMILY)/tools
-TOOLS := $(TOOL_DIR)/$(COMPILER_FAMILY)
-PATH := $(PATH):$(TOOL_DIR)/esptool:$(TOOL_DIR)/mkspiffs
+TOOL_VERSION ?= 2.5.0-3-20ed2b9
+TOOL_DIR := $(PLATFORM_PACKAGE)/tools
+PATH := $(PATH):$(TOOL_DIR)/esptool/$(TOOL_VERSION):$(TOOL_DIR)/mkspiffs/$(TOOL_VERSION)
+TOOLS := $(TOOL_DIR)/$(COMPILER_FAMILY)-gcc/$(TOOL_VERSION)
 
 SDK := $(HARDWARE_FAMILY)/tools/sdk
 BUILD_BOARD != sed -ne "s/$(BOARD).build.board=\(.*\)/\1/p" $(BOARDS)