Skip to content

Commit 03c47be

Browse files
ivankravetsivankravets
committed
Merge branch 'release/v1.1.0'
2 parents c0cde35 + 820e3ee commit 03c47be

File tree

21 files changed

+84
-60
lines changed

21 files changed

+84
-60
lines changed

‎README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
Espressif Systems is a privately held fabless semiconductor company. They provide wireless communications and Wi-Fi chips which are widely used in mobile devices and the Internet of Things applications.
66

77
* [Home](http://platformio.org/platforms/espressif8266) (home page in PlatformIO Platform Registry)
8-
* [Documentation](http://docs.platformio.org/en/latest/platforms/espressif8266.html) (advanced usage, packages, boards, frameworks, etc.)
8+
* [Documentation](http://docs.platformio.org/en/stable/platforms/espressif8266.html) (advanced usage, packages, boards, frameworks, etc.)
99

1010
# Usage
1111

12-
1. [Install PlatformIO CLI](http://docs.platformio.org/en/latest/installation.html)
12+
1. [Install PlatformIO CLI](http://docs.platformio.org/en/stable/installation.html)
1313
2. Install Espressif 8266 development platform:
1414
```bash
1515
# install the latest stable version

‎boards/esp_wroom_02.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@
1414
],
1515
"name": "ESP-WROOM-02",
1616
"upload": {
17-
"maximum_ram_size": 51200,
17+
"maximum_ram_size": 81920,
1818
"maximum_size": 4194304,
1919
"require_upload_port": true,
2020
"resetmethod": "nodemcu",
2121
"speed": 115200
2222
},
2323
"url": "http://www.esp8266.com/wiki/doku.php?id=esp8266-module-family",
2424
"vendor": "Espressif"
25-
}
25+
}

‎boards/espectro.json

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
{
2+
"build": {
3+
"core": "esp8266",
4+
"extra_flags": "-DESP8266 -DARDUINO_ARCH_ESP8266 -DARDUINO_ESP8266_ESPECTRO",
5+
"f_cpu": "80000000L",
6+
"f_flash": "40000000L",
7+
"flash_mode": "dio",
8+
"ldscript": "esp8266.flash.4m1m.ld",
9+
"mcu": "esp8266",
10+
"variant": "espectro"
11+
},
12+
"frameworks": [
13+
"arduino"
14+
],
15+
"name": "ESPrectro Core",
16+
"upload": {
17+
"maximum_ram_size": 81920,
18+
"maximum_size": 4194304,
19+
"require_upload_port": true,
20+
"resetmethod": "nodemcu",
21+
"speed": 921600
22+
},
23+
"url": "https://shop.makestro.com/en/product/espectro-core/",
24+
"vendor": "DycodeX"
25+
}

‎boards/sparkfunBlynk.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"name": "SparkFun Blynk Board",
1616
"upload": {
1717
"maximum_ram_size": 81920,
18-
"maximum_size": 1044464,
18+
"maximum_size": 4194304,
1919
"require_upload_port": true,
2020
"resetmethod": "nodemcu",
2121
"speed": 115200

‎builder/main.py

Lines changed: 27 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,6 @@
1414

1515
# pylint: disable=redefined-outer-name
1616

17-
"""
18-
Builder for Espressif MCUs
19-
"""
20-
2117
import re
2218
from os.path import join
2319

@@ -225,9 +221,9 @@ def _fetch_spiffs_size(target, source, env):
225221
ElfToBin=Builder(
226222
action=env.VerboseAction(" ".join([
227223
'"$OBJCOPY"',
228-
"-eo",
229-
'"%s"' % join("$FRAMEWORK_ARDUINOESP8266_DIR",
230-
"bootloaders", "eboot", "eboot.elf"),
224+
"-eo", join(
225+
"$FRAMEWORK_ARDUINOESP8266_DIR", "bootloaders",
226+
"eboot", "eboot.elf"),
231227
"-bo", "$TARGET",
232228
"-bm", "$BOARD_FLASH_MODE",
233229
"-bf", "${__get_board_f_flash(__env__)}",
@@ -311,35 +307,38 @@ def _fetch_spiffs_size(target, source, env):
311307
)
312308

313309
#
314-
# Target: Build executable and linkable firmware
315-
#
316-
317-
target_elf = env.BuildProgram()
318-
319-
#
320-
# Target: Build the .hex or SPIFFS image
310+
# Target: Build executable and linkable firmware or SPIFFS image
321311
#
322312

323-
if set(["uploadfs", "uploadfsota"]) & set(COMMAND_LINE_TARGETS):
324-
target_firm = env.DataToBin(
325-
join("$BUILD_DIR", "spiffs"), "$PROJECTDATA_DIR")
326-
AlwaysBuild(target_firm)
327-
328-
elif "uploadlazy" in COMMAND_LINE_TARGETS:
329-
if "PIOFRAMEWORK" not in env:
313+
target_elf = None
314+
if "nobuild" in COMMAND_LINE_TARGETS:
315+
if set(["uploadfs", "uploadfsota"]) & set(COMMAND_LINE_TARGETS):
316+
target_firm = join("$BUILD_DIR", "spiffs.bin")
317+
elif "PIOFRAMEWORK" not in env:
330318
target_firm = [
331319
join("$BUILD_DIR", "firmware_00000.bin"),
332320
join("$BUILD_DIR", "firmware_40000.bin")
333321
]
334322
else:
335323
target_firm = join("$BUILD_DIR", "firmware.bin")
336324
else:
337-
if "PIOFRAMEWORK" not in env:
338-
target_firm = env.ElfToBin(
339-
[join("$BUILD_DIR", "firmware_00000"),
340-
join("$BUILD_DIR", "firmware_40000")], target_elf)
325+
if set(["buildfs", "uploadfs", "uploadfsota"]) & set(COMMAND_LINE_TARGETS):
326+
target_firm = env.DataToBin(
327+
join("$BUILD_DIR", "spiffs"), "$PROJECTDATA_DIR")
328+
AlwaysBuild(target_firm)
329+
AlwaysBuild(env.Alias("buildfs", target_firm))
341330
else:
342-
target_firm = env.ElfToBin(join("$BUILD_DIR", "firmware"), target_elf)
331+
target_elf = env.BuildProgram()
332+
if "PIOFRAMEWORK" not in env:
333+
target_firm = env.ElfToBin([join("$BUILD_DIR", "firmware_00000"),
334+
join("$BUILD_DIR", "firmware_40000")],
335+
target_elf)
336+
else:
337+
target_firm = env.ElfToBin(
338+
join("$BUILD_DIR", "firmware"), target_elf)
339+
target_buildprog = env.Alias("buildprog", target_firm)
340+
341+
AlwaysBuild(env.Alias("nobuild", target_firm))
343342

344343
#
345344
# Target: Print binary size
@@ -355,7 +354,7 @@ def _fetch_spiffs_size(target, source, env):
355354
#
356355

357356
target_upload = env.Alias(
358-
["upload", "uploadlazy", "uploadfs"], target_firm,
357+
["upload", "uploadfs"], target_firm,
359358
[env.VerboseAction(env.AutodetectUploadPort, "Looking for upload port..."),
360359
env.VerboseAction("$UPLOADCMD", "Uploading $SOURCE")])
361360
env.AlwaysBuild(target_upload)
@@ -365,4 +364,4 @@ def _fetch_spiffs_size(target, source, env):
365364
# Default targets
366365
#
367366

368-
Default([target_firm, target_size])
367+
Default([target_buildprog, target_size])

‎examples/arduino-blink/.travis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
# Continuous Integration (CI) is the practice, in software
22
# engineering, of merging all developer working copies with a shared mainline
3-
# several times a day < http://docs.platformio.org/en/latest/ci/index.html >
3+
# several times a day < http://docs.platformio.org/en/stable/ci/index.html >
44
#
55
# Documentation:
66
#
77
# * Travis CI Embedded Builds with PlatformIO
88
# < https://docs.travis-ci.com/user/integration/platformio/ >
99
#
1010
# * PlatformIO integration with Travis CI
11-
# < http://docs.platformio.org/en/latest/ci/travis.html >
11+
# < http://docs.platformio.org/en/stable/ci/travis.html >
1212
#
1313
# * User Guide for `platformio ci` command
14-
# < http://docs.platformio.org/en/latest/userguide/cmd_ci.html >
14+
# < http://docs.platformio.org/en/stable/userguide/cmd_ci.html >
1515
#
1616
#
1717
# Please choose one of the following templates (proposed below) and uncomment

‎examples/arduino-blink/README.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
How to build PlatformIO based project
1313
=====================================
1414

15-
1. `Install PlatformIO <http://docs.platformio.org/en/latest/installation.html>`_
15+
1. `Install PlatformIO <http://docs.platformio.org/en/stable/installation.html>`_
1616
2. Download `development platform with examples <https://github.com/platformio/platform-espressif8266/archive/develop.zip>`_
1717
3. Extract ZIP archive
1818
4. Run these commands:

‎examples/arduino-blink/lib/readme.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,5 +34,5 @@ include paths and build them.
3434

3535
See additional options for PlatformIO Library Dependency Finder `lib_*`:
3636

37-
http://docs.platformio.org/en/latest/projectconf.html#lib-install
37+
http://docs.platformio.org/en/stable/projectconf.html#lib-install
3838

‎examples/arduino-webserver/.travis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
# Continuous Integration (CI) is the practice, in software
22
# engineering, of merging all developer working copies with a shared mainline
3-
# several times a day < http://docs.platformio.org/en/latest/ci/index.html >
3+
# several times a day < http://docs.platformio.org/en/stable/ci/index.html >
44
#
55
# Documentation:
66
#
77
# * Travis CI Embedded Builds with PlatformIO
88
# < https://docs.travis-ci.com/user/integration/platformio/ >
99
#
1010
# * PlatformIO integration with Travis CI
11-
# < http://docs.platformio.org/en/latest/ci/travis.html >
11+
# < http://docs.platformio.org/en/stable/ci/travis.html >
1212
#
1313
# * User Guide for `platformio ci` command
14-
# < http://docs.platformio.org/en/latest/userguide/cmd_ci.html >
14+
# < http://docs.platformio.org/en/stable/userguide/cmd_ci.html >
1515
#
1616
#
1717
# Please choose one of the following templates (proposed below) and uncomment

‎examples/arduino-webserver/README.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
How to build PlatformIO based project
1313
=====================================
1414

15-
1. `Install PlatformIO <http://docs.platformio.org/en/latest/installation.html>`_
15+
1. `Install PlatformIO <http://docs.platformio.org/en/stable/installation.html>`_
1616
2. Download `development platform with examples <https://github.com/platformio/platform-espressif8266/archive/develop.zip>`_
1717
3. Extract ZIP archive
1818
4. Run these commands:

0 commit comments

Comments
 (0)