Skip to content

Commit a0f5424

Browse files
committed
Merge branch 'release/v0.7.0'
2 parents c3e3a5c + 7b89bd9 commit a0f5424

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+149
-101
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/espressif32) (home page in PlatformIO Platform Registry)
8-
* [Documentation](http://docs.platformio.org/en/stable/platforms/espressif32.html) (advanced usage, packages, boards, frameworks, etc.)
8+
* [Documentation](http://docs.platformio.org/page/platforms/espressif32.html) (advanced usage, packages, boards, frameworks, etc.)
99

1010
# Usage
1111

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

builder/frameworks/espidf.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ def build_espidf_bootloader():
143143
join(FRAMEWORK_DIR, "components", "micro-ecc"),
144144
src_filter="+<*> -<micro-ecc/test>"
145145
),
146-
"rtc", "gcc", "stdc++"
146+
"rtc_clk", "gcc", "stdc++"
147147
]
148148
)
149149

@@ -218,7 +218,7 @@ def build_espidf_bootloader():
218218
],
219219

220220
LIBS=[
221-
"btdm_app", "hal", "coexist", "core", "net80211", "phy", "rtc", "pp",
221+
"btdm_app", "hal", "coexist", "core", "net80211", "phy", "rtc", "rtc_clk", "pp",
222222
"wpa", "wpa2", "wps", "smartconfig", "m", "c", "gcc", "stdc++"
223223
]
224224
)

builder/main.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,11 +89,13 @@ def _get_board_f_flash(env):
8989
UPLOADERFLAGS=[
9090
"--chip", "esp32",
9191
"--port", '"$UPLOAD_PORT"',
92+
"--before", "default_reset",
93+
"--after", "hard_reset",
9294
"--baud", "$UPLOAD_SPEED",
9395
"write_flash", "-z",
9496
"--flash_mode", "$BOARD_FLASH_MODE",
9597
"--flash_freq", "${__get_board_f_flash(__env__)}",
96-
"--flash_size", env.BoardConfig().get("upload.flash_size", "4MB")
98+
"--flash_size", "detect"
9799
],
98100

99101
UPLOADCMD='"$PYTHONEXE" "$UPLOADER" $UPLOADERFLAGS $SOURCE',

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/stable/ci/index.html >
3+
# several times a day < http://docs.platformio.org/page/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/stable/ci/travis.html >
11+
# < http://docs.platformio.org/page/ci/travis.html >
1212
#
1313
# * User Guide for `platformio ci` command
14-
# < http://docs.platformio.org/en/stable/userguide/cmd_ci.html >
14+
# < http://docs.platformio.org/page/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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
How to build PlatformIO based project
1313
=====================================
1414

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

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/stable/projectconf.html#lib-install
37+
http://docs.platformio.org/page/projectconf.html#lib-install
3838

examples/arduino-blink/platformio.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
; Library options: dependencies, extra library storages
66
;
77
; Please visit documentation for the other options and examples
8-
; http://docs.platformio.org/en/stable/projectconf.html
8+
; http://docs.platformio.org/page/projectconf.html
99

1010
[env:esp32dev]
1111
platform = espressif32

examples/arduino-wifiscan/.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/stable/ci/index.html >
3+
# several times a day < http://docs.platformio.org/page/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/stable/ci/travis.html >
11+
# < http://docs.platformio.org/page/ci/travis.html >
1212
#
1313
# * User Guide for `platformio ci` command
14-
# < http://docs.platformio.org/en/stable/userguide/cmd_ci.html >
14+
# < http://docs.platformio.org/page/userguide/cmd_ci.html >
1515
#
1616
#
1717
# Please choose one of the following templates (proposed below) and uncomment

examples/arduino-wifiscan/README.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
How to build PlatformIO based project
1313
=====================================
1414

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

examples/arduino-wifiscan/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/stable/projectconf.html#lib-install
37+
http://docs.platformio.org/page/projectconf.html#lib-install
3838

0 commit comments

Comments
 (0)