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

minor progress: generating less unused bit noise in java

This commit is contained in:
rusefillc 2022-11-26 00:25:16 -05:00
parent 5af47bdf24
commit 9619c17267
4 changed files with 5 additions and 66 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/output/JavaFieldsConsumer.java
View File

@ -73,8 +73,10 @@ public abstract class JavaFieldsConsumer implements ConfigurationConsumer {
String nameWithPrefix = prefix + configField.getName();
if (configField.isBit()) {
writeJavaFieldName(nameWithPrefix, tsPosition);
content.append("FieldType.BIT, " + bitIndex + ")" + terminateField());
if (!configField.getName().startsWith(DataLogConsumer.UNUSED)) {
writeJavaFieldName(nameWithPrefix, tsPosition);
content.append("FieldType.BIT, " + bitIndex + ")" + terminateField());
}
tsPosition += configField.getSize(next);
return tsPosition;
}

32
java_tools/configuration_definition/src/test/java/com/rusefi/test/ConfigFieldParserIssue1057Test.java
View File

@ -18,41 +18,9 @@ public class ConfigFieldParserIssue1057Test {
"int fieldName;\n" +
"end_struct\n";
state.readBufferedReader(inputString, javaFieldsConsumer);
assertEquals("\tpublic static final Field ACTIVATEAUXPID1 = Field.create(\"ACTIVATEAUXPID1\", 0, FieldType.BIT, 0);\n" +
"\tpublic static final Field UNUSEDBIT_1_1 = Field.create(\"UNUSEDBIT_1_1\", 0, FieldType.BIT, 1);\n" +
"\tpublic static final Field UNUSEDBIT_1_2 = Field.create(\"UNUSEDBIT_1_2\", 0, FieldType.BIT, 2);\n" +
"\tpublic static final Field UNUSEDBIT_1_3 = Field.create(\"UNUSEDBIT_1_3\", 0, FieldType.BIT, 3);\n" +
"\tpublic static final Field UNUSEDBIT_1_4 = Field.create(\"UNUSEDBIT_1_4\", 0, FieldType.BIT, 4);\n" +
"\tpublic static final Field UNUSEDBIT_1_5 = Field.create(\"UNUSEDBIT_1_5\", 0, FieldType.BIT, 5);\n" +
"\tpublic static final Field UNUSEDBIT_1_6 = Field.create(\"UNUSEDBIT_1_6\", 0, FieldType.BIT, 6);\n" +
"\tpublic static final Field UNUSEDBIT_1_7 = Field.create(\"UNUSEDBIT_1_7\", 0, FieldType.BIT, 7);\n" +
"\tpublic static final Field UNUSEDBIT_1_8 = Field.create(\"UNUSEDBIT_1_8\", 0, FieldType.BIT, 8);\n" +
"\tpublic static final Field UNUSEDBIT_1_9 = Field.create(\"UNUSEDBIT_1_9\", 0, FieldType.BIT, 9);\n" +
"\tpublic static final Field UNUSEDBIT_1_10 = Field.create(\"UNUSEDBIT_1_10\", 0, FieldType.BIT, 10);\n" +
"\tpublic static final Field UNUSEDBIT_1_11 = Field.create(\"UNUSEDBIT_1_11\", 0, FieldType.BIT, 11);\n" +
"\tpublic static final Field UNUSEDBIT_1_12 = Field.create(\"UNUSEDBIT_1_12\", 0, FieldType.BIT, 12);\n" +
"\tpublic static final Field UNUSEDBIT_1_13 = Field.create(\"UNUSEDBIT_1_13\", 0, FieldType.BIT, 13);\n" +
"\tpublic static final Field UNUSEDBIT_1_14 = Field.create(\"UNUSEDBIT_1_14\", 0, FieldType.BIT, 14);\n" +
"\tpublic static final Field UNUSEDBIT_1_15 = Field.create(\"UNUSEDBIT_1_15\", 0, FieldType.BIT, 15);\n" +
"\tpublic static final Field UNUSEDBIT_1_16 = Field.create(\"UNUSEDBIT_1_16\", 0, FieldType.BIT, 16);\n" +
"\tpublic static final Field UNUSEDBIT_1_17 = Field.create(\"UNUSEDBIT_1_17\", 0, FieldType.BIT, 17);\n" +
"\tpublic static final Field UNUSEDBIT_1_18 = Field.create(\"UNUSEDBIT_1_18\", 0, FieldType.BIT, 18);\n" +
"\tpublic static final Field UNUSEDBIT_1_19 = Field.create(\"UNUSEDBIT_1_19\", 0, FieldType.BIT, 19);\n" +
"\tpublic static final Field UNUSEDBIT_1_20 = Field.create(\"UNUSEDBIT_1_20\", 0, FieldType.BIT, 20);\n" +
"\tpublic static final Field UNUSEDBIT_1_21 = Field.create(\"UNUSEDBIT_1_21\", 0, FieldType.BIT, 21);\n" +
"\tpublic static final Field UNUSEDBIT_1_22 = Field.create(\"UNUSEDBIT_1_22\", 0, FieldType.BIT, 22);\n" +
"\tpublic static final Field UNUSEDBIT_1_23 = Field.create(\"UNUSEDBIT_1_23\", 0, FieldType.BIT, 23);\n" +
"\tpublic static final Field UNUSEDBIT_1_24 = Field.create(\"UNUSEDBIT_1_24\", 0, FieldType.BIT, 24);\n" +
"\tpublic static final Field UNUSEDBIT_1_25 = Field.create(\"UNUSEDBIT_1_25\", 0, FieldType.BIT, 25);\n" +
"\tpublic static final Field UNUSEDBIT_1_26 = Field.create(\"UNUSEDBIT_1_26\", 0, FieldType.BIT, 26);\n" +
"\tpublic static final Field UNUSEDBIT_1_27 = Field.create(\"UNUSEDBIT_1_27\", 0, FieldType.BIT, 27);\n" +
"\tpublic static final Field UNUSEDBIT_1_28 = Field.create(\"UNUSEDBIT_1_28\", 0, FieldType.BIT, 28);\n" +
"\tpublic static final Field UNUSEDBIT_1_29 = Field.create(\"UNUSEDBIT_1_29\", 0, FieldType.BIT, 29);\n" +
"\tpublic static final Field UNUSEDBIT_1_30 = Field.create(\"UNUSEDBIT_1_30\", 0, FieldType.BIT, 30);\n" +
"\tpublic static final Field UNUSEDBIT_1_31 = Field.create(\"UNUSEDBIT_1_31\", 0, FieldType.BIT, 31);\n" +
"\tpublic static final Field FIELDNAME = Field.create(\"FIELDNAME\", 4, FieldType.INT).setScale(1.0);\n",
javaFieldsConsumer.getContent());
}

33
java_tools/configuration_definition/src/test/java/com/rusefi/test/ConfigFieldParserTest.java
View File

@ -369,38 +369,7 @@ public class ConfigFieldParserTest {
"\tpublic static final Field INT2 = Field.create(\"INT2\", 4, FieldType.INT).setScale(1.0);\n" +
"\tpublic static final Field BYTE2 = Field.create(\"BYTE2\", 8, FieldType.INT8).setScale(1.0);\n" +
"\tpublic static final Field ALIGNMENTFILL_AT_9 = Field.create(\"ALIGNMENTFILL_AT_9\", 9, FieldType.INT8).setScale(1.0);\n" +
"\tpublic static final Field PERIODMS = Field.create(\"PERIODMS\", 12, FieldType.BIT, 0);\n" +
"\tpublic static final Field UNUSEDBIT_7_1 = Field.create(\"UNUSEDBIT_7_1\", 12, FieldType.BIT, 1);\n" +
"\tpublic static final Field UNUSEDBIT_7_2 = Field.create(\"UNUSEDBIT_7_2\", 12, FieldType.BIT, 2);\n" +
"\tpublic static final Field UNUSEDBIT_7_3 = Field.create(\"UNUSEDBIT_7_3\", 12, FieldType.BIT, 3);\n" +
"\tpublic static final Field UNUSEDBIT_7_4 = Field.create(\"UNUSEDBIT_7_4\", 12, FieldType.BIT, 4);\n" +
"\tpublic static final Field UNUSEDBIT_7_5 = Field.create(\"UNUSEDBIT_7_5\", 12, FieldType.BIT, 5);\n" +
"\tpublic static final Field UNUSEDBIT_7_6 = Field.create(\"UNUSEDBIT_7_6\", 12, FieldType.BIT, 6);\n" +
"\tpublic static final Field UNUSEDBIT_7_7 = Field.create(\"UNUSEDBIT_7_7\", 12, FieldType.BIT, 7);\n" +
"\tpublic static final Field UNUSEDBIT_7_8 = Field.create(\"UNUSEDBIT_7_8\", 12, FieldType.BIT, 8);\n" +
"\tpublic static final Field UNUSEDBIT_7_9 = Field.create(\"UNUSEDBIT_7_9\", 12, FieldType.BIT, 9);\n" +
"\tpublic static final Field UNUSEDBIT_7_10 = Field.create(\"UNUSEDBIT_7_10\", 12, FieldType.BIT, 10);\n" +
"\tpublic static final Field UNUSEDBIT_7_11 = Field.create(\"UNUSEDBIT_7_11\", 12, FieldType.BIT, 11);\n" +
"\tpublic static final Field UNUSEDBIT_7_12 = Field.create(\"UNUSEDBIT_7_12\", 12, FieldType.BIT, 12);\n" +
"\tpublic static final Field UNUSEDBIT_7_13 = Field.create(\"UNUSEDBIT_7_13\", 12, FieldType.BIT, 13);\n" +
"\tpublic static final Field UNUSEDBIT_7_14 = Field.create(\"UNUSEDBIT_7_14\", 12, FieldType.BIT, 14);\n" +
"\tpublic static final Field UNUSEDBIT_7_15 = Field.create(\"UNUSEDBIT_7_15\", 12, FieldType.BIT, 15);\n" +
"\tpublic static final Field UNUSEDBIT_7_16 = Field.create(\"UNUSEDBIT_7_16\", 12, FieldType.BIT, 16);\n" +
"\tpublic static final Field UNUSEDBIT_7_17 = Field.create(\"UNUSEDBIT_7_17\", 12, FieldType.BIT, 17);\n" +
"\tpublic static final Field UNUSEDBIT_7_18 = Field.create(\"UNUSEDBIT_7_18\", 12, FieldType.BIT, 18);\n" +
"\tpublic static final Field UNUSEDBIT_7_19 = Field.create(\"UNUSEDBIT_7_19\", 12, FieldType.BIT, 19);\n" +
"\tpublic static final Field UNUSEDBIT_7_20 = Field.create(\"UNUSEDBIT_7_20\", 12, FieldType.BIT, 20);\n" +
"\tpublic static final Field UNUSEDBIT_7_21 = Field.create(\"UNUSEDBIT_7_21\", 12, FieldType.BIT, 21);\n" +
"\tpublic static final Field UNUSEDBIT_7_22 = Field.create(\"UNUSEDBIT_7_22\", 12, FieldType.BIT, 22);\n" +
"\tpublic static final Field UNUSEDBIT_7_23 = Field.create(\"UNUSEDBIT_7_23\", 12, FieldType.BIT, 23);\n" +
"\tpublic static final Field UNUSEDBIT_7_24 = Field.create(\"UNUSEDBIT_7_24\", 12, FieldType.BIT, 24);\n" +
"\tpublic static final Field UNUSEDBIT_7_25 = Field.create(\"UNUSEDBIT_7_25\", 12, FieldType.BIT, 25);\n" +
"\tpublic static final Field UNUSEDBIT_7_26 = Field.create(\"UNUSEDBIT_7_26\", 12, FieldType.BIT, 26);\n" +
"\tpublic static final Field UNUSEDBIT_7_27 = Field.create(\"UNUSEDBIT_7_27\", 12, FieldType.BIT, 27);\n" +
"\tpublic static final Field UNUSEDBIT_7_28 = Field.create(\"UNUSEDBIT_7_28\", 12, FieldType.BIT, 28);\n" +
"\tpublic static final Field UNUSEDBIT_7_29 = Field.create(\"UNUSEDBIT_7_29\", 12, FieldType.BIT, 29);\n" +
"\tpublic static final Field UNUSEDBIT_7_30 = Field.create(\"UNUSEDBIT_7_30\", 12, FieldType.BIT, 30);\n" +
"\tpublic static final Field UNUSEDBIT_7_31 = Field.create(\"UNUSEDBIT_7_31\", 12, FieldType.BIT, 31);\n",
"\tpublic static final Field PERIODMS = Field.create(\"PERIODMS\", 12, FieldType.BIT, 0);\n",
javaFieldsConsumer.getContent());
assertEquals("// start of pid_s\n" +
"struct pid_s {\n" +