Skip to content

Commit 9bb1af2

Browse files
committed
Remaining linux tests results
Due to 2 systems and 2 branches (master and other) I kind of F*up This is probably the last stuff. Still need to test
1 parent edf09c9 commit 9bb1af2

File tree

3 files changed

+18
-21
lines changed

3 files changed

+18
-21
lines changed

io.sloeber.core/src/io/sloeber/core/managers/ArduinoPlatform.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,7 @@ public IStatus remove(IProgressMonitor monitor) {
152152
public IStatus install(IProgressMonitor monitor) {
153153
// Check if we're installed already
154154
if (isInstalled()) {
155+
System.out.println("reusing platform "+name + " "+architecture +"("+version+")");
155156
return Status.OK_STATUS;
156157
}
157158

io.sloeber.tests/src/io/sloeber/core/CreateAndCompileDefaultInoOnAllBoardsTest.java

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -269,20 +269,7 @@ public static Collection boards() {
269269
for (File curBoardFile : PackageManager.getAllBoardsFiles()) {
270270
// TOFIX these options should not be set here but in IBoard.getOptions
271271
Map<String, String> options = null;
272-
// if (curBoardFile.contains("Jantje")) {
273-
// // for jantjes boards as unit testing does not make a exe without the gdb lib
274-
// options = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
275-
// options.put("type", "debug");
276-
// } else if (curBoardFile.contains("avr_boot")) {
277-
// // for avr_boot avr_boot_atmega328 to have variant
278-
// options = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
279-
// options.put("pinout", "avrdevelopers");
280-
// } else if (curBoardFile.contains("/tiny/hardware")) {
281-
// // do not use ATtiny85 @ 128 KHz (watchdog oscillator; 1.8 V BOD)
282-
// // fails in arduino IDE as well
283-
// options = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
284-
// options.put("cpu", "attiny25at1");
285-
// }
272+
System.out.println("Adding boards of "+curBoardFile.toString() );
286273
boards.addAll(BoardDescriptor.makeBoardDescriptors(curBoardFile, options));
287274
}
288275
// to avoid warnings set the upload port to some value

io.sloeber.tests/src/io/sloeber/core/MySystem.java

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public class MySystem {
1717
private static final String jantjesWindowsMachineHashKey = "1248215851";
1818
//the one below is based on one mac address Fysiek adres (MAC): C0-3F-D5-66-04-58
1919
private static final String jantjesWindowsMachineHashkeyAfterUpdate="139705674";
20-
private static final String jantjesLinuxMachineHashKey = "-784776710";
20+
private static final String jantjesLinuxMachineHashKey = "88937904";
2121
private static final String jantjeWindowsMachineHashkeyAfterSecondUpdate="-441525448";
2222

2323
public static String getTeensyPlatform() {
@@ -27,7 +27,7 @@ public static String getTeensyPlatform() {
2727
case jantjeWindowsMachineHashkeyAfterSecondUpdate:
2828
return "E:\\arduino\\arduino-1.8.12 - teensy\\hardware\\teensy";
2929
case jantjesLinuxMachineHashKey:
30-
return "/home/jan/nas/linux/arduino/arduino-1.8.8-linux64/arduino-1.8.8/hardware/teensy";
30+
return "/home/jan/tensyduino/arduino-1.8.12/hardware/teensy";
3131
default:
3232
return new String();
3333
}
@@ -39,10 +39,19 @@ public static String getTeensyBoard_txt() {
3939
public static MCUBoard[] getUploadBoards() {
4040
switch (Other.getSystemHash()) {
4141
case jantjesLinuxMachineHashKey: {
42-
MCUBoard[] boards = { Teensy.teensypp2(), ESP8266.wemosD1("COM21"),
43-
Arduino.fried2016("COM26"), Arduino.yun("COM20"), Arduino.uno("COM6"),
44-
Arduino.getMega2560Board("COM11"), Arduino.zeroProgrammingPort("COM14"), Arduino.due("COM8"),
45-
Arduino.leonardo("COM31"), Arduino.arduino_101("COM15") };
42+
MCUBoard[] boards = {
43+
Teensy.teensypp2("/dev/ttyACM0"),
44+
Arduino.leonardo("/dev/ttyS0"), //werkt niet
45+
Arduino.fried2016("/dev/ttyS0"), //werkt niet
46+
Arduino.zeroNatviePort("/dev/ttyS0"), //werkt niet
47+
Arduino.yun("COM20"),
48+
ESP8266.wemosD1("/dev/ttyUSB0"),
49+
Arduino.arduino_101("COM15"),
50+
Arduino.zeroProgrammingPort("COM14"),
51+
Arduino.getMega2560Board("COM11"),
52+
Arduino.dueprogramming("COM8"),
53+
Arduino.uno("COM6"),
54+
};
4655
return boards;
4756
}
4857
case jantjesWindowsMachineHashKey:
@@ -66,7 +75,7 @@ public static MCUBoard[] getUploadBoards() {
6675
return boards;
6776
}
6877
default:
69-
fail("Boards for the system with haskey " + Other.getSystemHash() + "are not found");
78+
fail("Boards for the system with haskey " + Other.getSystemHash() + " are not found");
7079
return null;
7180
}
7281
}

0 commit comments

Comments
 (0)