From 4da57da755f640339cd3bd78cce9d5a0581b33c8 Mon Sep 17 00:00:00 2001 From: rusEfi Date: Fri, 9 Aug 2019 19:11:15 -0400 Subject: [PATCH] MRE test --- firmware/config/engines/custom_engine.cpp | 14 ++++++++++++-- java_console/ui/src/com/rusefi/Launcher.java | 2 +- java_console/ui/src/com/rusefi/PresetsPane.java | 4 +++- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/firmware/config/engines/custom_engine.cpp b/firmware/config/engines/custom_engine.cpp index 2f4ef476ae..c9930164f7 100644 --- a/firmware/config/engines/custom_engine.cpp +++ b/firmware/config/engines/custom_engine.cpp @@ -425,6 +425,11 @@ void setTle8888TestConfiguration(DECLARE_CONFIG_PARAMETER_SIGNATURE) { * set engine_type 30 */ void mreBoardTest(DECLARE_CONFIG_PARAMETER_SIGNATURE) { + engineConfiguration->directSelfStimulation = true; // this engine type is used for board validation + + boardConfiguration->triggerSimulatorFrequency = 300; + engineConfiguration->cranking.rpm = 100; + engineConfiguration->injectionMode = IM_SEQUENTIAL; // EFI_ADC_1: "23 - AN temp 2" // test harness: Red/Green, 2K PD. expected 2.0v @@ -459,11 +464,16 @@ void mreBoardTest(DECLARE_CONFIG_PARAMETER_SIGNATURE) { // TPS tps1_1AdcChannel EFI_ADC_13 - engineConfiguration->specs.cylindersCount = 6; - engineConfiguration->specs.firingOrder = FO_1_5_3_6_2_4; + engineConfiguration->specs.cylindersCount = 10; + engineConfiguration->specs.firingOrder = FO_1_10_9_4_3_6_5_8_7_2; // fix res boardConfiguration->ignitionPins[4] = GPIOD_6; // fix res boardConfiguration->ignitionPins[5] = GPIOD_7; + // TLE8888_PIN_20: "33 - GP Out 3" + boardConfiguration->injectionPins[4] = TLE8888_PIN_20; + // GPIOE_7: "34 - GP Out 2" + boardConfiguration->injectionPins[5] = GPIOE_7; + } diff --git a/java_console/ui/src/com/rusefi/Launcher.java b/java_console/ui/src/com/rusefi/Launcher.java index 2fb5bba5ff..dd933b2987 100644 --- a/java_console/ui/src/com/rusefi/Launcher.java +++ b/java_console/ui/src/com/rusefi/Launcher.java @@ -47,7 +47,7 @@ import static com.rusefi.ui.storage.PersistentConfiguration.getConfig; * @see EngineSnifferPanel */ public class Launcher { - public static final int CONSOLE_VERSION = 20190807; + public static final int CONSOLE_VERSION = 20190809; public static final String INPUT_FILES_PATH = ".."; private static final String TAB_INDEX = "main_tab"; protected static final String PORT_KEY = "port"; diff --git a/java_console/ui/src/com/rusefi/PresetsPane.java b/java_console/ui/src/com/rusefi/PresetsPane.java index d077771d28..69899b994c 100644 --- a/java_console/ui/src/com/rusefi/PresetsPane.java +++ b/java_console/ui/src/com/rusefi/PresetsPane.java @@ -12,6 +12,7 @@ import java.awt.event.ActionListener; */ public class PresetsPane { // see rusefi_enums.h + private static final int MRE_BOARD_TEST = 30; private static final int MIATA_NA6_MAP = 41; private static final int MIATA_NA6_VAF = 57; private static final int MAZDA_MIATA_2003 = 47; @@ -25,9 +26,10 @@ public class PresetsPane { content.add(new SetEngineTypeCommandControl("Miata NA6 Stage 0", "engines/miata_na.png", MIATA_NA6_VAF).getContent()); content.add(new SetEngineTypeCommandControl("Miata NA6 Stage 1", "engines/miata_na.png", MIATA_NA6_MAP).getContent()); content.add(new SetEngineTypeCommandControl("Miata NB2", "engines/miata_nb.png", MAZDA_MIATA_2003).getContent()); - content.add(new SetEngineTypeCommandControl("V12", "engines/v12", TEST_V_12).getContent()); + content.add(new SetEngineTypeCommandControl("Frankenso V12", "engines/v12", TEST_V_12).getContent()); content.add(new SetEngineTypeCommandControl("ETB bench", "", ETB_BENCH).getContent()); content.add(new SetEngineTypeCommandControl("Minimal", "", MINIMAL_PINS).getContent()); + content.add(new SetEngineTypeCommandControl("MRE test", "", MRE_BOARD_TEST).getContent()); } public JPanel getContent() {