Skip to content

Commit 724c07d

Browse files
ivankravetsivankravets
committed
Merge branch 'release/v1.2.0'
2 parents 9a385d1 + 2cf49a0 commit 724c07d

File tree

35 files changed

+88
-74
lines changed

35 files changed

+88
-74
lines changed

‎README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
The STM32 family of 32-bit Flash MCUs based on the ARM Cortex-M processor is designed to offer new degrees of freedom to MCU users. It offers a 32-bit product range that combines very high performance, real-time capabilities, digital signal processing, and low-power, low-voltage operation, while maintaining full integration and ease of development.
66

77
* [Home](http://platformio.org/platforms/ststm32) (home page in PlatformIO Platform Registry)
8-
* [Documentation](http://docs.platformio.org/en/latest/platforms/ststm32.html) (advanced usage, packages, boards, frameworks, etc.)
8+
* [Documentation](http://docs.platformio.org/en/stable/platforms/ststm32.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 ST STM32 development platform:
1414
```bash
1515
# install the latest stable version

‎boards/disco_f769ni.json

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
{
2+
"build": {
3+
"cpu": "cortex-m7",
4+
"f_cpu": "80000000L",
5+
"mcu": "stm32f769nih6"
6+
},
7+
"frameworks": [
8+
"mbed"
9+
],
10+
"name": "ST 32F769IDISCOVERY",
11+
"upload": {
12+
"maximum_ram_size": 524288,
13+
"maximum_size": 1048576,
14+
"protocol": "2097152"
15+
},
16+
"url": "http://www.st.com/content/st_com/en/products/evaluation-tools/product-evaluation-tools/mcu-eval-tools/stm32-mcu-eval-tools/stm32-mcu-discovery-kits/32f769idiscovery.html",
17+
"vendor": "ST"
18+
}

‎builder/frameworks/mbed

Submodule mbed updated 1 file

‎builder/main.py

Lines changed: 15 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,6 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
"""
16-
Builder for ST STM32 Series ARM microcontrollers.
17-
"""
18-
1915
from os.path import isfile, join
2016

2117
from SCons.Script import (COMMAND_LINE_TARGETS, AlwaysBuild, Builder, Default,
@@ -174,17 +170,16 @@
174170
# Target: Build executable and linkable firmware
175171
#
176172

177-
target_elf = env.BuildProgram()
178-
179-
#
180-
# Target: Build the .bin file
181-
#
182-
183-
if "uploadlazy" in COMMAND_LINE_TARGETS:
173+
target_elf = None
174+
if "nobuild" in COMMAND_LINE_TARGETS:
184175
target_firm = join("$BUILD_DIR", "firmware.bin")
185176
else:
177+
target_elf = env.BuildProgram()
186178
target_firm = env.ElfToBin(join("$BUILD_DIR", "firmware"), target_elf)
187179

180+
AlwaysBuild(env.Alias("nobuild", target_firm))
181+
target_buildprog = env.Alias("buildprog", target_firm)
182+
188183
#
189184
# Target: Print binary size
190185
#
@@ -199,24 +194,25 @@
199194
#
200195

201196
if "mbed" in env.subst("$PIOFRAMEWORK") and not env.subst("$UPLOAD_PROTOCOL"):
202-
upload = env.Alias(
203-
["upload", "uploadlazy"], target_firm,
197+
target_upload = env.Alias(
198+
"upload", target_firm,
204199
[env.VerboseAction(env.AutodetectUploadPort,
205200
"Looking for upload disk..."),
206201
env.VerboseAction(env.UploadToDisk, "Uploading $SOURCE")])
207202
elif "arduino" in env.subst("$PIOFRAMEWORK"):
208-
upload = env.Alias(
209-
["upload", "uploadlazy"], target_firm,
203+
target_upload = env.Alias(
204+
"upload", target_firm,
210205
[env.VerboseAction(env.AutodetectUploadPort,
211206
"Looking for upload disk..."),
212207
env.VerboseAction("$UPLOADCMD", "Uploading $SOURCE")])
213208
else:
214-
upload = env.Alias(["upload", "uploadlazy"], target_firm,
215-
env.VerboseAction("$UPLOADCMD", "Uploading $SOURCE"))
216-
AlwaysBuild(upload)
209+
target_upload = env.Alias(
210+
"upload", target_firm,
211+
env.VerboseAction("$UPLOADCMD", "Uploading $SOURCE"))
212+
AlwaysBuild(target_upload)
217213

218214
#
219215
# Default targets
220216
#
221217

222-
Default([target_firm, target_size])
218+
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-ststm32/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-external-libs/.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-external-libs/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-ststm32/archive/develop.zip>`_
1717
3. Extract ZIP archive
1818
4. Run these commands:

‎examples/arduino-external-libs/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

0 commit comments

Comments
 (0)