diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index 8c1b384898..7737903e37 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -446,7 +446,7 @@ bit useTLE8888_stepper bit enableMapEstimationTableFallback;+If enabled, the MAP estimate table will be used if the MAP sensor fails to estimate manifold pressure based on RPM and TPS. bit useFSIOTableForCanSniffingFiltering bit issue_294_29 -bit artificialTestMisfire,"Danger Mode","No thank you";Experimental setting that will cause a misfire\nDO NOT ENABLE.; +bit artificialTestMisfire,"Danger Mode","No thank you";Experimental setting that will cause a misfire\nDO NOT ENABLE. bit issue_294_31,"si_example","nada_example" diff --git a/java_tools/ConfigDefinition.jar b/java_tools/ConfigDefinition.jar index 2489939bf3..cfcc4721b0 100644 Binary files a/java_tools/ConfigDefinition.jar and b/java_tools/ConfigDefinition.jar differ diff --git a/java_tools/configuration_definition/RusefiConfigGrammar.g4 b/java_tools/configuration_definition/RusefiConfigGrammar.g4 index d797a2c976..f8c25bfd6b 100644 --- a/java_tools/configuration_definition/RusefiConfigGrammar.g4 +++ b/java_tools/configuration_definition/RusefiConfigGrammar.g4 @@ -123,10 +123,9 @@ enumRhs enumTypedefSuffix: /*ignored*/integer Bits ',' Datatype ',' '@OFFSET@' ',' '[' integer ':' integer ']' ',' enumRhs ; scalarTypedefSuffix: /*ignored*/integer Scalar ',' Datatype ',' '@OFFSET@' fieldOptionsList ; -arrayTypedefSuffix: /*ignored*/arrayLengthSpec Array ',' Datatype ',' '@OFFSET@' ',' '[' arrayLengthSpec ']' fieldOptionsList; stringTypedefSuffix: /*ignored*/replacementIdent 'string' ',' 'ASCII' ',' '@OFFSET@' ',' numexpr; -typedef: Custom identifier (enumTypedefSuffix | scalarTypedefSuffix | arrayTypedefSuffix | stringTypedefSuffix); +typedef: Custom identifier (enumTypedefSuffix | scalarTypedefSuffix | stringTypedefSuffix); // Root statement is allowed to appear in the root of the file rootStatement diff --git a/java_tools/configuration_definition/src/main/java/com/rusefi/newparse/ParseState.java b/java_tools/configuration_definition/src/main/java/com/rusefi/newparse/ParseState.java index 15fda7a795..9f3c286e98 100644 --- a/java_tools/configuration_definition/src/main/java/com/rusefi/newparse/ParseState.java +++ b/java_tools/configuration_definition/src/main/java/com/rusefi/newparse/ParseState.java @@ -227,16 +227,6 @@ public class ParseState { typedefs.put(typedefName, new EnumTypedef(typedefName, datatype, endBit, values)); } - @Override - public void exitArrayTypedefSuffix(RusefiConfigGrammarParser.ArrayTypedefSuffixContext ctx) { - Type datatype = Type.findByTsType(ctx.Datatype().getText()); - - FieldOptions options = new FieldOptions(); - handleFieldOptionsList(options, ctx.fieldOptionsList()); - - typedefs.put(typedefName, new ArrayTypedef(ParseState.this.typedefName, this.arrayDim, datatype, options)); - } - @Override public void exitStringTypedefSuffix(RusefiConfigGrammarParser.StringTypedefSuffixContext ctx) { Double stringLength = ParseState.this.evalResults.remove(); @@ -344,17 +334,6 @@ public class ParseState { options = scTypedef.options.copy(); // Switch to the "real" type, that is the typedef's type type = scTypedef.type.cType; - } else if (typedef instanceof ArrayTypedef) { - ArrayTypedef arTypedef = (ArrayTypedef) typedef; - // Copy the typedef's options list - we don't want to edit it - options = arTypedef.options.copy(); - - // Merge the read-in options list with the default from the typedef (if exists) - handleFieldOptionsList(options, ctx.fieldOptionsList()); - - ScalarField prototype = new ScalarField(arTypedef.type, name, options, autoscale); - scope.structFields.add(new ArrayField<>(prototype, arTypedef.length, false)); - return; } else if (typedef instanceof EnumTypedef) { EnumTypedef bTypedef = (EnumTypedef) typedef; diff --git a/java_tools/configuration_definition/src/main/java/com/rusefi/newparse/parsing/ArrayTypedef.java b/java_tools/configuration_definition/src/main/java/com/rusefi/newparse/parsing/ArrayTypedef.java deleted file mode 100644 index d4523da5db..0000000000 --- a/java_tools/configuration_definition/src/main/java/com/rusefi/newparse/parsing/ArrayTypedef.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.rusefi.newparse.parsing; - -public class ArrayTypedef extends Typedef { - public final FieldOptions options; - public final Type type; - public final int[] length; - - public ArrayTypedef(String name, int[] length, Type type, FieldOptions options) { - super(name); - - this.length = length; - this.type = type; - this.options = options; - } -}