Merge branch 'release/v1.4.0'

This commit is contained in:
Ivan Kravets 2016-11-18 16:48:57 +02:00
commit a5d2e621bb
5 changed files with 15 additions and 15 deletions

@ -1 +1 @@
Subproject commit 096a8c521caf44b6f5bd9c262e7f7bbabe52e49f Subproject commit ac4e05206eccca8ad227c351826b7eaea27bd1d6

View File

@ -22,10 +22,10 @@ platform = ststm32
framework = mbed framework = mbed
board = disco_f100rb board = disco_f100rb
[env:nucleo_f030r8] ; [env:nucleo_f030r8]
platform = ststm32 ; platform = ststm32
framework = mbed ; framework = mbed
board = nucleo_f030r8 ; board = nucleo_f030r8
[env:nucleo_f103rb] [env:nucleo_f103rb]
platform = ststm32 platform = ststm32

View File

@ -22,10 +22,10 @@ platform = ststm32
framework = mbed framework = mbed
board = disco_f100rb board = disco_f100rb
[env:nucleo_f030r8] ; [env:nucleo_f030r8]
platform = ststm32 ; platform = ststm32
framework = mbed ; framework = mbed
board = nucleo_f030r8 ; board = nucleo_f030r8
[env:nucleo_f103rb] [env:nucleo_f103rb]
platform = ststm32 platform = ststm32

View File

@ -22,10 +22,10 @@ platform = ststm32
framework = mbed framework = mbed
board = disco_f100rb board = disco_f100rb
[env:nucleo_f030r8] ; [env:nucleo_f030r8]
platform = ststm32 ; platform = ststm32
framework = mbed ; framework = mbed
board = nucleo_f030r8 ; board = nucleo_f030r8
[env:nucleo_f103rb] [env:nucleo_f103rb]
platform = ststm32 platform = ststm32

View File

@ -13,7 +13,7 @@
"type": "git", "type": "git",
"url": "https://github.com/platformio/platform-ststm32.git" "url": "https://github.com/platformio/platform-ststm32.git"
}, },
"version": "1.3.1", "version": "1.4.0",
"packageRepositories": [ "packageRepositories": [
"https://dl.bintray.com/platformio/dl-packages/manifest.json", "https://dl.bintray.com/platformio/dl-packages/manifest.json",
"https://sourceforge.net/projects/platformio-storage/files/packages/manifest.json/download", "https://sourceforge.net/projects/platformio-storage/files/packages/manifest.json/download",
@ -49,7 +49,7 @@
"framework-mbed": { "framework-mbed": {
"type": "framework", "type": "framework",
"optional": true, "optional": true,
"version": "~3.126.0" "version": "~3.127.0"
}, },
"framework-cmsis": { "framework-cmsis": {
"type": "framework", "type": "framework",