From 9cac07a0c66d76b74de5a17a09345c4c306af147 Mon Sep 17 00:00:00 2001 From: rusEfi Date: Wed, 8 Apr 2015 18:06:26 -0500 Subject: [PATCH] auto-sync --- firmware/config/engines/bmw_e34.cpp | 2 +- firmware/controllers/settings.cpp | 3 +++ firmware/integration/rusefi_config.txt | 1 + firmware/tunerstudio/rusefi.ini | 8 +++++--- java_console/ui/src/com/rusefi/Launcher.java | 2 +- java_console/ui/src/com/rusefi/ui/RecentCommands.java | 2 +- 6 files changed, 12 insertions(+), 6 deletions(-) diff --git a/firmware/config/engines/bmw_e34.cpp b/firmware/config/engines/bmw_e34.cpp index ea3237a9ab..d4c1bd9261 100644 --- a/firmware/config/engines/bmw_e34.cpp +++ b/firmware/config/engines/bmw_e34.cpp @@ -42,7 +42,7 @@ void setBmwE34(DECLARE_ENGINE_PARAMETER_F) { setOperationMode(engineConfiguration, FOUR_STROKE_CRANK_SENSOR); engineConfiguration->trigger.type = TT_TOOTHED_WHEEL_60_2; - engineConfiguration->injectionMode = IM_BATCH; + engineConfiguration->injectionMode = IM_SEQUENTIAL; boardConfiguration->triggerInputPins[0] = GPIOA_5; boardConfiguration->triggerInputPins[1] = GPIO_UNASSIGNED; diff --git a/firmware/controllers/settings.cpp b/firmware/controllers/settings.cpp index bd84caf5b5..85b8f50dc7 100644 --- a/firmware/controllers/settings.cpp +++ b/firmware/controllers/settings.cpp @@ -780,6 +780,9 @@ static void enableOrDisable(const char *param, bool isEnabled) { boardConfiguration->isFastAdcEnabled = isEnabled; } else if (strEqualCaseInsensitive(param, "stepperidle")) { boardConfiguration->useStepperIdle = isEnabled; + } else if (strEqualCaseInsensitive(param, "two_wire_batch")) { + engineConfiguration->twoWireBatch = isEnabled; + incrementGlobalConfigurationVersion(); } else if (strEqualCaseInsensitive(param, "joystick")) { engineConfiguration->isJoystickEnabled = isEnabled; } else if (strEqualCaseInsensitive(param, "HIP9011")) { diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index 7994975617..6f6fa7784e 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -159,6 +159,7 @@ end_struct int rpmHardLimit;;"rpm", 1, 0, 0, 10000.0, 2 +custom injection_mode_e 4 bits, U32, @OFFSET@, [0:1], "Simultaneous", "Sequential", "Batch", "INVALID" injection_mode_e crankingInjectionMode; injection_mode_e injectionMode; diff --git a/firmware/tunerstudio/rusefi.ini b/firmware/tunerstudio/rusefi.ini index 495ec84270..0f7d5fd265 100644 --- a/firmware/tunerstudio/rusefi.ini +++ b/firmware/tunerstudio/rusefi.ini @@ -40,7 +40,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated by ConfigDefinition.jar on Wed Apr 08 17:44:34 EDT 2015 +; this section was generated by ConfigDefinition.jar on Wed Apr 08 17:54:54 EDT 2015 pageSize = 15288 page = 1 @@ -99,8 +99,8 @@ page = 1 cylindersCount = bits, U32, 416, [0:3], "INVALID", 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, "INVALID", "INVALID", "INVALID" firingOrder = bits, U32, 420, [0:3], "One Cylinder", "1-3-4-2", "1-2-4-3", "1-3-2-4", "1-5-3-6-2-4", "1-8-4-3-6-5-7-2", "1-5-3-6-2-4", "1-4-2-5-3-6", "1-2", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" rpmHardLimit = scalar, S32, 424, "rpm", 1, 0, 0, 10000.0, 2 -;skipping crankingInjectionMode offset 428 -;skipping injectionMode offset 432 + crankingInjectionMode = bits, U32, 428, [0:1], "Simultaneous", "Sequential", "Batch", "INVALID" + injectionMode = bits, U32, 432, [0:1], "Simultaneous", "Sequential", "Batch", "INVALID" globalTriggerAngleOffset = scalar, F32, 436, "deg", 1, 0, 0, 720, 0 analogInputDividerCoefficient = scalar, F32, 440, "coef", 1, 0, 0.01, 10.0, 2 algorithm = bits, U32, 444, [0:1], "MAF", "Alpha-N/TPS", "MAP", "SPEED DENSITY" @@ -937,6 +937,7 @@ fileVersion = { 20150406 } field = "Engine Displacement", displacement field = "" field = "Firing Order", firingOrder + field = "Injection Mode", injectionMode field = "Ignition Mode", ignitionMode field = "Timing Mode", timingMode field = "" @@ -1231,6 +1232,7 @@ fileVersion = { 20150406 } ; Tuning->Cranking dialog = cranking, "Cranking" field = "Cranking RPM limit", cranking_rpm + field = "Cranking Injection Mode", crankingInjectionMode field = "" field = "Base cranking Pulse Width", cranking_baseFuel field = "" diff --git a/java_console/ui/src/com/rusefi/Launcher.java b/java_console/ui/src/com/rusefi/Launcher.java index cb568fa708..1eac3077e9 100644 --- a/java_console/ui/src/com/rusefi/Launcher.java +++ b/java_console/ui/src/com/rusefi/Launcher.java @@ -32,7 +32,7 @@ import static com.rusefi.ui.storage.PersistentConfiguration.getConfig; * @see com.rusefi.StartupFrame */ public class Launcher { - public static final int CONSOLE_VERSION = 20150407; + public static final int CONSOLE_VERSION = 20150408; public static final boolean SHOW_STIMULATOR = false; private static final String TAB_INDEX = "main_tab"; protected static final String PORT_KEY = "port"; diff --git a/java_console/ui/src/com/rusefi/ui/RecentCommands.java b/java_console/ui/src/com/rusefi/ui/RecentCommands.java index 9af7cf24b5..e31dcde183 100644 --- a/java_console/ui/src/com/rusefi/ui/RecentCommands.java +++ b/java_console/ui/src/com/rusefi/ui/RecentCommands.java @@ -18,7 +18,7 @@ import static com.rusefi.ui.storage.PersistentConfiguration.getConfig; */ public class RecentCommands { - private final static int NUMBER_OF_COMMANDS = 20; + private final static int NUMBER_OF_COMMANDS = 40; private static final String KEY = "recent_commands"; private static final String DELIMETER = "|";