diff --git a/java_tools/ConfigDefinition.jar b/java_tools/ConfigDefinition.jar index e7c50f0d4c..d973c3cabb 100644 Binary files a/java_tools/ConfigDefinition.jar and b/java_tools/ConfigDefinition.jar differ diff --git a/java_tools/configuration_definition/src/main/java/com/rusefi/ConfigDefinition.java b/java_tools/configuration_definition/src/main/java/com/rusefi/ConfigDefinition.java index 9ba0b9af65..01916cc585 100644 --- a/java_tools/configuration_definition/src/main/java/com/rusefi/ConfigDefinition.java +++ b/java_tools/configuration_definition/src/main/java/com/rusefi/ConfigDefinition.java @@ -236,12 +236,12 @@ public class ConfigDefinition { if (state.destinations.isEmpty()) throw new IllegalArgumentException("No destinations specified"); - state.doJob(); - if (pinoutLogic != null) { - pinoutLogic.processYamls(state.variableRegistry, state); + pinoutLogic.registerBoardSpecificPinNames(state.variableRegistry, state); } + state.doJob(); + if (destCDefinesFileName != null) { ExtraUtil.writeDefinesToFile(state.variableRegistry, destCDefinesFileName, state.definitionInputFile); } diff --git a/java_tools/configuration_definition/src/main/java/com/rusefi/PinoutLogic.java b/java_tools/configuration_definition/src/main/java/com/rusefi/PinoutLogic.java index 7a251a9eac..f199c917f0 100644 --- a/java_tools/configuration_definition/src/main/java/com/rusefi/PinoutLogic.java +++ b/java_tools/configuration_definition/src/main/java/com/rusefi/PinoutLogic.java @@ -85,7 +85,7 @@ public class PinoutLogic { } @SuppressWarnings("unchecked") - private void processYamlFile(File yamlFile) throws IOException { + private void readMetaInfo(File yamlFile) throws IOException { Yaml yaml = new Yaml(); Map yamlData = yaml.load(new FileReader(yamlFile)); if (yamlData == null) { @@ -149,9 +149,9 @@ public class PinoutLogic { 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) { - processYamlFile(yamlFile); + readMetaInfo(yamlFile); } registerPins(globalList, registry, state);