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

Missing dwell altogether in some corner cases #796 

only additional live data here
This commit is contained in:
rusefi 2019-11-05 23:36:33 -05:00
parent 8f5895321c
commit 487acd62de
8 changed files with 44 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
firmware/controllers/algo/engine_state.h
View File

@ -56,21 +56,6 @@ public:
angle_t mapAveragingDuration = 0;
angle_t timingAdvance = 0;
// spark-related
/**
* ignition dwell duration in ms
* See also dwellAngle
*/
floatms_t sparkDwell = 0;
/**
* ignition dwell duration as crankshaft angle
* NAN if engine is stopped
* See also sparkDwell
*/
angle_t dwellAngle = NAN;
angle_t cltTimingCorrection = 0;
// fuel-related;
float fuelCutoffCorrection = 0;
efitick_t coastingFuelCutStartTime = 0;

5
firmware/controllers/algo/fuel_math.cpp
View File

@ -43,6 +43,11 @@ extern baroCorr_Map3D_t baroCorrMap;
DISPLAY_STATE(Engine)
DISPLAY(DISPLAY_FIELD(sparkDwell))
DISPLAY(DISPLAY_FIELD(dwellAngle))
DISPLAY(DISPLAY_FIELD(cltTimingCorrection))
DISPLAY_TEXT(eol);
DISPLAY(DISPLAY_IF(isCrankingState)) floatms_t getCrankingFuel3(float coolantTemperature,
uint32_t revolutionCounterSinceStart DECLARE_ENGINE_PARAMETER_SUFFIX) {
// these magic constants are in Celsius

2
firmware/controllers/engine_controller.cpp
View File

@ -839,6 +839,6 @@ int getRusEfiVersion(void) {
if (initBootloader() != 0)
return 123;
#endif /* EFI_BOOTLOADER_INCLUDE_CODE */
return 20191103;
return 20191105;
}
#endif /* EFI_UNIT_TEST */

23
firmware/controllers/generated/engine_state_generated.h
View File

@ -1,4 +1,4 @@
// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration/engine_state.txt Tue Sep 24 18:13:29 EDT 2019
// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration/engine_state.txt Tue Nov 05 23:21:45 EST 2019
// by class com.rusefi.output.CHeaderConsumer
// begin
#ifndef CONTROLLERS_GENERATED_ENGINE_STATE_GENERATED_H
@ -226,11 +226,28 @@ struct engine_state2_s {
* offset 148
*/
percent_t targetFromTable = (percent_t)0;
/** total size 152*/
/**
* ignition dwell duration in ms
* See also dwellAngle
* offset 152
*/
floatms_t sparkDwell = (floatms_t)0;
/**
* ignition dwell duration as crankshaft angle
* NAN if engine is stopped
* See also sparkDwell
* offset 156
*/
angle_t dwellAngle = (angle_t)0;
/**
* offset 160
*/
angle_t cltTimingCorrection = (angle_t)0;
/** total size 164*/
};
typedef struct engine_state2_s engine_state2_s;
#endif
// end
// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration/engine_state.txt Tue Sep 24 18:13:29 EDT 2019
// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration/engine_state.txt Tue Nov 05 23:21:45 EST 2019

6
firmware/integration/engine_state.txt
View File

@ -100,5 +100,11 @@ running_fuel_s running
percent_t etbFeedForward;
percent_t targetFromTable
! spark-related
floatms_t sparkDwell;ignition dwell duration in ms\nSee also dwellAngle
angle_t dwellAngle;ignition dwell duration as crankshaft angle\nNAN if engine is stopped\nSee also sparkDwell
angle_t cltTimingCorrection
! engine_state2_s
end_struct

8
java_console/models/src/com/rusefi/config/generated/EngineState.java
View File

@ -1,6 +1,6 @@
package com.rusefi.config.generated;
// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on integration/engine_state.txt Tue Sep 24 18:13:29 EDT 2019
// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on integration/engine_state.txt Tue Nov 05 23:21:45 EST 2019
// by class com.rusefi.output.FileJavaFieldsConsumer
import com.rusefi.config.*;
@ -46,6 +46,9 @@ public class EngineState {
public static final Field RUNNING_FUEL = Field.create("RUNNING_FUEL", 140, FieldType.FLOAT);
public static final Field ETBFEEDFORWARD = Field.create("ETBFEEDFORWARD", 144, FieldType.FLOAT);
public static final Field TARGETFROMTABLE = Field.create("TARGETFROMTABLE", 148, FieldType.FLOAT);
public static final Field SPARKDWELL = Field.create("SPARKDWELL", 152, FieldType.FLOAT);
public static final Field DWELLANGLE = Field.create("DWELLANGLE", 156, FieldType.FLOAT);
public static final Field CLTTIMINGCORRECTION = Field.create("CLTTIMINGCORRECTION", 160, FieldType.FLOAT);
public static final Field[] VALUES = {
ISTCHARGEAIRMODEL,
AIRMASSINONECYLINDER,
@ -87,5 +90,8 @@ public class EngineState {
RUNNING_FUEL,
ETBFEEDFORWARD,
TARGETFROMTABLE,
SPARKDWELL,
DWELLANGLE,
CLTTIMINGCORRECTION,
};
}

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

@ -48,7 +48,7 @@ import static com.rusefi.ui.storage.PersistentConfiguration.getConfig;
* @see EngineSnifferPanel
*/
public class Launcher {
public static final int CONSOLE_VERSION = 20190925;
public static final int CONSOLE_VERSION = 20191105;
public static final String INI_FILE_PATH = System.getProperty("ini_file_path", "..");
public static final String INPUT_FILES_PATH = System.getProperty("input_files_path", "..");
public static final String TOOLS_PATH = System.getProperty("tools_path", ".");

4
java_console/ui/src/com/rusefi/ldmp/generated/FuelMathMeta.java
View File

@ -4,6 +4,10 @@ import com.rusefi.ldmp.*;
public class FuelMathMeta {
public static final Request[] CONTENT = new Request[]{
new FieldRequest("Engine", "sparkDwell"),
new FieldRequest("Engine", "dwellAngle"),
new FieldRequest("Engine", "cltTimingCorrection"),
new TextRequest("eol"),
new IfRequest("Engine", "isCrankingState",
new Request[]{
new TextRequest("Duration_coef"),