Skip to content

Commit f1da185

Browse files
ivankravetsivankravets
committed
Merge branch 'release/v0.1.1'
2 parents b617d7d + 3621ace commit f1da185

File tree

8 files changed

+46
-35
lines changed

8 files changed

+46
-35
lines changed

‎.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ env:
1010
- PLATFORMIO_PROJECT_DIR=examples/simba-blink
1111

1212
install:
13-
- pip install -U https://github.com/platformio/platformio/archive/feature/platformio-30.zip
13+
- pip install -U https://github.com/platformio/platformio/archive/develop.zip
1414
- platformio platform install file://.
1515

1616
script:

‎appveyor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ environment:
1111
install:
1212
- cmd: git submodule update --init --recursive
1313
- cmd: SET PATH=%PATH%;C:\Python27\Scripts
14-
- cmd: pip install -U https://github.com/platformio/platformio/archive/feature/platformio-30.zip
14+
- cmd: pip install -U https://github.com/platformio/platformio/archive/develop.zip
1515
- cmd: platformio platform install file://.
1616

1717
test_script:

‎examples/arduino-blink/platformio.ini

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
1-
#
2-
# PlatformIO Project Configuration File
3-
#
4-
# Please make sure to read documentation with examples first
5-
# http://docs.platformio.org/en/stable/projectconf.html
6-
#
1+
; PlatformIO Project Configuration File
2+
;
3+
; Build options: build flags, source filter, extra scripting
4+
; Upload options: custom port, speed and extra flags
5+
; Library options: dependencies, extra library storages
6+
;
7+
; Please visit documentation for the other options and examples
8+
; http://docs.platformio.org/en/stable/projectconf.html
79

810
[env:d1]
911
platform = espressif

‎examples/arduino-webserver/platformio.ini

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
1-
#
2-
# PlatformIO Project Configuration File
3-
#
4-
# Please make sure to read documentation with examples first
5-
# http://docs.platformio.org/en/stable/projectconf.html
6-
#
1+
; PlatformIO Project Configuration File
2+
;
3+
; Build options: build flags, source filter, extra scripting
4+
; Upload options: custom port, speed and extra flags
5+
; Library options: dependencies, extra library storages
6+
;
7+
; Please visit documentation for the other options and examples
8+
; http://docs.platformio.org/en/stable/projectconf.html
79

810
[env:esp01]
911
platform = espressif

‎examples/arduino-wifiscan/platformio.ini

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
1-
#
2-
# PlatformIO Project Configuration File
3-
#
4-
# Please make sure to read documentation with examples first
5-
# http://docs.platformio.org/en/stable/projectconf.html
6-
#
1+
; PlatformIO Project Configuration File
2+
;
3+
; Build options: build flags, source filter, extra scripting
4+
; Upload options: custom port, speed and extra flags
5+
; Library options: dependencies, extra library storages
6+
;
7+
; Please visit documentation for the other options and examples
8+
; http://docs.platformio.org/en/stable/projectconf.html
79

810
[env:esp01]
911
platform = espressif

‎examples/native-sdk/platformio.ini

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
1-
#
2-
# PlatformIO Project Configuration File
3-
#
4-
# Please make sure to read documentation with examples first
5-
# http://docs.platformio.org/en/stable/projectconf.html
6-
#
1+
; PlatformIO Project Configuration File
2+
;
3+
; Build options: build flags, source filter, extra scripting
4+
; Upload options: custom port, speed and extra flags
5+
; Library options: dependencies, extra library storages
6+
;
7+
; Please visit documentation for the other options and examples
8+
; http://docs.platformio.org/en/stable/projectconf.html
79

810
[env:esp01]
911
platform = espressif

‎examples/simba-blink/platformio.ini

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
1-
#
2-
# PlatformIO Project Configuration File
3-
#
4-
# Please make sure to read documentation with examples first
5-
# http://docs.platformio.org/en/stable/projectconf.html
6-
#
1+
; PlatformIO Project Configuration File
2+
;
3+
; Build options: build flags, source filter, extra scripting
4+
; Upload options: custom port, speed and extra flags
5+
; Library options: dependencies, extra library storages
6+
;
7+
; Please visit documentation for the other options and examples
8+
; http://docs.platformio.org/en/stable/projectconf.html
79

810
[env:esp12e]
911
platform = espressif

‎platform.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,12 @@
1616
"type": "git",
1717
"url": "https://github.com/platformio/platform-espressif.git"
1818
},
19-
"version": "0.1.0",
19+
"version": "0.1.1",
2020
"packageRepositories": [
2121
"https://dl.bintray.com/platformio/dl-packages/manifest.json",
2222
"https://sourceforge.net/projects/platformio-storage/files/packages/manifest.json/download",
23-
"http://dl.platformio.org/packages/manifest.json"
23+
"http://dl.platformio.org/packages/manifest.json",
24+
"https://raw.githubusercontent.com/eerimoq/simba/master/make/platformio/manifest.json"
2425
],
2526
"frameworks": {
2627
"arduino": {
@@ -45,7 +46,7 @@
4546
"framework-simba": {
4647
"type": "framework",
4748
"optional": true,
48-
"version": "^1.500.0"
49+
"version": ">=7.0.0"
4950
},
5051
"tool-esptool": {
5152
"type": "uploader",

0 commit comments

Comments
 (0)