10000 Merge branch 'master' into master · Netoperz/vscode-arduino@8ec5929 · GitHub
[go: up one dir, main page]
Skip to content

Commit 8ec5929

Browse files
testforstephentestforstephen
authored
Merge branch 'master' into master
2 parents af50d9f + 6b3a533 commit 8ec5929

20 files changed

+1075
-189
lines changed

‎.editorconfig

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,13 @@ root = true
66
# Tab indentation
77
[*]
88
indent_style = space
9-
indent_size = 2
9+
indent_size = 4
1010

1111
# The indent size used in the `package.json` file cannot be changed
1212
# https://github.com/npm/npm/pull/3180#issuecomment-16336516
1313
[{.travis.yml,npm-shrinkwrap.json,package.json}]
1414
indent_size = 2
15+
16+
[vendor/**.js]
17+
indent_style = space
18+
indent_size = 2

‎misc/debuggerUsbMapping.json

Lines changed: 66 additions & 0 deletions
37
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
[
2+
{
3+
"vid": "0483",
4+
"pid": "3744",
5+
"name": "ST Link V1.0",
6+
"short_name": "stlink-1.0",
7+
"config_file": "stlink-v1.cfg"
8+
},
9+
{
10+
"vid": "0483",
11+
"pid": "3748",
12+
"name": "ST Link V2.0",
13+
"short_name": "stlink-2.0",
14+
"config_file": "stlink-v2.cfg"
15+
},
16+
{
17+
"vid": "0483",
18+
"pid": "374b",
19+
"name": "ST Link V2.1",
20+
"short_name": "stlink-2.1",
21+
"config_file": "stlink-v2-1.cfg"
22+
},
23+
{
24+
"pid": [
25+
"0101",
26+
"0102",
27+
"0103",
28+
"0104",
29+
"0105",
30+
"0106",
31+
"0107",
32+
"0108",
33+
"0109",
34+
"0110",
35+
"0111",
36+
"0112",
+
"0113",
38+
"0114",
39+
"0115",
40+
"0116",
41+
"0117",
42+
"0118"
43+
],
44+
"vid": "1366",
45+
"name": "JLink",
46+
"short_name": "jlink",
47+
"config_file": "jlink.cfg"
48+
},
49+
{
50+
"vid": "03eb",
51+
"pid": "2111",
52+
"name": "CMSIS-DAP",
53+
"short_name": "cmsis-dap",
54+
"config_file": "cmsis-dap.cfg"
55+
},
56+
{
57+
"vid": "03eb",
58+
"pid": [
59+
"2111",
60+
"2157"
61+
],
62+
"name": "CMSIS-DAP",
63+
"short_name": "cmsis-dap",
64+
"config_file": "cmsis-dap.cfg"
65+
}
66+
]

‎misc/openOCDMapping.json

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
[
2+
{
3+
"board": "arduino:samd:mzero_pro_bl_dbg",
4+
"interface": "interface/cmsis-dap.cfg",
5+
"target": "target/at91samdXX.cfg"
6+
},
7+
{
8+
"board": "arduino:samd:mzero_bl",
9+
"interface": "interface/cmsis-dap.cfg",
10+
"target": "target/at91samdXX.cfg"
11+
},
12+
{
13+
"board": "AZ3166:stm32f4:MXCHIP_AZ3166",
14+
"interface": "interface/stlink-v2-1.cfg",
15+
"target": "target/stm32f4x.cfg"
16+
}
17+
]
18+

‎misc/usbmapping.json

Lines changed: 93 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,76 +1,147 @@
1-
[{
1+
[
2+
{
23
"index_file": "package_index.json",
3-
"boards": [{
4+
"boards": [
5+
{
46
"vid": "2341",
57
"pid": "804e",
68
"name": "Arduino/Genuino MKR1000",
79
"package": "arduino",
810
"architecture": "samd",
9-
"id": "mkr1000"
10-
}, {
11+
"id": "mkr1000",
12+
"target": "at91samdXX.cfg"
13+
},
14+
{
1115
"vid": "8087",
1216
"pid": "0a9e",
1317
"name": "Intel Edison",
1418
"package": "arduino",
1519
"architecture": "samd",
1620
"id": "edison"
17-
}, {
21+
},
22+
{
23+
"vid": "03eb",
24+
"pid": "2111",
25+
"name": "Arduino M0 Pro (Programming USB Port)",
26+
"package": "arduino",
27+
"architecture": "samd",
28+
"id": "mzero_pro_bl_dbg",
29+
"target": "at91samdXX.cfg",
30+
"interface": "cmsis-dap.cfg"
31+
},
32+
{
33+
"vid": "03eb",
34+
"pid": "2157",
35+
"name": "Arduino/Genuino Zero (Programming Port)",
36+
"package": "arduino",
37+
"architecture": "samd",
38+
"id": "arduino_zero_edbg",
39+
"target": "at91samdXX.cfg",
40+
"interface": "cmsis-dap.cfg"
41+
},
42+
{
43+
"vid": "2341",
44+
"pid": ["804d", "004d", "824d"],
45+
"name": "Arduino/Genuino Zero (Native USB Port)",
46+
"package": "arduino",
47+
"architecture": "samd",
48+
"id": "arduino_zero_edbg",
49+
"target": "at91samdXX.cfg",
50+
"interface": "cmsis-dap.cfg"
51+
},
52+
{
1853
"vid": "2a03",
1954
"pid": "804f",
2055
"name": "Arduino M0 Pro (Native USB Port)",
2156
"package": "arduino",
2257
"architecture": "samd",
23-
"id": "mzero_pro_bl"
24-
}, {
58+
"id": "mzero_pro_bl",
59+
"target": "at91samdXX.cfg"
60+
},
61+
{
2562
"vid": "2341",
2663
"pid": "8041",
2764
"name": "Arduino Yún",
2865
"package": "arduino",
2966
"architecture": "avr",
3067
"id": "yun"
31-
}, {
68+
},
69+
{
3270
"vid": "2341",
3371
"pid": "003e",
3472
"name": "Arduino Due",
3573
"package": "arduino",
3674
"architecture": "sam",
3775
"id": "arduino_due_x"
38-
}]
39-
}, {
76+
}
77+
]
78+
},
79+
{
80+
"index_file": "https://www.adafruit.com/package_adafruit_index.json",
81+
"boards": [
82+
{
83+
"vid": "239a",
84+
"pid": [
85+
"0010",
86+
"8010",
87+
"0008"
88+
],
89+
"name": "Adafruit WICED Feather",
90+
"package": "adafruit",
91+
"architecture": "wiced",
92+
"id": "feather",
93+
"target": "stm32f2x.cfg"
94+
}
95+
]
96+
},
97+
{
4098
"index_file": "http://arduino.esp8266.com/stable/package_esp8266com_index.json",
41-
"boards": [{
99+
"boards": [
100+
{
42101
"vid": "10c4",
43102
"pid": "ea60",
44103
"name": "Adafruit HUZZAH ESP8266",
45104
"package": "esp8266",
46105
"architecture": "esp8266",
47106
"id": "huzzah"
48-
}, {
107+
},
108+
{
49109
"vid": "0403",
50110
"pid": "6015",
51111
"name": "SparkFun ESP8266 Thing Dev",
52112
"package": "esp8266",
53113
"architecture": "esp8266",
54114
"id": "thingdev"
55-
}]
56-
}, {
115+
}
116+
]
117+
},
118+
{
57119
"index_file": "https://adafruit.github.io/arduino-board-index/package_adafruit_index.json",
58-
"boards": [{
120+
"boards": [
121+
{
59122
"vid": "239a",
60123
"pid": "800b",
61124
"name": "Adafruit Feather M0",
62125
"package": "adafruit",
63126
"architecture": "samd",
64-
"id": "adafruit_feather_m0"
65-
}]
66-
}, {
127+
"id": "adafruit_feather_m0",
128+
"target": "at91samdXX.cfg"
129+
}
130+
]
131+
},
132+
{
67133
"index_file": "https://raw.githubusercontent.com/VSChina/azureiotdevkit_tools/master/package_azureboard_index.json",
68-
"boards": [{
134+
"boards": [
135+
{
69136
"vid": "0483"< 8205 /span>,
70137
"pid": "374b",
71138
"name": "MXCHIP AZ3166",
72139
"package": "AZ3166",
73140
"architecture": "stm32f4",
74-
"id": "MXCHIP_AZ3166"
75-
}]
76-
}]
141+
"id": "MXCHIP_AZ3166",
142+
"interface": "stlink-v2-1.cfg",
143+
"target": "stm32f4x.cfg"
144+
}
145+
]
146+
}
147+
]

0 commit comments

Comments
 (0)
0