mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-21 15:23:59 +02:00
Code Issues Wiki Activity

Bug 487634 - remove hack for esptool.

Browse source 
Added ESP8266 boards to tests.

Change-Id: I3e2bc87338fc0f4e7fc64f278935d986ce7b8429
This commit is contained in:
Doug Schaefer 2016-06-19 17:15:26 -04:00
parent 9e17fbca4f
commit 909e2294b1
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
toolchains/arduino/org.eclipse.cdt.arduino.core.tests/src/org/eclipse/cdt/arduino/core/tests/FullIntegration.java
View file

@ -65,7 +65,9 @@ public class FullIntegration {
private static void setPreferences() throws Exception { private static void setPreferences() throws Exception {
URL[] urls = new URL[] { new URL("http://downloads.arduino.cc/packages/package_index.json"), URL[] urls = new URL[] { new URL("http://downloads.arduino.cc/packages/package_index.json"),
new URL("https://adafruit.github.io/arduino-board-index/package_adafruit_index.json"), new URL("https://adafruit.github.io/arduino-board-index/package_adafruit_index.json"),
new URL("http://arduino.esp8266.com/stable/package_esp8266com_index.json"),
new URL("http://drazzy.com/package_drazzy.com_index.json") }; new URL("http://drazzy.com/package_drazzy.com_index.json") };
// new URL("https://github.com/chipKIT32/chipKIT-core/raw/master/package_chipkit_index.json")
ArduinoPreferences.setBoardUrlList(urls); ArduinoPreferences.setBoardUrlList(urls);
Path workspace = Paths.get(ResourcesPlugin.getWorkspace().getRoot().getLocationURI()); Path workspace = Paths.get(ResourcesPlugin.getWorkspace().getRoot().getLocationURI());

1
toolchains/arduino/org.eclipse.cdt.arduino.core/src/org/eclipse/cdt/arduino/core/internal/board/ArduinoToolSystem.java
View file

@ -55,6 +55,7 @@ public class ArduinoToolSystem {
case Platform.OS_MACOSX: case Platform.OS_MACOSX:
switch (host) { switch (host) {
case "i386-apple-darwin11": //$NON-NLS-1$ case "i386-apple-darwin11": //$NON-NLS-1$
case "i386-apple-darwin": //$NON-NLS-1$
case "x86_64-apple-darwin": //$NON-NLS-1$ case "x86_64-apple-darwin": //$NON-NLS-1$
return true; return true;
default: default:

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

@ -592,9 +592,6 @@ public class ArduinoBuildConfiguration extends CBuildConfiguration implements Te
properties.put("upload.verbose", properties.getProperty("upload.params.verbose", "")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ properties.put("upload.verbose", properties.getProperty("upload.params.verbose", "")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
properties.put("upload.verify", properties.getProperty("upload.params.verify", "")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ properties.put("upload.verify", properties.getProperty("upload.params.verify", "")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
// TODO needed this for esptool
properties.put("upload.resetmethod", "ck"); //$NON-NLS-1$ //$NON-NLS-2$
command = resolveProperty("upload.pattern", properties); //$NON-NLS-1$ command = resolveProperty("upload.pattern", properties); //$NON-NLS-1$
} else { } else {
// use the bootloader // use the bootloader