Skip to content

Commit 686c78b

Browse files
facchinmfacchinm
authored
Merge pull request #5731 from facchinm/tian_support
Add Arduino.org board definitions
2 parents b1f3492 + 6d1924b commit 686c78b

24 files changed

+1901
-171
lines changed

‎app/src/processing/app/Base.java

+2
Original file line numberDiff line numberDiff line change
@@ -1444,6 +1444,8 @@ public void actionPerformed(ActionEvent actionevent) {
14441444

14451445
// Cycle through all boards of this platform
14461446
for (TargetBoard board : targetPlatform.getBoards().values()) {
1447+
if (board.getPreferences().get("hide") != null)
1448+
continue;
14471449
JMenuItem item = createBoardMenusAndCustomMenus(boardsCustomMenus, menuItemsToClickAfterStartup,
14481450
buttonGroupsMap,
14491451
board, targetPlatform, targetPackage);

‎arduino-core/src/processing/app/Platform.java

+16-1
Original file line numberDiff line numberDiff line change
@@ -236,14 +236,29 @@ public synchronized Map<String, Object> resolveDeviceByVendorIdProductId(String
236236
List<String> vids = new LinkedList<>(board.getPreferences().subTree("vid", 1).values());
237237
if (!vids.isEmpty()) {
238238
List<String> pids = new LinkedList<>(board.getPreferences().subTree("pid", 1).values());
239+
List<String> descriptors = new LinkedList<>(board.getPreferences().subTree("descriptor", 1).values());
239240
for (int i = 0; i < vids.size(); i++) {
240241
String vidPid = vids.get(i) + "_" + pids.get(i);
241242
if (vid_pid_iSerial.toUpperCase().contains(vidPid.toUpperCase())) {
243+
if (!descriptors.isEmpty()) {
244+
boolean matched = false;
245+
for (int j = 0; j < descriptors.size(); j++) {
246+
if (vid_pid_iSerial.toUpperCase().contains(descriptors.get(j).toUpperCase())) {
247+
matched = true;
248+
break;
249+
}
250+
}
251+
if (matched == false) {
252+
continue;
253+
}
254+
}
242255
Map<String, Object> boardData = new HashMap<>();
243256
boardData.put("board", board);
244257
boardData.put("vid", vids.get(i));
245258
boardData.put("pid", pids.get(i));
246-
boardData.put("iserial", vid_pid_iSerial.substring(vidPid.length()+1));
259+
String extrafields = vid_pid_iSerial.substring(vidPid.length()+1);
260+
String[] parts = extrafields.split("_");
261+
boardData.put("iserial", parts[0]);
247262
return boardData;
248263
}
249264
}

‎build/build.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@
8686
<property name="portable" value="false" />
8787

8888
<property name="ARDUINO-BUILDER-VERSION" value="1.3.23" />
89-
<property name="LIBLISTSERIAL-VERSION" value="1.2.0" />
89+
<property name="LIBLISTSERIAL-VERSION" value="1.4.0" />
9090
<property name="AVRGCC-VERSION" value="4.9.2-atmel3.5.3-arduino2" />
9191
<property name="AVRDUDE-VERSION" value="6.3.0-arduino8" />
9292

‎build/liblistSerials-1.2.0.zip.sha

-1
This file was deleted.

‎build/liblistSerials-1.4.0.zip.sha

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
abec9fe7b7dfb5ae5bf5eb0bd883ef9f6ad7a7eb

‎build/macosx/dist/drivers/SiliconLabs-CP2105/ReleaseNotes.txt

+130
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,130 @@
1+
CP210x Macintosh OS X VCP Driver v4 Release Notes
2+
Copyright (C) 2015 Silicon Laboratories, Inc.
3+
4+
This release contains the following components:
5+
6+
* SiLabsUSBDriverDisk.dmg - Image containing the VCP Driver Installer
7+
* ReleaseNotes.txt (this file)
8+
* uninstaller.sh - a bash shell script for removing the driver
9+
10+
Known Issues and Limitations
11+
----------------------------
12+
13+
This release includes the Macintosh OSX driver for the Intel and
14+
PowerPC Platforms versions 10.5, 10.6, 10.7, 10.8,
15+
10.9, and 10.10.
16+
17+
Driver Installation
18+
-------------------
19+
20+
Mount the DMG file and double click on
21+
Silicon Labs VCP Driver.
22+
23+
Uninstalling the Driver
24+
-----------------------
25+
26+
To uninstall the driver, run the uninstaller.sh shell script from
27+
a Terminal command prompt.
28+
29+
Release Dates
30+
-------------
31+
32+
CP210x Macintosh OSX VCP Driver 4.10.7 - February 15, 2016
33+
CP210x Macintosh OSX VCP Driver v3.1 - December 6, 2012
34+
35+
36+
CP210x Macintosh OSX Driver Revision History
37+
--------------------------------------------
38+
39+
Version 4.x.7
40+
Added VID/PID for Sekonic and DASCOM.
41+
Minor fix to postflight script for 64 bit 10.8 and below OS's.
42+
43+
Version 4.x.6
44+
Added VID/PIDs for Vorze and Cadex Electronics.
45+
46+
Version 4.x.5
47+
Added VID/PIDs for California Eastern Labs and Micro Computer Control Corp.
48+
49+
Version 4.x.4
50+
Added VID/PIDs for Zonge International, AES GmbH, SPORTident GmbH
51+
52+
Version 4.x.3
53+
Added VID/PID for Aruba Networks, Inc.
54+
55+
Version 4.x.2
56+
Added VID/PID for ARKRAY, Inc.
57+
58+
Version 4.x.1
59+
Added VID/PIDs for BodyCap, RTKWARE, and West Mountain Radio
60+
Added uninstaller script to DMG
61+
Installer now runs uninstaller script before executing install - removes older versions using previous naming scheme
62+
Dropping support for OS X 10.4. If you require OS X 10.4 support, please install version 3.1 of the VCP driver
63+
64+
Version 4.x.0
65+
Added OSX 10.9 and 10.10 driver support with signed kernel extension
66+
Updated version numbering - 2nd digit represents target OS versions
67+
4.7 - OSX 10.7 and older, 32 bit
68+
4.8 - OSX 10.8 and older, 64 bit
69+
4.10 - OSX 10.9 and 10.10, 64 bit, signed kext
70+
Updated version numbering - 3rd digit represents VID/PID updates. Customers not needing the new VID/PID do not need to update drivers for 3rd digit changes.
71+
Installer will now only install the proper matching kernel extension instead of both the 32 bit and 64 bit versions.
72+
73+
Version 3.1
74+
Added support for CP2108
75+
76+
Version 3.0
77+
Corrected issue where transmission would stop when a 0 length packet was sent
78+
incorrectly on aligned packet boundaries
79+
80+
Version 2.9
81+
Corrected issue with Baud Rates not being set properly if they were greater
82+
than 230400 on PPC or Intel platforms
83+
Corrected an issue where a device might get stuck when coming out of sleep mode
84+
Corrected an issue on PPC where Baud Rates were not getting set properly
85+
Added enhanced support for sleep, now reads state on sleep and writes state on
86+
wake to provide smoother and more stable state transitions
87+
88+
Version 2.7
89+
Corrected issue with initial Stop Bits value
90+
Corrected issue which seen which switching between 32 and 64 bit mode and trying
91+
to use the driver in each mode
92+
Added in a clear stall to be more complete in invalid control transfers
93+
94+
Version 2.6
95+
Corrected all known Kernel Panics for 10.4/5/6 for surprise removal and data
96+
transmission
97+
Corrected an issue with data drop while using XON/XOFF flow control
98+
Corrected RTS/DTR toggling sync issue
99+
100+
Version 2.2
101+
Corrected Kernel Panic in Snow Leopard which would randomly occur after
102+
transmission
103+
Modified DTR pin to toggle on open and close instead of on insertion
104+
Modified driver to load without showing the Network Connection Dialog
105+
Modified driver to allow toggling of RTS and DTR pins
106+
Added 64 bit support for Snow Leopard
107+
108+
Version 2.1
109+
Corrected device strings that were changed in the 2.0 release back to the
110+
format used in pre-2.0 drivers
111+
112+
Version 2.0
113+
Driver architecture updated.
114+
115+
Version 1.06
116+
Corrected a bug which causes a Kernel Panic with a Baud Rate of 0, yileding
117+
a Divide-By-Zero error
118+
119+
Version 1.04
120+
Updated to support newer versions of Mac OSX
121+
122+
123+
Version 1.02
124+
Updated to support the Intel platform through a universal binary that
125+
also supports PowerPC.
126+
127+
Version 1.00
128+
Initial Release
129+
130+

‎build/macosx/dist/drivers/SiliconLabs-CP2105/Silicon Labs VCP Driver.pkg

179 KB
Binary file not shown.

‎build/macosx/dist/drivers/SiliconLabs-CP2105/uninstaller.sh

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
#!/bin/bash
2+
3+
if [ -d /System/Library/Extensions/SiLabsUSBDriver.kext ]; then
4+
sudo rm -rf /System/Library/Extensions/SiLabsUSBDriver.kext
5+
fi
6+
7+
if [ -d /System/Library/Extensions/SiLabsUSBDriver64.kext ]; then
8+
sudo rm -rf /System/Library/Extensions/SiLabsUSBDriver64.kext
9+
fi
10+
11+
if [ -d /Library/Extensions/SiLabsUSBDriverYos.kext ]; then
12+
sudo rm -rf /Library/Extensions/SiLabsUSBDriverYos.kext
13+
fi
14+
15+
if [ -d /Library/Extensions/SiLabsUSBDriver.kext ]; then
16+
sudo rm -rf /Library/Extensions/SiLabsUSBDriver.kext
17+
fi

‎build/windows/dist/drivers/arduino-org.cat

100644100755
1008 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)