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

bugfix: order of complexity

This commit is contained in:
Andrey 2022-04-16 13:57:16 -04:00
parent 03d558075d
commit 9d6a7b6ee1
3 changed files with 6 additions and 6 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.

6
java_tools/configuration_definition/src/main/java/com/rusefi/ConfigDefinition.java
View File

@ -236,12 +236,12 @@ public class ConfigDefinition {
if (state.destinations.isEmpty()) if (state.destinations.isEmpty())
throw new IllegalArgumentException("No destinations specified"); throw new IllegalArgumentException("No destinations specified");
state.doJob();
if (pinoutLogic != null) { if (pinoutLogic != null) {
pinoutLogic.processYamls(state.variableRegistry, state); pinoutLogic.registerBoardSpecificPinNames(state.variableRegistry, state);
} }
state.doJob();
if (destCDefinesFileName != null) { if (destCDefinesFileName != null) {
ExtraUtil.writeDefinesToFile(state.variableRegistry, destCDefinesFileName, state.definitionInputFile); ExtraUtil.writeDefinesToFile(state.variableRegistry, destCDefinesFileName, state.definitionInputFile);
} }

6
java_tools/configuration_definition/src/main/java/com/rusefi/PinoutLogic.java
View File

@ -85,7 +85,7 @@ public class PinoutLogic {
} }
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
private void processYamlFile(File yamlFile) throws IOException { private void readMetaInfo(File yamlFile) throws IOException {
Yaml yaml = new Yaml(); Yaml yaml = new Yaml();
Map<String, Object> yamlData = yaml.load(new FileReader(yamlFile)); Map<String, Object> yamlData = yaml.load(new FileReader(yamlFile));
if (yamlData == null) { if (yamlData == null) {
@ -149,9 +149,9 @@ public class PinoutLogic {
return new PinoutLogic(boardName, boardYamlFiles); return new PinoutLogic(boardName, boardYamlFiles);
} }
public void processYamls(VariableRegistry registry, ReaderState state) throws IOException { public void registerBoardSpecificPinNames(VariableRegistry registry, ReaderState state) throws IOException {
for (File yamlFile : boardYamlFiles) { for (File yamlFile : boardYamlFiles) {
processYamlFile(yamlFile); readMetaInfo(yamlFile);
} }
registerPins(globalList, registry, state); registerPins(globalList, registry, state);