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

auto-sync

This commit is contained in:
rusEfi 2015-04-08 18:06:26 -05:00
parent 19360ba7f0
commit 9cac07a0c6
6 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
firmware/config/engines/bmw_e34.cpp
View File

@ -42,7 +42,7 @@ void setBmwE34(DECLARE_ENGINE_PARAMETER_F) {
setOperationMode(engineConfiguration, FOUR_STROKE_CRANK_SENSOR); setOperationMode(engineConfiguration, FOUR_STROKE_CRANK_SENSOR);
engineConfiguration->trigger.type = TT_TOOTHED_WHEEL_60_2; engineConfiguration->trigger.type = TT_TOOTHED_WHEEL_60_2;
engineConfiguration->injectionMode = IM_BATCH; engineConfiguration->injectionMode = IM_SEQUENTIAL;
boardConfiguration->triggerInputPins[0] = GPIOA_5; boardConfiguration->triggerInputPins[0] = GPIOA_5;
boardConfiguration->triggerInputPins[1] = GPIO_UNASSIGNED; boardConfiguration->triggerInputPins[1] = GPIO_UNASSIGNED;

3
firmware/controllers/settings.cpp
View File

@ -780,6 +780,9 @@ static void enableOrDisable(const char *param, bool isEnabled) {
boardConfiguration->isFastAdcEnabled = isEnabled; boardConfiguration->isFastAdcEnabled = isEnabled;
} else if (strEqualCaseInsensitive(param, "stepperidle")) { } else if (strEqualCaseInsensitive(param, "stepperidle")) {
boardConfiguration->useStepperIdle = isEnabled; boardConfiguration->useStepperIdle = isEnabled;
} else if (strEqualCaseInsensitive(param, "two_wire_batch")) {
engineConfiguration->twoWireBatch = isEnabled;
incrementGlobalConfigurationVersion();
} else if (strEqualCaseInsensitive(param, "joystick")) { } else if (strEqualCaseInsensitive(param, "joystick")) {
engineConfiguration->isJoystickEnabled = isEnabled; engineConfiguration->isJoystickEnabled = isEnabled;
} else if (strEqualCaseInsensitive(param, "HIP9011")) { } else if (strEqualCaseInsensitive(param, "HIP9011")) {

1
firmware/integration/rusefi_config.txt
View File

@ -159,6 +159,7 @@ end_struct
int rpmHardLimit;;"rpm", 1, 0, 0, 10000.0, 2 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 crankingInjectionMode;
injection_mode_e injectionMode; injection_mode_e injectionMode;

8
firmware/tunerstudio/rusefi.ini
View File

@ -40,7 +40,7 @@ enable2ndByteCanID = false
; see PAGE_0_SIZE in C source code ; see PAGE_0_SIZE in C source code
; CONFIG_DEFINITION_START ; 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 pageSize = 15288
page = 1 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" 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" 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 rpmHardLimit = scalar, S32, 424, "rpm", 1, 0, 0, 10000.0, 2
;skipping crankingInjectionMode offset 428 crankingInjectionMode = bits, U32, 428, [0:1], "Simultaneous", "Sequential", "Batch", "INVALID"
;skipping injectionMode offset 432 injectionMode = bits, U32, 432, [0:1], "Simultaneous", "Sequential", "Batch", "INVALID"
globalTriggerAngleOffset = scalar, F32, 436, "deg", 1, 0, 0, 720, 0 globalTriggerAngleOffset = scalar, F32, 436, "deg", 1, 0, 0, 720, 0
analogInputDividerCoefficient = scalar, F32, 440, "coef", 1, 0, 0.01, 10.0, 2 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" algorithm = bits, U32, 444, [0:1], "MAF", "Alpha-N/TPS", "MAP", "SPEED DENSITY"
@ -937,6 +937,7 @@ fileVersion = { 20150406 }
field = "Engine Displacement", displacement field = "Engine Displacement", displacement
field = "" field = ""
field = "Firing Order", firingOrder field = "Firing Order", firingOrder
field = "Injection Mode", injectionMode
field = "Ignition Mode", ignitionMode field = "Ignition Mode", ignitionMode
field = "Timing Mode", timingMode field = "Timing Mode", timingMode
field = "" field = ""
@ -1231,6 +1232,7 @@ fileVersion = { 20150406 }
; Tuning->Cranking ; Tuning->Cranking
dialog = cranking, "Cranking" dialog = cranking, "Cranking"
field = "Cranking RPM limit", cranking_rpm field = "Cranking RPM limit", cranking_rpm
field = "Cranking Injection Mode", crankingInjectionMode
field = "" field = ""
field = "Base cranking Pulse Width", cranking_baseFuel field = "Base cranking Pulse Width", cranking_baseFuel
field = "" field = ""

2
java_console/ui/src/com/rusefi/Launcher.java
View File

@ -32,7 +32,7 @@ import static com.rusefi.ui.storage.PersistentConfiguration.getConfig;
* @see com.rusefi.StartupFrame * @see com.rusefi.StartupFrame
*/ */
public class Launcher { public class Launcher {
public static final int CONSOLE_VERSION = 20150407; public static final int CONSOLE_VERSION = 20150408;
public static final boolean SHOW_STIMULATOR = false; public static final boolean SHOW_STIMULATOR = false;
private static final String TAB_INDEX = "main_tab"; private static final String TAB_INDEX = "main_tab";
protected static final String PORT_KEY = "port"; protected static final String PORT_KEY = "port";

2
java_console/ui/src/com/rusefi/ui/RecentCommands.java
View File

@ -18,7 +18,7 @@ import static com.rusefi.ui.storage.PersistentConfiguration.getConfig;
*/ */
public class RecentCommands { 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 KEY = "recent_commands";
private static final String DELIMETER = "|"; private static final String DELIMETER = "|";