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

progress

This commit is contained in:
rusefi 2020-05-31 14:05:03 -04:00
parent c11a5be399
commit 0d0f8f6c60
5 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
firmware/integration/rusefi_config.txt
View File

@ -1535,6 +1535,7 @@ end_struct
#define CMD_TRIGGER_HW_INPUT "trigger_hw_input" #define CMD_TRIGGER_HW_INPUT "trigger_hw_input"
#define PROTOCOL_MSG "msg" #define PROTOCOL_MSG "msg"
#define PROTOCOL_HELLO_PREFIX "***"
#define PROTOCOL_OUTPIN "outpin" #define PROTOCOL_OUTPIN "outpin"
#define PROTOCOL_ANALOG_CHART "analog_chart" #define PROTOCOL_ANALOG_CHART "analog_chart"

3
java_console/models/src/com/rusefi/config/generated/Fields.java
View File

@ -1,6 +1,6 @@
package com.rusefi.config.generated; package com.rusefi.config.generated;
// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Sun May 31 13:45:22 EDT 2020 // this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Sun May 31 14:04:20 EDT 2020
// by class com.rusefi.output.FileJavaFieldsConsumer // by class com.rusefi.output.FileJavaFieldsConsumer
import com.rusefi.config.*; import com.rusefi.config.*;
@ -1007,6 +1007,7 @@ public class Fields {
public static final String PROTOCOL_ENGINE_SNIFFER = "wave_chart"; public static final String PROTOCOL_ENGINE_SNIFFER = "wave_chart";
public static final String PROTOCOL_ES_DOWN = "d"; public static final String PROTOCOL_ES_DOWN = "d";
public static final String PROTOCOL_ES_UP = "u"; public static final String PROTOCOL_ES_UP = "u";
public static final String PROTOCOL_HELLO_PREFIX = "***";
public static final String PROTOCOL_HIP_NAME = "HIP"; public static final String PROTOCOL_HIP_NAME = "HIP";
public static final String PROTOCOL_INJ1_SHORT_NAME = "i1"; public static final String PROTOCOL_INJ1_SHORT_NAME = "i1";
public static final String PROTOCOL_MSG = "msg"; public static final String PROTOCOL_MSG = "msg";

BIN
java_tools/ConfigDefinition.jar
View File

Binary file not shown.

2
java_tools/configuration_definition/src/com/rusefi/VariableRegistry.java
View File

@ -56,7 +56,7 @@ public class VariableRegistry {
} }
value = applyVariables(value); value = applyVariables(value);
int multPosition = value.indexOf(MULT_TOKEN); int multPosition = value.indexOf(MULT_TOKEN);
if (multPosition != -1) { if (!isQuoted(value, '"') && multPosition != -1) {
Integer first = Integer.valueOf(value.substring(0, multPosition)); Integer first = Integer.valueOf(value.substring(0, multPosition));
Integer second = Integer.valueOf(value.substring(multPosition + 1)); Integer second = Integer.valueOf(value.substring(multPosition + 1));
value = String.valueOf(first * second); value = String.valueOf(first * second);

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

@ -52,6 +52,17 @@ public class ConfigFieldParserTest {
assertEquals(16, TypesHelper.getElementSize(state, "pid_s")); assertEquals(16, TypesHelper.getElementSize(state, "pid_s"));
} }
@Test
public void manyStartAreNotMultiplication() throws IOException {
String test = "struct pid_s\n" +
"#define ERROR_BUFFER_SIZE \"***\"\n" +
"end_struct\n" +
"";
VariableRegistry.INSTANCE.clear();
BufferedReader reader = new BufferedReader(new StringReader(test));
new ReaderState().readBufferedReader(reader, Collections.emptyList());
}
@Test @Test
public void multiplicationInDefine() throws IOException { public void multiplicationInDefine() throws IOException {
String test = "struct pid_s\n" + String test = "struct pid_s\n" +