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

typo

This commit is contained in:
rusefi 2019-07-21 08:19:49 -04:00
parent 1d2d94236a
commit 01996de8c8
4 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
firmware/integration/trigger.txt
View File

@ -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;

14
java_tools/configuration_definition/src/com/rusefi/ConfigStructure.java
View File

@ -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() {

14
java_tools/configuration_definition/src/com/rusefi/ReaderState.java
View File

@ -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<ConfigStructure> stack = new Stack<>();
public Map<String, Integer> tsCustomSize = new HashMap<>();
public Map<String, String> 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());
}

2
java_tools/configuration_definition/src/com/rusefi/output/CHeaderConsumer.java
View File

@ -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);
}