diff --git a/firmware/integration/trigger.txt b/firmware/integration/trigger.txt index 63a57d8494..c93e09942a 100644 --- a/firmware/integration/trigger.txt +++ b/firmware/integration/trigger.txt @@ -1,6 +1,6 @@ #define HW_EVENT_TYPES 6 -struct_no_prefix define_contructor trigger_central_s +struct_no_prefix define_constructor trigger_central_s int[HW_EVENT_TYPES iterate] hwEventCounters; diff --git a/java_tools/configuration_definition/src/com/rusefi/ConfigStructure.java b/java_tools/configuration_definition/src/com/rusefi/ConfigStructure.java index 188b6c5bcf..0b96046484 100644 --- a/java_tools/configuration_definition/src/com/rusefi/ConfigStructure.java +++ b/java_tools/configuration_definition/src/com/rusefi/ConfigStructure.java @@ -1,9 +1,5 @@ package com.rusefi; -import com.rusefi.output.TSProjectConsumer; - -import java.io.IOException; -import java.io.Writer; import java.util.ArrayList; import java.util.List; @@ -18,7 +14,7 @@ public class ConfigStructure { public final String name; public final String comment; public final boolean withPrefix; - private final boolean withContructor; + private final boolean withConstructor; /** * We have two different collections because if 'array iterate' feature which is handled differently * in C and TS @@ -30,15 +26,15 @@ public class ConfigStructure { public int totalSize; public BitState bitState = new BitState(); - public ConfigStructure(String name, String comment, boolean withPrefix, boolean withContructor) { + public ConfigStructure(String name, String comment, boolean withPrefix, boolean withConstructor) { this.name = name; this.comment = comment; this.withPrefix = withPrefix; - this.withContructor = withContructor; + this.withConstructor = withConstructor; } - public boolean isWithContructor() { - return withContructor; + public boolean isWithConstructor() { + return withConstructor; } public String getName() { diff --git a/java_tools/configuration_definition/src/com/rusefi/ReaderState.java b/java_tools/configuration_definition/src/com/rusefi/ReaderState.java index 6ff40d557a..4a99d1d7dd 100644 --- a/java_tools/configuration_definition/src/com/rusefi/ReaderState.java +++ b/java_tools/configuration_definition/src/com/rusefi/ReaderState.java @@ -25,7 +25,7 @@ public class ReaderState { private static final String END_STRUCT = "end_struct"; private static final String STRUCT_NO_PREFIX = "struct_no_prefix "; private static final String STRUCT = "struct "; - private static final String DEFINE_CONTRUCTOR = "define_contructor"; + private static final String DEFINE_CONSTRUCTOR = "define_constructor"; public Stack stack = new Stack<>(); public Map tsCustomSize = new HashMap<>(); public Map tsCustomLine = new HashMap<>(); @@ -137,12 +137,12 @@ public class ReaderState { } private static void handleStartStructure(ReaderState state, String line, boolean withPrefix) { - boolean withContructor; - if (line.toLowerCase().startsWith(DEFINE_CONTRUCTOR)) { - withContructor = true; - line = line.substring(DEFINE_CONTRUCTOR.length()).trim(); + boolean withConstructor; + if (line.toLowerCase().startsWith(DEFINE_CONSTRUCTOR)) { + withConstructor = true; + line = line.substring(DEFINE_CONSTRUCTOR.length()).trim(); } else { - withContructor = false; + withConstructor = false; } @@ -156,7 +156,7 @@ public class ReaderState { name = line; comment = null; } - ConfigStructure structure = new ConfigStructure(name, comment, withPrefix, withContructor); + ConfigStructure structure = new ConfigStructure(name, comment, withPrefix, withConstructor); state.stack.push(structure); SystemOut.println("Starting structure " + structure.getName()); } diff --git a/java_tools/configuration_definition/src/com/rusefi/output/CHeaderConsumer.java b/java_tools/configuration_definition/src/com/rusefi/output/CHeaderConsumer.java index bb970127db..a444e8c46d 100644 --- a/java_tools/configuration_definition/src/com/rusefi/output/CHeaderConsumer.java +++ b/java_tools/configuration_definition/src/com/rusefi/output/CHeaderConsumer.java @@ -62,7 +62,7 @@ public class CHeaderConsumer implements ConfigurationConsumer { content.append("// start of " + structure.name + EOL); content.append("struct " + structure.name + " {" + EOL); - if (structure.isWithContructor()) { + if (structure.isWithConstructor()) { content.append("\t" + structure.name + "();" + EOL); }