Skip to content

Commit a631269

Browse files
committed
Update readme and fix tool paths
1 parent 90fc4f9 commit a631269

File tree

3 files changed

+35
-10
lines changed

3 files changed

+35
-10
lines changed

README.md

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,19 +27,29 @@ Boards manager link: `http://arduino.esp8266.com/staging/package_esp8266com_inde
2727
Documentation: [Reference](http://arduino.esp8266.com/staging/doc/reference.html)
2828

2929

30-
### Building latest version from source [![Linux build status](https://travis-ci.org/esp8266/Arduino.svg)](https://travis-ci.org/esp8266/Arduino)
31-
30+
### Using git version [![Linux build status](https://travis-ci.org/esp8266/Arduino.svg)](https://travis-ci.org/esp8266/Arduino)
31+
32+
- Install Arduino 1.6.5
33+
- Go to Arduino directory
34+
- Clone this repository into hardware/esp8266com/esp8266 directory (or clone it elsewhere and create a symlink)
35+
```bash
36+
cd hardware
37+
mkdir esp8266com
38+
cd esp8266com
39+
git clone https://github.com/esp8266/Arduino.git esp8266
3240
```
33-
$ git clone https://github.com/esp8266/Arduino.git
34-
$ cd Arduino/build
35-
$ ant dist
41+
- Download binary tools (you need Python 2.7)
42+
```bash
43+
cd esp8266/tools
44+
python get.py
3645
```
46+
- Restart Arduino
3747

3848
Documentation for latest development version:
3949

40-
- [Reference](hardware/esp8266com/esp8266/doc/reference.md)
41-
- [Supported boards](hardware/esp8266com/esp8266/doc/boards.md)
42-
- [Change log](hardware/esp8266com/esp8266/doc/changes.md)
50+
- [Reference](doc/reference.md)
51+
- [Supported boards](doc/boards.md)
52+
- [Change log](doc/changes.md)
4353

4454
### Issues and support ###
4555

platform.txt

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ name=ESP8266 Modules
99
version=1.6.4
1010

1111
runtime.tools.xtensa-lx106-elf-gcc.path={runtime.platform.path}/tools/xtensa-lx106-elf
12-
runtime.tools.esptool.path={runtime.platform.path}/tools
12+
runtime.tools.esptool.path={runtime.platform.path}/tools/esptool
1313

1414
compiler.path={runtime.tools.xtensa-lx106-elf-gcc.path}/bin/
1515
compiler.sdk.path={runtime.platform.path}/tools/sdk
@@ -91,7 +91,13 @@ recipe.size.regex.data=^(?:\.data|\.rodata|\.bss)\s+([0-9]+).*
9191

9292
tools.esptool.cmd=esptool
9393
tools.esptool.cmd.windows=esptool.exe
94-
tools.esptool.path={runtime.platform.path}/tools
94+
tools.esptool.path={runtime.platform.path}/tools/esptool
95+
#runtime.tools.esptool.path
96+
97+
tools.mkspiffs.cmd=mkspiffs
98+
tools.mkspiffs.cmd.windows=mkspiffs.exe
99+
tools.mkspiffs.path={runtime.platform.path}/tools/mkspiffs
100+
#runtime.tools.mkspiffs.path
95101

96102
tools.esptool.upload.protocol=esp
97103
tools.esptool.upload.params.verbose=-vv

tools/get.py

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
from __future__ import print_function
77
import urllib
88
import os
9+
import errno
910
import os.path
1011
import hashlib
1112
import json
@@ -24,6 +25,13 @@ def sha256sum(filename, blocksize=65536):
2425
hash.update(block)
2526
return hash.hexdigest()
2627

28+
def mkdir_p(path):
29+
try:
30+
os.makedirs(path)
31+
except OSError as exc:
32+
if exc.errno != errno.EEXIST or not os.path.isdir(path):
33+
raise
34+
2735
def report_progress(count, blockSize, totalSize):
2836
percent = int(count*blockSize*100/totalSize)
2937
percent = min(100, percent)
@@ -90,5 +98,6 @@ def identify_platform():
9098
if __name__ == '__main__':
9199
print('Platform: {0}'.format(identify_platform()))
92100
tools_to_download = load_tools_list('tools.json', identify_platform())
101+
mkdir_p(dist_dir)
93102
for tool in tools_to_download:
94103
get_tool(tool)

0 commit comments

Comments
 (0)