Skip to content

Commit 39b14d6

Browse files
author
jantje
committed
Merge branch '#1339_Add_deserialisation_clases' of
https://github.com/Sloeber/arduino-eclipse-plugin.git into #1339_Add_deserialisation_clases Conflicts: io.sloeber.core/src/io/sloeber/core/api/BoardDescription.java io.sloeber.tests/src/io/sloeber/core/BoardAttributes.java io.sloeber.tests/src/io/sloeber/core/Example.java io.sloeber.tests/src/io/sloeber/core/MySystem.java io.sloeber.tests/src/io/sloeber/core/RegressionTest.java io.sloeber.tests/src/io/sloeber/providers/Adafruit.java io.sloeber.tests/src/io/sloeber/providers/Arduino.java io.sloeber.tests/src/io/sloeber/providers/ESP32.java io.sloeber.tests/src/io/sloeber/providers/ESP8266.java io.sloeber.tests/src/io/sloeber/providers/Jantje.java io.sloeber.tests/src/io/sloeber/providers/MCUBoard.java io.sloeber.tests/src/io/sloeber/providers/Teensy.java
2 parents 3db5f0f + c5d1fbf commit 39b14d6

File tree

3 files changed

+12
-9
lines changed

3 files changed

+12
-9
lines changed

io.sloeber.tests/src/io/sloeber/providers/Adafruit.java

+10-4
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,18 @@ public class Adafruit extends MCUBoard {
1717

1818
public Adafruit(String architectureName, String boardName) {
1919

20-
this.myBoardDescriptor = BoardsManager.getBoardDescription("package_adafruit_index.json", "adafruit",
20+
myBoardDescriptor = BoardsManager.getBoardDescription("package_adafruit_index.json", "adafruit",
2121
architectureName, boardName, null);
22-
if (this.myBoardDescriptor == null) {
22+
if (myBoardDescriptor == null) {
2323
fail(boardName + " Board not found");
2424
}
25-
this.myBoardDescriptor.setUploadPort("none");
25+
myBoardDescriptor.setUploadPort("none");
26+
setAttributes();
27+
}
28+
29+
public Adafruit(BoardDescription boardDesc) {
30+
myBoardDescriptor = boardDesc;
31+
myBoardDescriptor.setUploadPort("none");
2632
setAttributes();
2733
}
2834

@@ -56,7 +62,7 @@ protected void setAttributes() {
5662

5763
@Override
5864
public MCUBoard createMCUBoard(BoardDescription boardDesc) {
59-
return new Teensy(boardDesc);
65+
return new Adafruit(boardDesc);
6066
}
6167

6268
}

io.sloeber.tests/src/io/sloeber/providers/Arduino.java

-1
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,6 @@ protected static List<String> supportSerial1List() {
210210
protected static List<String> doesNotSupportSerialList() {
211211
List<String> ret = new LinkedList<>();
212212
ret.add("gemma");
213-
214213
return ret;
215214
}
216215

io.sloeber.tests/src/io/sloeber/providers/MCUBoard.java

+2-4
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ public static List<MCUBoard> getAllBoards(String provider, MCUBoard creator) {
3838
}
3939
}
4040
return ret;
41-
4241
}
4342

4443
public BoardDescription getBoardDescriptor() {
@@ -49,7 +48,6 @@ public boolean isExampleSupported(Example example) {
4948
if (myBoardDescriptor == null) {
5049
return false;
5150
}
52-
5351
/*
5452
* There is one know Teensy example that does not
5553
* run on all teensy boards
@@ -67,9 +65,9 @@ public boolean isExampleSupported(Example example) {
6765
}
6866

6967
/**
70-
* give the ID of the board as it appears in boards.txt
68+
* give the name of the board as it appears in boards.txt
7169
*
72-
* @return the ID or null
70+
* @return the name of the board as shown in the gui
7371
*/
7472
public String getID() {
7573
if (myBoardDescriptor == null) {

0 commit comments

Comments
 (0)