Modded library testing to use library properties to find the board

Author: jantje

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

@@ -1,5 +1,8 @@
 package io.sloeber.core;
 
+import java.util.HashSet;
+import java.util.Set;
+
 public class BoardAttributes {
  public boolean serial = false;
  public boolean serial1 = false;
@@ -27,18 +30,12 @@ public class BoardAttributes {
  * Only a very rare selection of boards supports input_pulldown as pin mode
  */
  public boolean inputPullDown = false;
- public boolean teensy = false;// Teensy specific hardware or software
  /*
  * No board is out of the box compatible with code that needs a change
  */
  public boolean worksOutOfTheBox = true;
- /*
- * Composite video output from M0 microcontrollers: Circuit Playground Express
- * (not 'classic'), Feather M0, Arduino Zero
- */
- public boolean mo_mcu = false;
- public boolean esp8266_mcu = false;
- public String boardName = null;
+ public String boardID = null;
+ public final Set<String> myArchitectures = new HashSet<>(); //Bit wierd to have multiple architectures I know
 
  public boolean compatibleWithExampleRequirements(BoardAttributes example) {
  boolean ret = worksOutOfTheBox;
@@ -52,24 +49,38 @@ public boolean compatibleWithExampleRequirements(BoardAttributes example) {
  ret = ret && matches(example.midi, midi);
  ret = ret && matches(example.mouse, mouse);
  ret = ret && matches(example.wire1, wire1);
- ret = ret && matches(example.teensy, teensy);
+ // ret = ret && matches(example.teensy, teensy);
  ret = ret && matches(example.inputPullDown, inputPullDown);
- ret = ret && matches(example.mo_mcu, mo_mcu);
- ret = ret && matches(example.esp8266_mcu, esp8266_mcu);
+ // ret = ret && matches(example.mo_mcu, mo_mcu);
+ // ret = ret && matches(example.esp8266_mcu, esp8266_mcu);
  ret = ret && matches(example.buildInLed, buildInLed);
  ret = ret && matches(example.tone, tone);
  ret = ret && matches(example.directMode, directMode);
 
+ ret = ret && matches(example.myArchitectures, myArchitectures);
+
  ret = ret && example.myNumAD <= myNumAD;
 
- if (example.boardName != null) {
- ret = ret && example.boardName.equals(boardName);
+ if (example.boardID != null) {
+ ret = ret && example.boardID.equals(boardID);
  }
 
  return ret;
 
  }
 
+ private static boolean matches(Set<String> example_Archs, Set<String> board_archs) {
+ if (example_Archs.size() == 0) {
+ //no requirements for example
+ return true;
+ }
+ Set<String> result = new HashSet<>(example_Archs);
+
+ result.retainAll(board_archs);
+
+ return result.size() > 0;
+ }
+
  private static boolean matches(boolean needs, boolean has) {
  if (!needs)
  return true;
@@ -82,6 +93,8 @@ private static boolean matches(boolean needs, boolean has) {
  */
  public BoardAttributes or(BoardAttributes or) {
  BoardAttributes ret = new BoardAttributes();
+ ret.myArchitectures.addAll(myArchitectures);
+ ret.myArchitectures.addAll(or.myArchitectures);
  // fields that need a binary and
  ret.worksOutOfTheBox = worksOutOfTheBox && or.worksOutOfTheBox;
  ret.buildInLed = buildInLed && or.buildInLed;
@@ -99,19 +112,19 @@ public BoardAttributes or(BoardAttributes or) {
  ret.mouse = mouse || or.mouse;
  ret.wire1 = wire1 || or.wire1;
  ret.inputPullDown = inputPullDown || or.inputPullDown;
- ret.teensy = teensy || or.teensy;
- ret.mo_mcu = mo_mcu || or.mo_mcu;
- ret.esp8266_mcu = esp8266_mcu || or.esp8266_mcu;
+ // ret.teensy = teensy || or.teensy;
+ // ret.mo_mcu = mo_mcu || or.mo_mcu;
+ // ret.esp8266_mcu = esp8266_mcu || or.esp8266_mcu;
 
  // other special fields
- if (boardName == null) {
- ret.boardName = or.boardName;
+ if (boardID == null) {
+ ret.boardID = or.boardID;
  } else {
- if (or.boardName == null) {
- ret.boardName = boardName;
+ if (or.boardID == null) {
+ ret.boardID = boardID;
  } else {
- if (or.boardName.equals(boardName)) {
- ret.boardName = boardName;
+ if (or.boardID.equals(boardID)) {
+ ret.boardID = boardID;
  } else {
  ret.worksOutOfTheBox = false;
  }

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

@@ -55,7 +55,7 @@ public static Collection examples() {
  Shared.waitForAllJobsToFinish();
  installMyStuff();
 
- MCUBoard myBoards[] = { Arduino.leonardo(), Arduino.uno(), Arduino.esplora(), Adafruit.feather(),
+ MCUBoard myBoards[] = { Arduino.uno(), Arduino.leonardo(), Arduino.esplora(), Adafruit.feather(),
  Adafruit.featherMO(), Arduino.adafruitnCirquitPlayground(), ESP8266.nodeMCU(), ESP8266.wemosD1(),
  ESP8266.ESPressoLite(), Teensy.Teensy3_6(), Arduino.zeroProgrammingPort(),
  Arduino.cirquitPlaygroundExpress(), Arduino.gemma(), Adafruit.trinket8MH(), Arduino.yun(),

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

@@ -39,16 +39,20 @@ public Example(String fqn, IPath path) {
  myRequiredBoardAttributes.tone = examplesUsingTone().contains(myFQN);
  myRequiredBoardAttributes.wire1 = examplesUsingWire1().contains(myFQN);
  myRequiredBoardAttributes.midi = examplesUsingMidi().contains(myFQN) || myFQN.contains("USB_MIDI");
- myRequiredBoardAttributes.teensy = myFQN.startsWith("Example/Teensy");
+ // myRequiredBoardAttributes.teensy = myFQN.startsWith("Example/Teensy");
  myRequiredBoardAttributes.worksOutOfTheBox = !failingExamples().contains(myFQN);
- myRequiredBoardAttributes.boardName = getRequiredBoardID(myFQN);
- myRequiredBoardAttributes.mo_mcu = examplesUsingMCUmo().contains(fqn);
+ myRequiredBoardAttributes.boardID = getRequiredBoardID(myFQN);
+ // myRequiredBoardAttributes.mo_mcu = examplesUsingMCUmo().contains(fqn);
  myRequiredBoardAttributes.rawHID = myFQN.contains("USB_RawHID");
  myRequiredBoardAttributes.buildInLed = myFQN.contains("Blink");
  myRequiredBoardAttributes.myNumAD = getNumADCUsedInExample(myFQN);
  myRequiredBoardAttributes.directMode = examplesUsingDirectMode().contains(myFQN);
 
- myRequiredBoardAttributes = myRequiredBoardAttributes.or(Libraries.getRequiredBoardAttributes(getLibName()));
+ myRequiredBoardAttributes = myRequiredBoardAttributes.or(Libraries.getRequiredBoardAttributes(getLibFolder()));
+ }
+
+ private IPath getLibFolder() {//Need to remove the examples folder and the example folder
+ return myPath.removeLastSegments(2);
  }
 
  private static int getNumADCUsedInExample(String myFQN2) {
@@ -237,12 +241,6 @@ private static LinkedList<String> examplesUsingWire1() {
  return ret;
  }
 
- private static LinkedList<String> examplesUsingMCUmo() {
- LinkedList<String> ret = new LinkedList<>();
- ret.add("Library/Adafruit_Circuit_Playground/CircuitPlaygroundFirmata_Express_CodeOrg");
- return ret;
- }
-
  /*
  * These examples that are known to fail
  */
@@ -258,8 +256,8 @@ private static LinkedList<String> failingExamples() {
  // These examples are the processing part and are not a deal of sloeber
  ret.add("Library/Adafruit_BNO055/bunny/processing/cuberotate");
  // manual action is needed for following examples
+ ret.add("Library/AbsoluteMouse/DevKit");
  ret.add("Library/Accessories/CANCommander");
- ret.add("Library/Accessories_CANCommander");
  ret.add("Library/Accessories/Demo");
  ret.add("Library/Accessories/Full");
  ret.add("Library/Accessories/Group");
@@ -428,6 +426,8 @@ private static LinkedList<String> failingExamples() {
  ret.add("Library/Blinker/Blinker_AUTO/AUTO_MQTT");
  // 3: error: 'StaticJsonBuffer' was not declared in this scope
  ret.add("Library/Boodskap_Message_library/SimpleMessageUsage");
+ //uses #include <ArduinoDebug.hpp>
+ ret.add("Library/107-Arduino-BoostUnits/Basic");
  return ret;
  }
 
@@ -442,83 +442,90 @@ public static MCUBoard pickBestBoard(Example example, MCUBoard myBoards[]) {
  String libName = example.getLibName();
  String fqn = example.getFQN();
  if (myBoards.length == 0) {
+ //No boards =>no match
+ System.out.println("No boards to select from found for ");
+ return null;
+ }
+ //examples using DHT_sensor_library libraries are not found as the include is
+ // DHT.h
+ if (!libName.equals("DHT_sensor_library") && fqn.contains("DHT")) {
+ System.out.println("Ignore Lib as it is known to fail " + libName);
+ return null;
+ }
+ if (!example.getRequiredBoardAttributes().worksOutOfTheBox) {
+ System.out.println("Example is known to fail " + example.getFQN());
  return null;
  }
 
- if (example.getRequiredBoardAttributes().worksOutOfTheBox) {
+ // if example states which board it wants use that board
+ if (example.getRequiredBoardAttributes().boardID != null) {
+ String wantedBoardName = example.getRequiredBoardAttributes().boardID;
+ for (MCUBoard curBoard : myBoards) {
+ if (curBoard.getID().equals(wantedBoardName)) {
+ return curBoard;
+ }
+ }
+ System.out.println(
+ "Example " + example.getFQN() + " requires board " + wantedBoardName + " that is not listed");
+ return null;
+ }
 
- // if example states which board it wants use that board
- if (example.getRequiredBoardAttributes().boardName != null) {
- String wantedBoardName = example.getRequiredBoardAttributes().boardName;
- for (MCUBoard curBoard : myBoards) {
- if (curBoard.getID().equals(wantedBoardName)) {
+ // if the boardname is in the libname or ino name pick this one
+ for (MCUBoard curBoard : myBoards) {
+ String curBoardName = curBoard.getName();
+ List<String> curBoardExampleNames = getSlangNames(curBoardName);
+ for (String curBoardExampleName : curBoardExampleNames) {
+ if (libName.toLowerCase().contains(curBoardName) || fqn.toLowerCase().contains(curBoardExampleName)) {
+ if (curBoard.isExampleSupported(example)) {
  return curBoard;
  }
  }
- } else {
- // examples using DHT_sensor_library libraries are not found as the include is
- // DHT.h
- if (!libName.equals("DHT_sensor_library") && fqn.contains("DHT")) {
- return null;
- }
- // if the boardname is in the libname or ino name pick this one
- for (MCUBoard curBoard : myBoards) {
- String curBoardName = curBoard.getName();
- List<String> curBoardExampleNames = getSlangNames(curBoardName);
- for (String curBoardExampleName : curBoardExampleNames) {
- if (libName.toLowerCase().contains(curBoardName)
- || fqn.toLowerCase().contains(curBoardExampleName)) {
- if (curBoard.isExampleSupported(example)) {
- return curBoard;
- }
- }
- }
- }
- // If the architecture is in the libname or boardname pick this one
- for (MCUBoard curBoard : myBoards) {
- String curArchitectureName = curBoard.getBoardDescriptor().getArchitecture().toLowerCase();
- if (libName.toLowerCase().contains(curArchitectureName)
- || fqn.toLowerCase().contains(curArchitectureName)) {
- if (curBoard.isExampleSupported(example)) {
- return curBoard;
- }
- }
- }
- // if the example name contains teensy try teensy board
- if (example.getFQN().toLowerCase().contains("teensy")) {
- for (MCUBoard curBoard : myBoards) {
- if (Teensy.class.isInstance(curBoard)) {
- return curBoard;
- }
- }
+ }
+ }
+ // If the architecture is in the libname or boardname pick this one
+ for (MCUBoard curBoard : myBoards) {
+ String curArchitectureName = curBoard.getBoardDescriptor().getArchitecture().toLowerCase();
+ if (libName.toLowerCase().contains(curArchitectureName)
+ || fqn.toLowerCase().contains(curArchitectureName)) {
+ if (curBoard.isExampleSupported(example)) {
+ return curBoard;
  }
-  // if the example name contains ESP32 try ESP32 board
-  if (example.getFQN().toLowerCase().contains("esp32")) {
-  for (MCUBoard curBoard : myBoards) {
-  if (ESP32.class.isInstance(curBoard)) {
-  return curBoard;
-  }
- }
+ }
+ }
+ // if the example name contains teensy try teensy board
+ if (example.getFQN().toLowerCase().contains("teensy")) {
+ for (MCUBoard curBoard : myBoards) {
+ if (Teensy.class.isInstance(curBoard)) {
+ return curBoard;
  }
- // if the example name contains ESP try ESP8266 board
- //	if (example.getFQN().toLowerCase().contains("esp")) {
- //	for (MCUBoard curBoard : myBoards) {
- //	if (ESP8266.class.isInstance(curBoard)) {
- //	return curBoard;
- //	}
- //	}
- //	}
- //causes issues with response
-
- // Out of guesses based on the name. Take the first ok one
- for (MCUBoard curBoard : myBoards) {
- if (curBoard.isExampleSupported(example)) {
- return curBoard;
- }
+ }
+ }
+ // if the example name contains ESP32 try ESP32 board
+ if (example.getFQN().toLowerCase().contains("esp32")) {
+ for (MCUBoard curBoard : myBoards) {
+ if (ESP32.class.isInstance(curBoard)) {
+ return curBoard;
  }
  }
  }
- System.out.println("No board found for " + Integer.toString(++noBoardFoundCount) + " " + example.getFQN());
+ // if the example name contains ESP try ESP8266 board
+ //	if (example.getFQN().toLowerCase().contains("esp")) {
+ //	for (MCUBoard curBoard : myBoards) {
+ //	if (ESP8266.class.isInstance(curBoard)) {
+ //	return curBoard;
+ //	}
+ //	}
+ //	}
+ //causes issues with response
+
+ // Out of guesses based on the name. Take the first ok one
+ for (MCUBoard curBoard : myBoards) {
+ if (curBoard.isExampleSupported(example)) {
+ return curBoard;
+ }
+ }
+ System.out.println(
+ "No board found for " + Integer.toString(++noBoardFoundCount) + " " + example.getPath().toOSString());
  return null;
  }