Skip to content

Commit

Permalink
Merge branch 'release/v1.6.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
ivankravets committed Jan 18, 2017
2 parents 6276295 + 5e4d449 commit c1fe7a8
Show file tree
Hide file tree
Showing 9 changed files with 177 additions and 9 deletions.
2 changes: 1 addition & 1 deletion builder/frameworks/mbed
Submodule mbed updated 1 files
+3 −2 mbed.py
14 changes: 8 additions & 6 deletions builder/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -176,10 +176,12 @@
ASFLAGS=env.get("CCFLAGS", [])[:]
)

if isfile(
join(
platform.get_package_dir("tool-teensy") or "",
"teensy_loader_cli")):
if any([
isfile(
join(
platform.get_package_dir("tool-teensy") or "",
"teensy_loader_cli%s" % b)) for b in ("", ".exe")
]):
env.Append(
UPLOADER="teensy_loader_cli",
UPLOADERFLAGS=[
Expand All @@ -194,8 +196,8 @@
REBOOTER="teensy_reboot",
UPLOADER="teensy_post_compile",
UPLOADERFLAGS=[
"-file=firmware", '-path="$BUILD_DIR"',
'-tools="%s"' % (platform.get_package_dir("tool-teensy") or "")
"-file=firmware", '-path=$BUILD_DIR',
'-tools=%s' % (platform.get_package_dir("tool-teensy") or "")
],
UPLOADHEXCMD='$UPLOADER $UPLOADERFLAGS')

Expand Down
3 changes: 3 additions & 0 deletions examples/mbed-events/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
.pioenvs
.clang_complete
.gcc-flags.json
65 changes: 65 additions & 0 deletions examples/mbed-events/.travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
# Continuous Integration (CI) is the practice, in software
# engineering, of merging all developer working copies with a shared mainline
# several times a day < http://docs.platformio.org/en/stable/ci/index.html >
#
# Documentation:
#
# * Travis CI Embedded Builds with PlatformIO
# < https://docs.travis-ci.com/user/integration/platformio/ >
#
# * PlatformIO integration with Travis CI
# < http://docs.platformio.org/en/stable/ci/travis.html >
#
# * User Guide for `platformio ci` command
# < http://docs.platformio.org/en/stable/userguide/cmd_ci.html >
#
#
# Please choose one of the following templates (proposed below) and uncomment
# it (remove "# " before each line) or use own configuration according to the
# Travis CI documentation (see above).
#


#
# Template #1: General project. Test it using existing `platformio.ini`.
#

# language: python
# python:
# - "2.7"
#
# sudo: false
# cache:
# directories:
# - "~/.platformio"
#
# install:
# - pip install -U platformio
#
# script:
# - platformio run


#
# Template #2: The project is intended to by used as a library with examples
#

# language: python
# python:
# - "2.7"
#
# sudo: false
# cache:
# directories:
# - "~/.platformio"
#
# env:
# - PLATFORMIO_CI_SRC=path/to/test/file.c
# - PLATFORMIO_CI_SRC=examples/file.ino
# - PLATFORMIO_CI_SRC=path/to/test/directory
#
# install:
# - pip install -U platformio
#
# script:
# - platformio ci --lib="." --board=ID_1 --board=ID_2 --board=ID_N
32 changes: 32 additions & 0 deletions examples/mbed-events/README.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
.. Copyright 2014-present PlatformIO <[email protected]>
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
How to build PlatformIO based project
=====================================

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

.. code-block:: bash
# Change directory to example
> cd platform-teensy/examples/mbed-events
# Build project
> platformio run
# Upload firmware
> platformio run --target upload
# Clean build files
> platformio run --target clean
38 changes: 38 additions & 0 deletions examples/mbed-events/lib/readme.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@

This directory is intended for the project specific (private) libraries.
PlatformIO will compile them to static libraries and link to executable file.

The source code of each library should be placed in separate directory, like
"lib/private_lib/[here are source files]".

For example, see how can be organized `Foo` and `Bar` libraries:

|--lib
| |--Bar
| | |--docs
| | |--examples
| | |--src
| | |- Bar.c
| | |- Bar.h
| |--Foo
| | |- Foo.c
| | |- Foo.h
| |- readme.txt --> THIS FILE
|- platformio.ini
|--src
|- main.c

Then in `src/main.c` you should use:

#include <Foo.h>
#include <Bar.h>

// rest H/C/CPP code

PlatformIO will find your libraries automatically, configure preprocessor's
include paths and build them.

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

http://docs.platformio.org/en/stable/projectconf.html#lib-install

13 changes: 13 additions & 0 deletions examples/mbed-events/platformio.ini
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
; PlatformIO Project Configuration File
;
; Build options: build flags, source filter, extra scripting
; Upload options: custom port, speed and extra flags
; Library options: dependencies, extra library storages
;
; Please visit documentation for the other options and examples
; http://docs.platformio.org/en/stable/projectconf.html

[env:teensy31]
platform = teensy
framework = mbed
board = teensy31
15 changes: 15 additions & 0 deletions examples/mbed-events/src/main.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
#include "mbed_events.h"
#include <stdio.h>

int main() {
// creates a queue with the default size
EventQueue queue;

// events are simple callbacks
queue.call(printf, "called immediately\n");
queue.call_in(2000, printf, "called in 2 seconds\n");
queue.call_every(1000, printf, "called every 1 seconds\n");

// events are executed by the dispatch method
queue.dispatch();
}
4 changes: 2 additions & 2 deletions platform.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"type": "git",
"url": "https://github.com/platformio/platform-teensy.git"
},
"version": "1.5.0",
"version": "1.6.0",
"packageRepositories": [
"https://dl.bintray.com/platformio/dl-packages/manifest.json",
"https://sourceforge.net/projects/platformio-storage/files/packages/manifest.json/download",
Expand Down Expand Up @@ -42,7 +42,7 @@
"framework-arduinoteensy": {
"type": "framework",
"optional": true,
"version": "~1.131.0"
"version": "~1.135.0"
},
"framework-mbed": {
"type": "framework",
Expand Down

0 comments on commit c1fe7a8

Please sign in to comment.