Skip to content

Commit f64d1f3

Browse files
ivankravetsivankravets
committed
Merge branch 'release/v1.6.0'
2 parents f72a748 + 258ff82 commit f64d1f3

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+515
-121
lines changed

‎.travis.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
language: python
22
python:
33
- "2.7"
4+
- "3.6"
45

56
env:
67
- PLATFORMIO_PROJECT_DIR=examples/arduino-blink

‎appveyor.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ environment:
77

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

1414
test_script:

‎boards/chipkit_dp32.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"build": {
33
"core": "pic32",
4-
"extra_flags": "-D_BOARD_DP32_ -D_USE_USB_FOR_SERIAL_",
4+
"extra_flags": "-D_BOARD_DP32_ -DPIO_ARDUINO_ENABLE_USB_SERIAL",
55
"f_cpu": "40000000L",
66
"ldscript": "chipKIT-application-32MX250F128.ld",
77
"mcu": "32MX250F128B",

‎boards/chipkit_wifire_revc.json‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
{
2+
"build": {
3+
"core": "pic32",
4+
"extra_flags": "-D_BOARD_WIFIRE_",
5+
"f_cpu": "200000000L",
6+
"ldscript": "MZ-application-32MZ2048ECX.ld",
7+
"mcu": "32MZ2048EFG100",
8+
"variant": "WiFire"
9+
},
10+
"connectivity": [
11+
"wifi"
12+
],
13+
"frameworks": [
14+
"arduino"
15+
],
16+
"name": "chipKIT WiFire rev. C",
17+
"upload": {
18+
"maximum_ram_size": 524288,
19+
"maximum_size": 2080768,
20+
"protocol": "stk500v2",
21+
"require_upload_port": true,
22+
"speed": 115200
23+
},
24+
"url": "http://store.digilentinc.com/chipkit-wi-fire-wifi-enabled-mz-microcontroller-board/",
25+
"vendor": "Digilent"
26+
}

‎boards/clicker2.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"build": {
33
"core": "pic32",
4-
"extra_flags": "-D_BOARD_CLICKER2_PIC32MX_",
4+
"extra_flags": "-D_BOARD_CLICKER2_PIC32MX_ -DPIO_ARDUINO_ENABLE_USB_SERIAL",
55
"f_cpu": "80000000L",
66
"ldscript": "chipKIT-application-32MX460F512-uhb.ld",
77
"mcu": "32MX460F512L",

‎boards/cui32.json‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
{
2+
"build": {
3+
"core": "pic32",
4+
"extra_flags": "-D_BOARD_CUI32_ -DPIO_ARDUINO_ENABLE_USB_SERIAL",
5+
"f_cpu": "80000000L",
6+
"ldscript": "chipKIT-application-32MX440F512.ld",
7+
"mcu": "32MX440F512H",
8+
"variant": "CUI32"
9+
},
10+
"frameworks": [
11+
"arduino"
12+
],
13+
"name": "Pic32 CUI32-Development Stick",
14+
"upload": {
15+
"maximum_ram_size": 32768,
16+
"maximum_size": 520192,
17+
"protocol": "stk500v2",
18+
"require_upload_port": true,
19+
"speed": 115200
20+
},
21+
"url": "https://www.sparkfun.com/products/retired/9645",
22+
"vendor": "SparkFun"
23+
}

‎boards/cui32stem.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"build": {
33
"core": "pic32",
4-
"extra_flags": "-D_BOARD_CUI32_ -D_USE_USB_FOR_SERIAL_",
4+
"extra_flags": "-D_BOARD_CUI32_ -DPIO_ARDUINO_ENABLE_USB_SERIAL",
55
"f_cpu": "80000000L",
66
"ldscript": "chipKIT-application-32MX795F512.ld",
77
"mcu": "32MX795F512H",

‎boards/dsmini.json‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
{
2+
"build": {
3+
"core": "pic32",
4+
"extra_flags": "-D_BOARD_DSMINI_",
5+
"f_cpu": "40000000L",
6+
"ldscript": "chipKIT-application-32MX150F128.ld",
7+
"mcu": "32MX150F128C",
8+
"variant": "DSMini"
9+
},
10+
"frameworks": [
11+
"arduino"
12+
],
13+
"name": "DataStation Mini",
14+
"upload": {
15+
"maximum_ram_size": 32768,
16+
"maximum_size": 122880,
17+
"protocol": "stk500v2",
18+
"require_upload_port": true,
19+
"speed": 115200
20+
},
21+
"url": "http://www.makerologist.com/",
22+
"vendor": "Makerology"
23+
}

‎boards/flipnclickmz.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"build": {
33
"core": "pic32",
4-
"extra_flags": "-D_BOARD_PIC32MZ_FLIP_N_CLICK_",
4+
"extra_flags": "-D_BOARD_PIC32MZ_FLIP_N_CLICK_ -DPIO_ARDUINO_ENABLE_USB_SERIAL",
55
"f_cpu": "252000000L",
66
"ldscript": "MZ-application-32MZ2048ECX.ld",
77
"mcu": "32MZ2048EFH100",

‎boards/fubarino_mini.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"build": {
33
"core": "pic32",
4-
"extra_flags": "-D_BOARD_FUBARINO_MINI_ -D_USE_USB_FOR_SERIAL_",
4+
"extra_flags": "-D_BOARD_FUBARINO_MINI_ -DPIO_ARDUINO_ENABLE_USB_SERIAL",
55
"f_cpu": "48000000L",
66
"ldscript": "chipKIT-application-32MX250F128.ld",
77
"mcu": "32MX250F128D",

0 commit comments

Comments
 (0)