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

auto-sync

This commit is contained in:
rusEfi 2016-07-20 23:03:00 -04:00
parent ea6d8bfd38
commit 4d48e6d2d1
5 changed files with 2056 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
firmware/integration/rusefi_config.txt
View File

@ -10,6 +10,19 @@
! all the sub-structures are going to be nested withint the primary structure, that's ! all the sub-structures are going to be nested withint the primary structure, that's
! needed to get a proper TunerStudio file ! needed to get a proper TunerStudio file
! this section is auto-generated by FiringOrderTSLogic.java
#define ignitionPin2logic || ((firingOrder == 2) || (firingOrder == 7) || (firingOrder == 9) || (firingOrder == 11) || (firingOrder == 12))
#define ignitionPin3logic || ((firingOrder == 1) || (firingOrder == 3) || (firingOrder == 4) || (firingOrder == 5) || (firingOrder == 9))
#define ignitionPin4logic || ((firingOrder == 5) || (firingOrder == 7) || (firingOrder == 12))
#define ignitionPin5logic || ((firingOrder == 4) || (firingOrder == 12))
#define ignitionPin6logic
#define ignitionPin7logic || ((firingOrder == 11))
#define ignitionPin8logic || ((firingOrder == 5) || (firingOrder == 11))
#define ignitionPin9logic
#define ignitionPin10logic
#define ignitionPin11logic
#define ignitionPin12logic
struct persistent_config_s struct persistent_config_s
struct_no_prefix engine_configuration_s struct_no_prefix engine_configuration_s

18
firmware/tunerstudio/rusefi.ini
View File

@ -42,7 +42,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 automatically by ConfigDefinition.jar based on rusefi_config.txt Tue Jul 19 09:56:19 EDT 2016 ; this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Wed Jul 20 22:02:37 EDT 2016
pageSize = 16376 pageSize = 16376
page = 1 page = 1
@ -1242,7 +1242,7 @@ fileVersion = { 20160702 }
entry = debugIntField3, "debug i3",int,"%d" entry = debugIntField3, "debug i3",int,"%d"
entry = warningCounter, "warn",int,"%d" entry = warningCounter, "warn",int,"%d"
entry = lastErrorCode, "error",int,"%d" entry = lastErrorCode, "error",int,"%d"
entry = internalMcuTemperature, "int temp",float,""%.2f" entry = internalMcuTemperature, "int temp",float,"%.2f"
entry = tCharge, "tCharge",float,"%.3f" entry = tCharge, "tCharge",float,"%.3f"
@ -1478,13 +1478,13 @@ cmd_test_idle_valve = "w\x00\x17\x00\x01"
dialog = ignitionOutputs, "Ignition Outputs" dialog = ignitionOutputs, "Ignition Outputs"
field = "Ignition Pin Mode", ignitionPinMode field = "Ignition Pin Mode", ignitionPinMode
field = "Ignition Pin 1", ignitionPins1 field = "Ignition Pin 1", ignitionPins1
field = "Ignition Pin 2", ignitionPins2, {ignitionMode != 0 && cylindersCount > 1} field = "Ignition Pin 2", ignitionPins2, {(ignitionMode != 0 && cylindersCount > 1) && (ignitionMode !=2 || twoWireBatchIgnition == 1 || ((firingOrder == 2) || (firingOrder == 7) || (firingOrder == 9) || (firingOrder == 11) || (firingOrder == 12)))}
field = "Ignition Pin 3", ignitionPins3, {ignitionMode != 0 && cylindersCount > 2} field = "Ignition Pin 3", ignitionPins3, {(ignitionMode != 0 && cylindersCount > 2) && (ignitionMode !=2 || twoWireBatchIgnition == 1 || ((firingOrder == 1) || (firingOrder == 3) || (firingOrder == 4) || (firingOrder == 5) || (firingOrder == 9)))}
field = "Ignition Pin 4", ignitionPins4, {ignitionMode != 0 && cylindersCount > 3} field = "Ignition Pin 4", ignitionPins4, {(ignitionMode != 0 && cylindersCount > 3) && (ignitionMode !=2 || twoWireBatchIgnition == 1 || ((firingOrder == 5) || (firingOrder == 7) || (firingOrder == 12)))}
field = "Ignition Pin 5", ignitionPins5, {ignitionMode != 0 && cylindersCount > 4} field = "Ignition Pin 5", ignitionPins5, {(ignitionMode != 0 && cylindersCount > 4) && (ignitionMode !=2 || twoWireBatchIgnition == 1 || ((firingOrder == 4) || (firingOrder == 12)))}
field = "Ignition Pin 6", ignitionPins6, {ignitionMode != 0 && cylindersCount > 5} field = "Ignition Pin 6", ignitionPins6, {(ignitionMode != 0 && cylindersCount > 5) && (ignitionMode !=2 || twoWireBatchIgnition == 1 )}
field = "Ignition Pin 7", ignitionPins7, {ignitionMode != 0 && cylindersCount > 6} field = "Ignition Pin 7", ignitionPins7, {(ignitionMode != 0 && cylindersCount > 6) && (ignitionMode !=2 || twoWireBatchIgnition == 1 || ((firingOrder == 11)))}
field = "Ignition Pin 8", ignitionPins8, {ignitionMode != 0 && cylindersCount > 7} field = "Ignition Pin 8", ignitionPins8, {(ignitionMode != 0 && cylindersCount > 7) && (ignitionMode !=2 || twoWireBatchIgnition == 1 || ((firingOrder == 5) || (firingOrder == 11)))}
field = "This is useful to have tachometer working while converting from distributor" field = "This is useful to have tachometer working while converting from distributor"
field = "Dizzy out Pin", dizzySparkOutputPin field = "Dizzy out Pin", dizzySparkOutputPin
field = "Dizzy out Pin Mode", dizzySparkOutputPinMode field = "Dizzy out Pin Mode", dizzySparkOutputPinMode

2008
firmware/tunerstudio/rusefi.input Normal file
View File

File diff suppressed because it is too large Load Diff

22
java_console/.idea/runConfigurations/FiringOrderTSLogic.xml Normal file
View File

@ -0,0 +1,22 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="FiringOrderTSLogic" type="Application" factoryName="Application" nameIsGenerated="true">
<extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea">
<pattern>
<option name="PATTERN" value="com.rusefi.*" />
<option name="ENABLED" value="true" />
</pattern>
</extension>
<option name="MAIN_CLASS_NAME" value="com.rusefi.FiringOrderTSLogic" />
<option name="VM_PARAMETERS" value="" />
<option name="PROGRAM_PARAMETERS" value="" />
<option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
<option name="ALTERNATIVE_JRE_PATH" />
<option name="ENABLE_SWING_INSPECTOR" value="false" />
<option name="ENV_VARIABLES" />
<option name="PASS_PARENT_ENVS" value="true" />
<module name="models" />
<envs />
<method />
</configuration>
</component>

6
java_console/models/src/com/rusefi/FiringOrderTSLogic.java
View File

@ -1,7 +1,6 @@
package com.rusefi; package com.rusefi;
import java.io.BufferedReader; import java.io.BufferedReader;
import java.io.FileNotFoundException;
import java.io.FileReader; import java.io.FileReader;
import java.io.IOException; import java.io.IOException;
import java.util.Arrays; import java.util.Arrays;
@ -76,8 +75,11 @@ public class FiringOrderTSLogic {
} }
} }
String result = logic.length() == 0 ? "" : "|| (" + logic + ")";
System.out.println("logic" + cylinderId + ": " + logic);
System.out.println("#define ignitionPin" + cylinderId + "logic" + " " + result + "");
} }
} }