From 74ede6db64bf3dbb6cd42f736d3ff3539f721568 Mon Sep 17 00:00:00 2001 From: rusefi Date: Fri, 22 May 2020 00:25:48 -0400 Subject: [PATCH] would this help? --- firmware/controllers/algo/rusefi_enums.h | 4 ++-- firmware/integration/rusefi_config.txt | 3 +++ java_console/autotest/src/com/rusefi/AutoTest.java | 3 ++- .../models/src/com/rusefi/config/generated/Fields.java | 4 +++- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/firmware/controllers/algo/rusefi_enums.h b/firmware/controllers/algo/rusefi_enums.h index 18bc3a4592..4f64e6a857 100644 --- a/firmware/controllers/algo/rusefi_enums.h +++ b/firmware/controllers/algo/rusefi_enums.h @@ -68,7 +68,7 @@ typedef enum { FORD_ESCORT_GT = 14, - MRE_MIATA_NB2_MAF = 15, + MRE_MIATA_NB2_MAF = ET_MRE_MIATA_NB2_MAF, MITSU_4G93 = 16, @@ -187,7 +187,7 @@ typedef enum { BMW_M73_PROTEUS = 63, DODGE_RAM = 64, - CITROEN_TU3JP = 65, + CITROEN_TU3JP = ET_CITROEN_TU3JP, /** * this configuration has as few pins configured as possible diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index 2e9ed1130b..e1398a204e 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -1564,6 +1564,9 @@ end_struct #define PROTOCOL_COIL1_SHORT_NAME "c1" #define PROTOCOL_INJ1_SHORT_NAME "i1" +#define ET_CITROEN_TU3JP 65 +#define ET_MRE_MIATA_NB2_MAF 15 + #define GAUGE_NAME_DWELL_DUTY "dwell: coil duty cycle" #define GAUGE_COIL_DWELL_TIME "dwell: coil charge time" diff --git a/java_console/autotest/src/com/rusefi/AutoTest.java b/java_console/autotest/src/com/rusefi/AutoTest.java index 1288053de4..09e120e90d 100644 --- a/java_console/autotest/src/com/rusefi/AutoTest.java +++ b/java_console/autotest/src/com/rusefi/AutoTest.java @@ -18,6 +18,7 @@ import java.util.function.Function; import static com.rusefi.IoUtil.*; import static com.rusefi.IoUtil.getEnableCommand; import static com.rusefi.TestingUtils.*; +import static com.rusefi.config.generated.Fields.ET_CITROEN_TU3JP; import static com.rusefi.config.generated.Fields.MOCK_MAF_COMMAND; import static com.rusefi.waves.EngineReport.isCloseEnough; @@ -179,7 +180,7 @@ this is just too unreliable at this point :( } private static void testCitroenBerlingo() { - setEngineType(65); + setEngineType(ET_CITROEN_TU3JP); String msg = "Citroen"; IoUtil.changeRpm(1200); // todo: add more content diff --git a/java_console/models/src/com/rusefi/config/generated/Fields.java b/java_console/models/src/com/rusefi/config/generated/Fields.java index 1d7c556d1d..bc584f7ccc 100644 --- a/java_console/models/src/com/rusefi/config/generated/Fields.java +++ b/java_console/models/src/com/rusefi/config/generated/Fields.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Wed May 20 01:18:09 EDT 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Fri May 22 00:18:18 EDT 2020 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -388,6 +388,8 @@ public class Fields { public static final int engineType_offset = 0; public static final int engineType_offset_hex = 0; public static final int ERROR_BUFFER_SIZE = 120; + public static final int ET_CITROEN_TU3JP = 65; + public static final int ET_MRE_MIATA_NB2_MAF = 15; public static final int ETB_BIAS_CURVE_LENGTH = 8; public static final int ETB_COUNT = 2; public static final int etb_dFactor_offset = 1744;