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

convention for fields without TS info

This commit is contained in:
rusefi 2020-06-29 21:53:26 -04:00
parent c4d5813bbf
commit 811b616aaa
3 changed files with 6 additions and 1 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.

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

@ -13,6 +13,8 @@ import static com.rusefi.ConfigField.BOOLEAN_T;
*/ */
public class ConfigStructure { public class ConfigStructure {
private static final String ALIGNMENT_FILL_AT = "alignmentFill_at_";
public final String name; public final String name;
public final String comment; public final String comment;
public final boolean withPrefix; public final boolean withPrefix;
@ -65,7 +67,7 @@ public class ConfigStructure {
int fillSize = totalSize % 4 == 0 ? 0 : 4 - (totalSize % 4); int fillSize = totalSize % 4 == 0 ? 0 : 4 - (totalSize % 4);
if (fillSize != 0) { if (fillSize != 0) {
ConfigField fill = new ConfigField(state, "alignmentFill_at_" + totalSize, "need 4 byte alignment", ConfigField fill = new ConfigField(state, ALIGNMENT_FILL_AT + totalSize, "need 4 byte alignment",
"" + fillSize, "" + fillSize,
TypesHelper.UINT8_T, fillSize, null, false, false, null, -1, null, null); TypesHelper.UINT8_T, fillSize, null, false, false, null, -1, null, null);
addBoth(fill); addBoth(fill);

3
java_tools/configuration_definition/src/com/rusefi/output/TSProjectConsumer.java
View File

@ -70,6 +70,9 @@ public class TSProjectConsumer implements ConfigurationConsumer {
tsPosition += size; tsPosition += size;
} else if (configField.getTsInfo() == null) { } else if (configField.getTsInfo() == null) {
if (!configField.getName().toLowerCase().contains("alignmentFill".toLowerCase()) && !configField.getName().toLowerCase().contains("unused")) {
throw new IllegalArgumentException("Need TS info for " + configField.getName() + " at "+ prefix);
}
tsHeader.write(";no TS info - skipping " + prefix + configField.getName() + " offset " + tsPosition); tsHeader.write(";no TS info - skipping " + prefix + configField.getName() + " offset " + tsPosition);
tsPosition += configField.getArraySize() * configField.getElementSize(); tsPosition += configField.getArraySize() * configField.getElementSize();
} else if (configField.getArraySize() != 1) { } else if (configField.getArraySize() != 1) {