Skip to content

Commit 869be67

Browse files
ivankravetsivankravets
committed
Merge branch 'release/v1.2.0'
2 parents f7faf01 + f1661d7 commit 869be67

File tree

27 files changed

+57
-61
lines changed

27 files changed

+57
-61
lines changed

‎README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
Teensy is a complete USB-based microcontroller development system, in a very small footprint, capable of implementing many types of projects. All programming is done via the USB port. No special programmer is needed, only a standard USB cable and a PC or Macintosh with a USB port.
66

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

‎boards/teensy35.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@
1515
"maximum_ram_size": 196608,
1616
"maximum_size": 524288
1717
},
18-
"url": "https://www.pjrc.com",
18+
"url": "https://www.pjrc.com/store/teensy35.html",
1919
"vendor": "Teensy"
20-
}
20+
}

‎boards/teensy36.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@
1515
"maximum_ram_size": 262144,
1616
"maximum_size": 1048576
1717
},
18-
"url": "https://www.pjrc.com",
18+
"url": "https://www.pjrc.com/store/teensy36.html",
1919
"vendor": "Teensy"
20-
}
20+
}

‎builder/frameworks/mbed

‎builder/main.py

Lines changed: 13 additions & 17 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 Teensy boards
17-
"""
18-
1915
from os.path import isfile, join
2016

2117
from SCons.Script import (COMMAND_LINE_TARGETS, AlwaysBuild, Builder, Default,
@@ -211,17 +207,16 @@
211207
# Target: Build executable and linkable firmware
212208
#
213209

214-
target_elf = env.BuildProgram()
215-
216-
#
217-
# Target: Build the firmware file
218-
#
219-
220-
if "uploadlazy" in COMMAND_LINE_TARGETS:
210+
target_elf = None
211+
if "nobuild" in COMMAND_LINE_TARGETS:
221212
target_firm = join("$BUILD_DIR", "firmware.hex")
222213
else:
214+
target_elf = env.BuildProgram()
223215
target_firm = env.ElfToHex(join("$BUILD_DIR", "firmware"), target_elf)
224216

217+
AlwaysBuild(env.Alias("nobuild", target_firm))
218+
target_buildprog = env.Alias("buildprog", target_firm)
219+
225220
#
226221
# Target: Print binary size
227222
#
@@ -235,14 +230,15 @@
235230
# Target: Upload by default firmware file
236231
#
237232

238-
upload = env.Alias(["upload", "uploadlazy"], target_firm,
239-
[env.VerboseAction("$UPLOADHEXCMD", "Uploading $SOURCE")] +
240-
([env.VerboseAction("$REBOOTER", "Rebooting...")]
241-
if "REBOOTER" in env else []))
242-
AlwaysBuild(upload)
233+
target_upload = env.Alias(
234+
"upload", target_firm,
235+
[env.VerboseAction("$UPLOADHEXCMD", "Uploading $SOURCE")] +
236+
([env.VerboseAction("$REBOOTER", "Rebooting...")]
237+
if "REBOOTER" in env else []))
238+
AlwaysBuild(target_upload)
243239

244240
#
245241
# Default targets
246242
#
247243

248-
Default([target_firm, target_size])
244+
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-teensy/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-hid-usb-mouse/.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-hid-usb-mouse/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-teensy/archive/develop.zip>`_
1717
3. Extract ZIP archive
1818
4. Run these commands:

0 commit comments

Comments
 (0)