mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-24 01:15:29 +02:00
Code Issues Wiki Activity

Bug 500237 - Use specific version of tool for uploads.

Browse source 
Arduino rolled back the version of avrdude that they used but we were
always using the latest version.

Show the arduino package first in the list of Platforms to Add.

Turn on the Arduino Neon site for future updates.

Conflicts:
	toolchains/arduino/org.eclipse.cdt.arduino-feature/p2.inf

Change-Id: I0392594d7e9d30daeb6c9e4ca7090a92dde8b19f
(cherry picked from commit 32bc90f8bf)
This commit is contained in:
Doug Schaefer 2016-08-25 21:10:08 -04:00 • committed by Gerrit Code Review @ Eclipse.org
parent 33df75987b
commit 33a979c651
3 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
toolchains/arduino/org.eclipse.cdt.arduino-feature/p2.inf Normal file
View file

@ -0,0 +1,3 @@
instructions.configure=\
org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(location:http${#58}//download.eclipse.org/tools/cdt/arduino/neon/,type:0,name:Arduino Neon,enabled:true); \
org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(location:http${#58}//download.eclipse.org/tools/cdt/arduino/neon/,type:1,name:Arduino Neon,enabled:true);

14
toolchains/arduino/org.eclipse.cdt.arduino.core/src/org/eclipse/cdt/arduino/core/internal/board/ArduinoManager.java
View file

@ -272,7 +272,19 @@ public class ArduinoManager {
public static List<ArduinoPlatform> getSortedPlatforms(Collection<ArduinoPlatform> platforms) {
List<ArduinoPlatform> result = new ArrayList<>(platforms);
Collections.sort(result, (plat1, plat2) -> {
int c1 = plat1.getPackage().getName().compareToIgnoreCase(plat2.getPackage().getName());
int c1;
String p1 = plat1.getPackage().getName();
String p2 = plat2.getPackage().getName();
if (p1.equals(p2)) {
c1 = 0;
} else if (p1.equals("arduino")) {
c1 = -1;
} else if (p2.equals("arduino")) {
c1 = 1;
} else {
c1 = plat1.getPackage().getName().compareToIgnoreCase(plat2.getPackage().getName());
}
if (c1 > 0) {
return 1;
} else if (c1 < 0) {

2
toolchains/arduino/org.eclipse.cdt.arduino.core/src/org/eclipse/cdt/arduino/core/internal/build/ArduinoBuildConfiguration.java
View file

@ -498,7 +498,7 @@ public class ArduinoBuildConfiguration extends CBuildConfiguration
}
}
ArduinoTool uploadTool = platform.getPackage().getLatestTool(toolName);
ArduinoTool uploadTool = platform.getTool(toolName);
if (uploadTool != null) {
properties.putAll(uploadTool.getToolProperties());
}