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

only:better name

This commit is contained in:
rusefillc 2023-07-03 15:05:11 -04:00
parent d09f464801
commit b985d28df2
4 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
java_tools/configuration_definition/src/main/java/com/rusefi/PinType.java
View File

@ -1,7 +1,5 @@
package com.rusefi;
import static com.rusefi.VariableRegistry.ENUM_SUFFIX;
public enum PinType {
OUTPUTS("output_pin_e", "Gpio", "Unassigned"),
ANALOG_INPUTS("adc_channel_e", "adc_channel_e", "EFI_ADC_NONE"),

8
java_tools/configuration_definition/src/main/java/com/rusefi/pinout/PinoutLogic.java
View File

@ -13,8 +13,8 @@ import java.io.*;
import java.util.*;
import static com.devexperts.logging.Logging.getLogging;
import static com.rusefi.VariableRegistry.FULL_JAVA_ENUM;
import static com.rusefi.VariableRegistry.ENUM_SUFFIX;
import static com.rusefi.VariableRegistry.ARRAY_FORMAT_ENUM;
import static com.rusefi.VariableRegistry.KEY_VALUE_FORMAT_ENUM;
import static com.rusefi.output.JavaSensorsConsumer.quote;
public class PinoutLogic {
@ -83,9 +83,9 @@ public class PinoutLogic {
EnumPair pair = enumToOptionsList(nothingName, enumList, kv.getValue());
if (pair.getArrayForm().length() > 0) {
// we seem to be here if specific pin category like switch_inputs has no pins
parseState.addDefinition(registry, outputEnumName + ENUM_SUFFIX, pair.getKeyValueForm(), Definition.OverwritePolicy.IgnoreNew);
parseState.addDefinition(registry, outputEnumName + KEY_VALUE_FORMAT_ENUM, pair.getKeyValueForm(), Definition.OverwritePolicy.IgnoreNew);
}
parseState.addDefinition(registry, outputEnumName + FULL_JAVA_ENUM, pair.getArrayForm(), Definition.OverwritePolicy.IgnoreNew);
parseState.addDefinition(registry, outputEnumName + ARRAY_FORMAT_ENUM, pair.getArrayForm(), Definition.OverwritePolicy.IgnoreNew);
}
}

4
java_tools/configuration_definition_base/src/main/java/com/rusefi/output/JavaFieldsConsumer.java
View File

@ -87,9 +87,9 @@ public abstract class JavaFieldsConsumer implements ConfigurationConsumer {
writeJavaFieldName(nameWithPrefix, tsPosition);
content.append("FieldType.FLOAT)" + terminateField());
} else {
String enumOptions = state.getVariableRegistry().get(configField.getType() + VariableRegistry.FULL_JAVA_ENUM);
String enumOptions = state.getVariableRegistry().get(configField.getType() + VariableRegistry.ARRAY_FORMAT_ENUM);
if (enumOptions == null)
enumOptions = state.getVariableRegistry().get(configField.getType() + VariableRegistry.ENUM_SUFFIX);
enumOptions = state.getVariableRegistry().get(configField.getType() + VariableRegistry.KEY_VALUE_FORMAT_ENUM);
if (enumOptions != null && !existingJavaEnums.contains(configField.getType())) {
existingJavaEnums.add(configField.getType());

8
java_tools/enum_to_string/src/main/java/com/rusefi/VariableRegistry.java
View File

@ -28,8 +28,8 @@ public class VariableRegistry {
public static final String _16_HEX_SUFFIX = "_16_hex";
public static final String _HEX_SUFFIX = "_hex";
public static final String CHAR_SUFFIX = "_char";
public static final String ENUM_SUFFIX = "_enum";
public static final String FULL_JAVA_ENUM = "_fullenum";
public static final String KEY_VALUE_FORMAT_ENUM = "_enum";
public static final String ARRAY_FORMAT_ENUM = "_fullenum";
public static final char MULT_TOKEN = '*';
public static final String DEFINE = "#define";
private static final String HEX_PREFIX = "0x";
@ -268,8 +268,8 @@ public class VariableRegistry {
} catch (NumberFormatException e) {
//SystemOut.println("Not an integer: " + value);
if (!var.trim().endsWith(ENUM_SUFFIX) &&
!var.trim().endsWith(FULL_JAVA_ENUM)) {
if (!var.trim().endsWith(KEY_VALUE_FORMAT_ENUM) &&
!var.trim().endsWith(ARRAY_FORMAT_ENUM)) {
if (isQuoted(value, '"')) {
// quoted and not with enum suffix means plain string define statement
javaDefinitions.put(var, "\tpublic static final String " + var + " = " + value + ";" + ToolUtil.EOL);