andreika-git
/
rusefi
mirror of https://github.com/andreika-git/rusefi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ConfigDefinition stuff (#2940) 

* add check for empty string

* try catching duplicates, while allowing same id on a pin

* js brain

* fixes

* fixes

* comment out

* build

* bump submo

* comment
This commit is contained in:
David Holdeman 2021-07-09 21:07:07 -05:00 committed by GitHub
parent 64ea4aabac
commit 5582518a04
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 26 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
java_tools/ConfigDefinition.jar
View File

Binary file not shown.

43
java_tools/configuration_definition/src/com/rusefi/ConfigDefinition.java
View File

@ -411,6 +411,7 @@ public class ConfigDefinition {
SystemOut.println(data); SystemOut.println(data);
Objects.requireNonNull(data, "data"); Objects.requireNonNull(data, "data");
for (Map<String, Object> pin : data) { for (Map<String, Object> pin : data) {
ArrayList<Map<String, Object>> thisPinList = new ArrayList<>();
Object pinId = pin.get("id"); Object pinId = pin.get("id");
Object pinClass = pin.get("class"); Object pinClass = pin.get("class");
Object pinName = pin.get("ts_name"); Object pinName = pin.get("ts_name");
@ -423,22 +424,36 @@ public class ConfigDefinition {
throw new IllegalStateException("Expected multiple classes for " + pinIds); throw new IllegalStateException("Expected multiple classes for " + pinIds);
for (int i = 0; i < pinIds.size(); i++) { for (int i = 0; i < pinIds.size(); i++) {
String id = pinIds.get(i); String id = pinIds.get(i);
Map<String, Object> thisPin = new HashMap<>(); addPinToList(listPins, thisPinList, id, pinName, ((ArrayList<String>) pinClass).get(i));
thisPin.put("id", id);
thisPin.put("ts_name", pinName);
thisPin.put("class", ((ArrayList<String>) pinClass).get(i));
listPins.add(thisPin);
} }
} else if (pinId instanceof String) { } else if (pinId instanceof String) {
Map<String, Object> thisPin = new HashMap<>(); if (((String) pinId).length() == 0) {
thisPin.put("id", pinId); throw new IllegalStateException("Unexpected empty ID field");
thisPin.put("ts_name", pinName); }
thisPin.put("class", pinClass); addPinToList(listPins, thisPinList, pinId, pinName, pinClass);
listPins.add(thisPin);
} else { } else {
throw new IllegalStateException("Unexpected type of id field: " + pinId.getClass().getSimpleName()); throw new IllegalStateException("Unexpected type of ID field: " + pinId.getClass().getSimpleName());
}
listPins.addAll(thisPinList);
}
}
private static void addPinToList(ArrayList<Map<String, Object>> listPins, ArrayList<Map<String, Object>> thisPinList, Object id, Object pinName, Object pinClass) {
/*
This doesn't work as expected because it's possible that a board has multiple connector pins connected to the same MCU pin.
https://github.com/rusefi/rusefi/issues/2897
https://github.com/rusefi/rusefi/issues/2925
for (int i = 0; i < listPins.size(); i++) {
if (id.equals(listPins.get(i).get("id"))) {
throw new IllegalStateException("ID used multiple times: " + id);
} }
} }
*/
Map<String, Object> thisPin = new HashMap<>();
thisPin.put("id", id);
thisPin.put("ts_name", pinName);
thisPin.put("class", pinClass);
thisPinList.add(thisPin);
} }
private static void registerPins(ArrayList<Map<String, Object>> listPins, VariableRegistry registry, ReaderState state) { private static void registerPins(ArrayList<Map<String, Object>> listPins, VariableRegistry registry, ReaderState state) {
@ -452,12 +467,6 @@ public class ConfigDefinition {
names.put("switch_inputs", new ArrayList<>()); names.put("switch_inputs", new ArrayList<>());
for (int i = 0; i < listPins.size(); i++) { for (int i = 0; i < listPins.size(); i++) {
String id = (String) listPins.get(i).get("id"); String id = (String) listPins.get(i).get("id");
for (int ii = i + 1; ii < listPins.size(); ii++) {
if (id.equals(listPins.get(ii).get("id"))) {
// todo: re-enable once we fix https://github.com/rusefi/rusefi/issues/2897
//throw new IllegalStateException("ID used multiple times: " + id);
}
}
String className = (String) listPins.get(i).get("class"); String className = (String) listPins.get(i).get("class");
ArrayList<String> classList = names.get(className); ArrayList<String> classList = names.get(className);
if (classList == null) { if (classList == null) {