Skip to content

Commit

Permalink
Merge branch 'release/v1.2.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
ivankravets committed May 7, 2019
2 parents e9c9320 + 8c962ec commit fc43b34
Show file tree
Hide file tree
Showing 5 changed files with 31 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
language: python
python:
- "2.7"
- "3.5"
- "3.6"

env:
- PLATFORMIO_PROJECT_DIR=examples/native-blink
Expand Down
4 changes: 2 additions & 2 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ environment:

install:
- cmd: git submodule update --init --recursive
- cmd: SET PATH=%PATH%;C:\Python27\Scripts
- cmd: pip install -U https://github.com/platformio/platformio/archive/develop.zip
- cmd: SET PATH=%PATH%;C:\Python36\Scripts
- cmd: pip3 install -U https://github.com/platformio/platformio/archive/develop.zip
- cmd: platformio platform install file://.

test_script:
Expand Down
6 changes: 3 additions & 3 deletions boards/stc15w404as.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"size_xram": 256,
"size_code": 4096,
"size_heap": 128,
"mcu": "stc15w408as",
"mcu": "stc15w404as",
"cpu": "mcs51"
},
"frameworks": [],
Expand All @@ -18,7 +18,7 @@
"stcgal"
]
},
"name": "Generic STC15W408AS",
"url": "https://www.stcmicro.com/STC/STC15W408AS.html",
"name": "Generic STC15W404AS",
"url": "https://www.stcmicro.com/STC/STC15W404AS.html",
"vendor": "STC"
}
24 changes: 24 additions & 0 deletions boards/stc89c52rc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
{
"build": {
"f_cpu": "11059200",
"size_iram": 256,
"size_xram": 256,
"size_code": 8192,
"size_heap": 128,
"mcu": "stc89c52rc",
"cpu": "mcs51"
},
"frameworks": [],
"upload": {
"maximum_ram_size": 512,
"maximum_size": 8192,
"protocol": "stcgal",
"stcgal_protocol": "stc89",
"protocols": [
"stcgal"
]
},
"name": "Generic STC89C52RC",
"url": "https://www.stcmicro.com/STC/STC89C52RC.html",
"vendor": "STC"
}
2 changes: 1 addition & 1 deletion 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-intel_mcs51.git"
},
"version": "1.2.0",
"version": "1.2.1",
"packageRepositories": [
"https://dl.bintray.com/platformio/dl-packages/manifest.json",
"http://dl.platformio.org/packages/manifest.json"
Expand Down

0 comments on commit fc43b34

Please sign in to comment.