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

Bench Test IAC Valve fails #3534

This commit is contained in:
rusefillc 2021-11-11 20:37:12 -05:00
parent 8d154b94df
commit c2c335ea6d
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
java_tools/enum2string.jar
View File

Binary file not shown.

11
java_tools/enum_to_string/src/main/java/com/rusefi/EnumsReader.java
View File

@ -17,9 +17,16 @@ public class EnumsReader {
* core implementation sorts by name, we need special considerations to sort by value * core implementation sorts by name, we need special considerations to sort by value
*/ */
@NotNull @NotNull
static List<Value> getSortedByOrder(VariableRegistry registry, Map<String, Value> brain_pin_e) { static List<Value> getSortedByOrder(VariableRegistry registry, Map<String, Value> enumValues) {
Set<Integer> ids = new TreeSet<>();
for (Value value : enumValues.values()) {
boolean isUniqueId = ids.add(value.getIntValueMaybeResolve(registry));
if (!isUniqueId)
throw new IllegalArgumentException("Ordinal duplication? " + value);
}
Set<Value> byOrdinal = new TreeSet<>(Comparator.comparingInt(value -> value.getIntValueMaybeResolve(registry))); Set<Value> byOrdinal = new TreeSet<>(Comparator.comparingInt(value -> value.getIntValueMaybeResolve(registry)));
byOrdinal.addAll(brain_pin_e.values()); byOrdinal.addAll(enumValues.values());
return new ArrayList<>(byOrdinal); return new ArrayList<>(byOrdinal);
} }

2
java_tools/enum_to_string/src/main/java/com/rusefi/ToJavaEnum.java
View File

@ -50,7 +50,7 @@ public class ToJavaEnum {
for (Value value : sorted) { for (Value value : sorted) {
int numericValue = value.getIntValueMaybeResolve(registry); int numericValue = value.getIntValueMaybeResolve(registry);
if (index != numericValue && !value.getName().startsWith("Force_4_bytes_size")) if (index != numericValue && !value.getName().startsWith("Force_4_bytes_size"))
throw new IllegalStateException(numericValue + " instead of " + index + " in " + value); throw new IllegalStateException("Got explicit ordinal " + numericValue + " instead of ordinal " + index + " in " + value);
sb.append("\t" + value.getName() + ",\n"); sb.append("\t" + value.getName() + ",\n");
index++; index++;
} }