Skip to content

Commit b0bfa9b

Browse files
committed
Merge branch 'release/v1.7.0'
2 parents 41a0bee + 428659a commit b0bfa9b

File tree

11 files changed

+38
-26
lines changed

11 files changed

+38
-26
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
*.pyc
2+
.pioenvs

README.md

Lines changed: 21 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,27 @@ Espressif Systems is a privately held fabless semiconductor company. They provid
99

1010
# Usage
1111

12-
1. [Install PlatformIO Core](http://docs.platformio.org/page/core.html)
13-
2. Install Espressif 8266 development platform:
14-
```bash
15-
# install the latest stable version
16-
> platformio platform install espressif8266
17-
18-
# install development version
19-
> platformio platform install https://github.com/platformio/platform-espressif8266.git
12+
1. [Install PlatformIO](http://platformio.org)
13+
2. Create PlatformIO project and configure a platform option in [platformio.ini](http://docs.platformio.org/page/projectconf.html) file:
14+
15+
## Stable version
16+
17+
```ini
18+
[env:stable]
19+
platform = espressif8266
20+
board = ...
21+
...
22+
```
23+
24+
## Development version
25+
26+
```ini
27+
[env:development]
28+
platform = https://github.com/platformio/platform-espressif8266.git
29+
board = ...
30+
...
2031
```
2132

22-
# Using "Staging" Arduino Core
33+
# Configuration
2334

24-
http://docs.platformio.org/page/platforms/espressif8266.html#using-arduino-framework-with-staging-version
35+
Please navigate to [documentation](http://docs.platformio.org/page/platforms/espressif8266.html).

boards/d1_mini.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"maximum_size": 4194304,
2424
"require_upload_port": true,
2525
"resetmethod": "nodemcu",
26-
"speed": 115200
26+
"speed": 921600
2727
},
2828
"url": "https://wiki.wemos.cc/products:d1:d1_mini",
2929
"vendor": "WEMOS"

boards/d1_mini_lite.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"maximum_size": 1048576,
2222
"require_upload_port": true,
2323
"resetmethod": "nodemcu",
24-
"speed": 115200
24+
"speed": 921600
2525
},
2626
"url": "https://wiki.wemos.cc/products:d1:d1_mini_lite",
2727
"vendor": "WEMOS"

boards/d1_mini_pro.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"maximum_size": 16777216,
2424
"require_upload_port": true,
2525
"resetmethod": "nodemcu",
26-
"speed": 115200
26+
"speed": 921600
2727
},
2828
"url": "https://wiki.wemos.cc/products:d1:d1_mini",
2929
"vendor": "WEMOS"

boards/esp210.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"maximum_size": 4194304,
2424
"require_upload_port": true,
2525
"resetmethod": "ck",
26-
"speed": 115200
26+
"speed": 57600
2727
},
2828
"url": "http://wiki.sweetpeas.se/index.php?title=ESP-210",
2929
"vendor": "SweetPea"

boards/oak.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"maximum_size": 4194304,
2222
"require_upload_port": true,
2323
"resetmethod": "ck",
24-
"speed": 115200
24+
"speed": 921600
2525
},
2626
"url": "http://digistump.com/category/22",
2727
"vendor": "DigiStump"

builder/frameworks/esp8266-nonos-sdk.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,7 @@
6666

6767
libs = []
6868

69-
envsafe = env.Clone()
70-
71-
libs.append(envsafe.BuildLibrary(
69+
libs.append(env.BuildLibrary(
7270
join(FRAMEWORK_DIR, "lib", "driver"),
7371
join(FRAMEWORK_DIR, "driver_lib")
7472
))

builder/frameworks/esp8266-rtos-sdk.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,9 +68,7 @@
6868

6969
libs = []
7070

71-
envsafe = env.Clone()
72-
73-
libs.append(envsafe.BuildLibrary(
71+
libs.append(env.BuildLibrary(
7472
join(FRAMEWORK_DIR, "lib", "driver"),
7573
join(FRAMEWORK_DIR, "driver_lib")
7674
))

builder/main.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -189,9 +189,12 @@ def fetch_spiffs_size(env):
189189
_value = 0
190190
if int(env[k], 16) < 0x40300000:
191191
_value = int(env[k], 16) & 0xFFFFF
192+
elif int(env[k], 16) < 0x411FB000:
193+
_value = int(env[k], 16) & 0xFFFFFF
194+
_value -= 0x200000 # correction
192195
else:
193196
_value = int(env[k], 16) & 0xFFFFFF
194-
_value -= 0x200000 # esptool offset
197+
_value += 0xE00000 # correction
195198

196199
env[k] = hex(_value)
197200

@@ -370,7 +373,8 @@ def __fetch_spiffs_size(target, source, env):
370373
AlwaysBuild(env.Alias("buildfs", target_firm))
371374
else:
372375
if env.subst("$PIOFRAMEWORK") in ("arduino", "simba"):
373-
target_firm = env.ElfToBin(target_elf)
376+
target_firm = env.ElfToBin(
377+
join("$BUILD_DIR", "${PROGNAME}"), target_elf)
374378
else:
375379
target_firm = env.ElfToBin([
376380
join("$BUILD_DIR", "eagle.flash.bin"),

0 commit comments

Comments
 (0)