Skip to content

Commit 4c26729

Browse files
committed
Merge remote-tracking branch 'remotes/esp8266/esp8266' into esp8266
2 parents 5465eb1 + 90efba0 commit 4c26729

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

boards.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ nodemcuv2.name=NodeMCU 1.0 (ESP-12E Module)
232232

233233
nodemcuv2.upload.tool=esptool
234234
nodemcuv2.upload.speed=115200
235-
nodemcuv2.upload.resetmethod=ck
235+
nodemcuv2.upload.resetmethod=nodemcu
236236
nodemcuv2.upload.maximum_size=1044464
237237
nodemcuv2.upload.maximum_data_size=81920
238238
nodemcuv2.upload.wait_for_upload_port=true

doc/changes.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ title: Change log
2323
## 1.6.5-947-g39819f0
2424
July 23, 2015
2525

26+
Package link: `http://arduino.esp8266.com/versions/1.6.5-947-g39819f0/package_esp8266com_index.json`.
27+
2628
### Core
2729

2830
- I2C library updated to better handle repeated start for certain devices,
@@ -69,6 +71,8 @@ July 23, 2015
6971
## 1.6.4-673-g8cd3697
7072
May 22, 2015
7173

74+
Package link: `http://arduino.esp8266.com/versions/1.6.4-673-g8cd3697/package_esp8266com_index.json`.
75+
7276
### Tools
7377

7478
- Add 32-bit Linux toolchain.

0 commit comments

Comments
 (0)