diff --git a/firmware/config/engines/mazda_miata_vvt.cpp b/firmware/config/engines/mazda_miata_vvt.cpp index 40387d54d3..6c2af324ee 100644 --- a/firmware/config/engines/mazda_miata_vvt.cpp +++ b/firmware/config/engines/mazda_miata_vvt.cpp @@ -190,6 +190,7 @@ static void setMazdaMiataEngineNB2Defaults(DECLARE_CONFIG_PARAMETER_SIGNATURE) { engineConfiguration->map.sensor.type = MT_GM_3_BAR; setEgoSensor(ES_Innovate_MTX_L PASS_CONFIG_PARAMETER_SUFFIX); + setCommonNTCSensor(&engineConfiguration->clt); setCommonNTCSensor(&engineConfiguration->iat); @@ -222,6 +223,8 @@ static void setMazdaMiataEngineNB2Defaults(DECLARE_CONFIG_PARAMETER_SIGNATURE) { * accounts for flow change. */ engineConfiguration->injector.flow = 265; + engineConfiguration->fuelRailPressure = 400; // 400 kPa, 58 psi + engineConfiguration->absoluteFuelPressure = true; CONFIG(isAlternatorControlEnabled) = true; diff --git a/firmware/controllers/generated/engine_configuration_generated_structures.h b/firmware/controllers/generated/engine_configuration_generated_structures.h index e31ae3eeac..19e83276d9 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Tue Sep 24 16:26:43 EDT 2019 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Tue Sep 24 18:34:53 EDT 2019 // by class com.rusefi.output.CHeaderConsumer // begin #ifndef CONTROLLERS_GENERATED_ENGINE_CONFIGURATION_GENERATED_STRUCTURES_H @@ -1016,11 +1016,7 @@ struct board_configuration_s { /** * offset 380 */ - float fuelRailPressure; - /** - * offset 384 - */ - int unusedAtBoardConfigurationEnd[120]; + int unusedAtBoardConfigurationEnd[121]; /** total size 864*/ }; @@ -1806,7 +1802,11 @@ struct engine_configuration_s { /** * offset 1756 */ - uint8_t unusedFormerWarmupAfrPid[20]; + float fuelRailPressure; + /** + * offset 1760 + */ + uint8_t unusedFormerWarmupAfrPid[16]; /** * kPa value which is too low to be true * offset 1776 @@ -2834,4 +2834,4 @@ typedef struct persistent_config_s persistent_config_s; #endif // end -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Tue Sep 24 16:26:43 EDT 2019 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Tue Sep 24 18:34:53 EDT 2019 diff --git a/firmware/controllers/generated/engine_state_generated.h b/firmware/controllers/generated/engine_state_generated.h index 5c717272a1..1e3e81ac84 100644 --- a/firmware/controllers/generated/engine_state_generated.h +++ b/firmware/controllers/generated/engine_state_generated.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration/engine_state.txt Sun Sep 22 08:39:46 EDT 2019 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration/engine_state.txt Tue Sep 24 18:13:29 EDT 2019 // by class com.rusefi.output.CHeaderConsumer // begin #ifndef CONTROLLERS_GENERATED_ENGINE_STATE_GENERATED_H @@ -196,37 +196,41 @@ struct engine_state2_s { /** * offset 80 */ + float injectorFlowCorrection = (float)0; + /** + * offset 84 + */ float baroCorrection = (float)0; /** - offset 84 bit 0 */ + offset 88 bit 0 */ bool isCrankingState : 1; /** - offset 84 bit 1 */ + offset 88 bit 1 */ bool hasEtbPedalPositionSensor : 1; /** - offset 84 bit 2 */ + offset 88 bit 2 */ bool isAutomaticIdle : 1; /** - * offset 88 + * offset 92 */ cranking_fuel_s cranking; /** - * offset 108 + * offset 112 */ running_fuel_s running; /** - * offset 140 + * offset 144 */ percent_t etbFeedForward = (percent_t)0; /** - * offset 144 + * offset 148 */ percent_t targetFromTable = (percent_t)0; - /** total size 148*/ + /** total size 152*/ }; 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 Sun Sep 22 08:39:46 EDT 2019 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration/engine_state.txt Tue Sep 24 18:13:29 EDT 2019 diff --git a/firmware/controllers/generated/rusefi_generated.h b/firmware/controllers/generated/rusefi_generated.h index 6ddddf2272..b9c3ad1e22 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -866,8 +866,8 @@ #define fuelPumpPin_offset_hex 292 #define fuelPumpPinMode_offset 659 #define fuelPumpPinMode_offset_hex 293 -#define fuelRailPressure_offset 980 -#define fuelRailPressure_offset_hex 3d4 +#define fuelRailPressure_offset 1756 +#define fuelRailPressure_offset_hex 6dc #define fuelRpmBins_offset 16224 #define fuelRpmBins_offset_hex 3f60 #define fuelTable_offset 15136 @@ -1887,14 +1887,14 @@ #define unused_former_warmup_target_afr_offset_hex 830 #define unusedAnotherOne_offset 744 #define unusedAnotherOne_offset_hex 2e8 -#define unusedAtBoardConfigurationEnd_offset 984 -#define unusedAtBoardConfigurationEnd_offset_hex 3d8 +#define unusedAtBoardConfigurationEnd_offset 980 +#define unusedAtBoardConfigurationEnd_offset_hex 3d4 #define unusedErrorPin_offset 2040 #define unusedErrorPin_offset_hex 7f8 #define unusedFlexFuelSensor_offset 3100 #define unusedFlexFuelSensor_offset_hex c1c -#define unusedFormerWarmupAfrPid_offset 1756 -#define unusedFormerWarmupAfrPid_offset_hex 6dc +#define unusedFormerWarmupAfrPid_offset 1760 +#define unusedFormerWarmupAfrPid_offset_hex 6e0 #define unusedMa2_offset 711 #define unusedMa2_offset_hex 2c7 #define unusedOldWarmupAfr_offset 744 diff --git a/firmware/integration/engine_state.txt b/firmware/integration/engine_state.txt index 7f03221daf..546bf503fb 100644 --- a/firmware/integration/engine_state.txt +++ b/firmware/integration/engine_state.txt @@ -51,6 +51,7 @@ float tpsVoltageMCU float tpsVoltageBoard float currentBaroCorrectedVE; + float injectorFlowCorrection; float baroCorrection; bit isCrankingState diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index 2792597fe4..1de9076681 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -702,8 +702,7 @@ maf_sensor_type_e mafSensorType; float etbIdleRange;;"angle", 1, 0, -100, 100, 2 bit clutchUpPinInverted bit clutchDownPinInverted - float fuelRailPressure;; "kPa", 1, 0.0, 0, 1000.0, 2 - int[120] unusedAtBoardConfigurationEnd; + int[121] unusedAtBoardConfigurationEnd; end_struct custom le_formula_t 200 string, ASCII, @OFFSET@, 200 @@ -821,7 +820,8 @@ custom pin_mode_e 1 bits, U08, @OFFSET@, [0:6], @@pin_mode_e_enum@@ float wwaeTau;+Length of time the deposited wall fuel takes to dissipate after the start of acceleration. ;"Seconds", 1, 0, 0.0, 3.0, 2 pid_s alternatorControl; pid_s etb; - uint8_t[20] unusedFormerWarmupAfrPid; + float fuelRailPressure;; "kPa", 1, 0.0, 0, 1000.0, 2 + uint8_t[16] unusedFormerWarmupAfrPid; ! todo: mapErrorDetectionIdleTooLow? 30kPa is usually lowest on idle float mapErrorDetectionTooLow;kPa value which is too low to be true;"kPa", 1, 0, -100.0, 100.0, 2 diff --git a/firmware/tunerstudio/rusefi.ini b/firmware/tunerstudio/rusefi.ini index 35fa35f927..2cfb7ed6ea 100644 --- a/firmware/tunerstudio/rusefi.ini +++ b/firmware/tunerstudio/rusefi.ini @@ -82,7 +82,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Tue Sep 24 16:26:43 EDT 2019 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Tue Sep 24 18:34:53 EDT 2019 pageSize = 20000 page = 1 @@ -498,8 +498,7 @@ page = 1 etbIdleRange = scalar, F32, 972, "angle", 1, 0, -100, 100, 2 clutchUpPinInverted = bits, U32, 976, [0:0], "false", "true" clutchDownPinInverted = bits, U32, 976, [1:1], "false", "true" - fuelRailPressure = scalar, F32, 980, "kPa", 1, 0.0, 0, 1000.0, 2 -;no TS info - skipping unusedAtBoardConfigurationEnd offset 984 +;no TS info - skipping unusedAtBoardConfigurationEnd offset 980 vvtDisplayInverted = bits, U32, 1464, [0:0], "false", "true" fuelClosedLoopCorrectionEnabled= bits, U32, 1464, [1:1], "false", "true" isVerboseIAC = bits, U32, 1464, [2:2], "false", "true" @@ -611,7 +610,8 @@ page = 1 etb_periodMs = scalar, S16, 1750, "ms", 1, 0, 0, 3000, 0 etb_minValue = scalar, S16, 1752, "", 1, 0, -30000, 30000.0, 0 etb_maxValue = scalar, S16, 1754, "", 1, 0, -30000, 30000.0, 0 -;no TS info - skipping unusedFormerWarmupAfrPid offset 1756 + fuelRailPressure = scalar, F32, 1756, "kPa", 1, 0.0, 0, 1000.0, 2 +;no TS info - skipping unusedFormerWarmupAfrPid offset 1760 mapErrorDetectionTooLow = scalar, F32, 1776, "kPa", 1, 0, -100.0, 100.0, 2 mapErrorDetectionTooHigh = scalar, F32, 1780, "kPa", 1, 0, -100.0, 800.0, 2 step1RpmWindow = scalar, S32, 1784, "rpm", 1, 0, 0, 3000.0, 2 diff --git a/firmware/tunerstudio/rusefi_frankenso.ini b/firmware/tunerstudio/rusefi_frankenso.ini index 83fe509110..23a5ce55bb 100644 --- a/firmware/tunerstudio/rusefi_frankenso.ini +++ b/firmware/tunerstudio/rusefi_frankenso.ini @@ -82,7 +82,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Tue Sep 24 16:26:48 EDT 2019 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Tue Sep 24 18:34:58 EDT 2019 pageSize = 20000 page = 1 @@ -498,8 +498,7 @@ page = 1 etbIdleRange = scalar, F32, 972, "angle", 1, 0, -100, 100, 2 clutchUpPinInverted = bits, U32, 976, [0:0], "false", "true" clutchDownPinInverted = bits, U32, 976, [1:1], "false", "true" - fuelRailPressure = scalar, F32, 980, "kPa", 1, 0.0, 0, 1000.0, 2 -;no TS info - skipping unusedAtBoardConfigurationEnd offset 984 +;no TS info - skipping unusedAtBoardConfigurationEnd offset 980 vvtDisplayInverted = bits, U32, 1464, [0:0], "false", "true" fuelClosedLoopCorrectionEnabled= bits, U32, 1464, [1:1], "false", "true" isVerboseIAC = bits, U32, 1464, [2:2], "false", "true" @@ -611,7 +610,8 @@ page = 1 etb_periodMs = scalar, S16, 1750, "ms", 1, 0, 0, 3000, 0 etb_minValue = scalar, S16, 1752, "", 1, 0, -30000, 30000.0, 0 etb_maxValue = scalar, S16, 1754, "", 1, 0, -30000, 30000.0, 0 -;no TS info - skipping unusedFormerWarmupAfrPid offset 1756 + fuelRailPressure = scalar, F32, 1756, "kPa", 1, 0.0, 0, 1000.0, 2 +;no TS info - skipping unusedFormerWarmupAfrPid offset 1760 mapErrorDetectionTooLow = scalar, F32, 1776, "kPa", 1, 0, -100.0, 100.0, 2 mapErrorDetectionTooHigh = scalar, F32, 1780, "kPa", 1, 0, -100.0, 800.0, 2 step1RpmWindow = scalar, S32, 1784, "rpm", 1, 0, 0, 3000.0, 2 diff --git a/firmware/tunerstudio/rusefi_microrusefi.ini b/firmware/tunerstudio/rusefi_microrusefi.ini index 49bc81cd26..c4e93b4947 100644 --- a/firmware/tunerstudio/rusefi_microrusefi.ini +++ b/firmware/tunerstudio/rusefi_microrusefi.ini @@ -82,7 +82,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Tue Sep 24 16:26:46 EDT 2019 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Tue Sep 24 18:34:55 EDT 2019 pageSize = 20000 page = 1 @@ -498,8 +498,7 @@ page = 1 etbIdleRange = scalar, F32, 972, "angle", 1, 0, -100, 100, 2 clutchUpPinInverted = bits, U32, 976, [0:0], "false", "true" clutchDownPinInverted = bits, U32, 976, [1:1], "false", "true" - fuelRailPressure = scalar, F32, 980, "kPa", 1, 0.0, 0, 1000.0, 2 -;no TS info - skipping unusedAtBoardConfigurationEnd offset 984 +;no TS info - skipping unusedAtBoardConfigurationEnd offset 980 vvtDisplayInverted = bits, U32, 1464, [0:0], "false", "true" fuelClosedLoopCorrectionEnabled= bits, U32, 1464, [1:1], "false", "true" isVerboseIAC = bits, U32, 1464, [2:2], "false", "true" @@ -611,7 +610,8 @@ page = 1 etb_periodMs = scalar, S16, 1750, "ms", 1, 0, 0, 3000, 0 etb_minValue = scalar, S16, 1752, "", 1, 0, -30000, 30000.0, 0 etb_maxValue = scalar, S16, 1754, "", 1, 0, -30000, 30000.0, 0 -;no TS info - skipping unusedFormerWarmupAfrPid offset 1756 + fuelRailPressure = scalar, F32, 1756, "kPa", 1, 0.0, 0, 1000.0, 2 +;no TS info - skipping unusedFormerWarmupAfrPid offset 1760 mapErrorDetectionTooLow = scalar, F32, 1776, "kPa", 1, 0, -100.0, 100.0, 2 mapErrorDetectionTooHigh = scalar, F32, 1780, "kPa", 1, 0, -100.0, 800.0, 2 step1RpmWindow = scalar, S32, 1784, "rpm", 1, 0, 0, 3000.0, 2 diff --git a/firmware/tunerstudio/rusefi_prometheus.ini b/firmware/tunerstudio/rusefi_prometheus.ini index 8b1d66e851..a53fe7b2c7 100644 --- a/firmware/tunerstudio/rusefi_prometheus.ini +++ b/firmware/tunerstudio/rusefi_prometheus.ini @@ -82,7 +82,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Tue Sep 24 16:26:52 EDT 2019 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Tue Sep 24 18:35:00 EDT 2019 pageSize = 20000 page = 1 @@ -498,8 +498,7 @@ page = 1 etbIdleRange = scalar, F32, 972, "angle", 1, 0, -100, 100, 2 clutchUpPinInverted = bits, U32, 976, [0:0], "false", "true" clutchDownPinInverted = bits, U32, 976, [1:1], "false", "true" - fuelRailPressure = scalar, F32, 980, "kPa", 1, 0.0, 0, 1000.0, 2 -;no TS info - skipping unusedAtBoardConfigurationEnd offset 984 +;no TS info - skipping unusedAtBoardConfigurationEnd offset 980 vvtDisplayInverted = bits, U32, 1464, [0:0], "false", "true" fuelClosedLoopCorrectionEnabled= bits, U32, 1464, [1:1], "false", "true" isVerboseIAC = bits, U32, 1464, [2:2], "false", "true" @@ -611,7 +610,8 @@ page = 1 etb_periodMs = scalar, S16, 1750, "ms", 1, 0, 0, 3000, 0 etb_minValue = scalar, S16, 1752, "", 1, 0, -30000, 30000.0, 0 etb_maxValue = scalar, S16, 1754, "", 1, 0, -30000, 30000.0, 0 -;no TS info - skipping unusedFormerWarmupAfrPid offset 1756 + fuelRailPressure = scalar, F32, 1756, "kPa", 1, 0.0, 0, 1000.0, 2 +;no TS info - skipping unusedFormerWarmupAfrPid offset 1760 mapErrorDetectionTooLow = scalar, F32, 1776, "kPa", 1, 0, -100.0, 100.0, 2 mapErrorDetectionTooHigh = scalar, F32, 1780, "kPa", 1, 0, -100.0, 800.0, 2 step1RpmWindow = scalar, S32, 1784, "rpm", 1, 0, 0, 3000.0, 2 diff --git a/java_console/models/src/com/rusefi/config/generated/EngineState.java b/java_console/models/src/com/rusefi/config/generated/EngineState.java index f58f99b1c3..cdf519f519 100644 --- a/java_console/models/src/com/rusefi/config/generated/EngineState.java +++ b/java_console/models/src/com/rusefi/config/generated/EngineState.java @@ -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 Sun Sep 22 08:32:24 EDT 2019 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on integration/engine_state.txt Tue Sep 24 18:13:29 EDT 2019 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -26,25 +26,26 @@ public class EngineState { public static final Field TPSVOLTAGEMCU = Field.create("TPSVOLTAGEMCU", 68, FieldType.FLOAT); public static final Field TPSVOLTAGEBOARD = Field.create("TPSVOLTAGEBOARD", 72, FieldType.FLOAT); public static final Field CURRENTBAROCORRECTEDVE = Field.create("CURRENTBAROCORRECTEDVE", 76, FieldType.FLOAT); - public static final Field BAROCORRECTION = Field.create("BAROCORRECTION", 80, FieldType.FLOAT); - public static final Field ISCRANKINGSTATE = Field.create("ISCRANKINGSTATE", 84, FieldType.BIT, 0); - public static final Field HASETBPEDALPOSITIONSENSOR = Field.create("HASETBPEDALPOSITIONSENSOR", 84, FieldType.BIT, 1); - public static final Field ISAUTOMATICIDLE = Field.create("ISAUTOMATICIDLE", 84, FieldType.BIT, 2); - public static final Field CRANKING_BASEFUEL = Field.create("CRANKING_BASEFUEL", 88, FieldType.FLOAT); - public static final Field CRANKING_COOLANTTEMPERATURECOEFFICIENT = Field.create("CRANKING_COOLANTTEMPERATURECOEFFICIENT", 92, FieldType.FLOAT); - public static final Field CRANKING_TPSCOEFFICIENT = Field.create("CRANKING_TPSCOEFFICIENT", 96, FieldType.FLOAT); - public static final Field CRANKING_DURATIONCOEFFICIENT = Field.create("CRANKING_DURATIONCOEFFICIENT", 100, FieldType.FLOAT); - public static final Field CRANKING_FUEL = Field.create("CRANKING_FUEL", 104, FieldType.FLOAT); - public static final Field RUNNING_POSTCRANKINGFUELCORRECTION = Field.create("RUNNING_POSTCRANKINGFUELCORRECTION", 108, FieldType.FLOAT); - public static final Field RUNNING_INTAKETEMPERATURECOEFFICIENT = Field.create("RUNNING_INTAKETEMPERATURECOEFFICIENT", 112, FieldType.FLOAT); - public static final Field RUNNING_COOLANTTEMPERATURECOEFFICIENT = Field.create("RUNNING_COOLANTTEMPERATURECOEFFICIENT", 116, FieldType.FLOAT); - public static final Field RUNNING_TIMESINCECRANKINGINSECS = Field.create("RUNNING_TIMESINCECRANKINGINSECS", 120, FieldType.FLOAT); - public static final Field RUNNING_INJECTORLAG = Field.create("RUNNING_INJECTORLAG", 124, FieldType.FLOAT); - public static final Field RUNNING_PIDCORRECTION = Field.create("RUNNING_PIDCORRECTION", 128, FieldType.FLOAT); - public static final Field RUNNING_BASEFUEL = Field.create("RUNNING_BASEFUEL", 132, FieldType.FLOAT); - public static final Field RUNNING_FUEL = Field.create("RUNNING_FUEL", 136, FieldType.FLOAT); - public static final Field ETBFEEDFORWARD = Field.create("ETBFEEDFORWARD", 140, FieldType.FLOAT); - public static final Field TARGETFROMTABLE = Field.create("TARGETFROMTABLE", 144, FieldType.FLOAT); + public static final Field INJECTORFLOWCORRECTION = Field.create("INJECTORFLOWCORRECTION", 80, FieldType.FLOAT); + public static final Field BAROCORRECTION = Field.create("BAROCORRECTION", 84, FieldType.FLOAT); + public static final Field ISCRANKINGSTATE = Field.create("ISCRANKINGSTATE", 88, FieldType.BIT, 0); + public static final Field HASETBPEDALPOSITIONSENSOR = Field.create("HASETBPEDALPOSITIONSENSOR", 88, FieldType.BIT, 1); + public static final Field ISAUTOMATICIDLE = Field.create("ISAUTOMATICIDLE", 88, FieldType.BIT, 2); + public static final Field CRANKING_BASEFUEL = Field.create("CRANKING_BASEFUEL", 92, FieldType.FLOAT); + public static final Field CRANKING_COOLANTTEMPERATURECOEFFICIENT = Field.create("CRANKING_COOLANTTEMPERATURECOEFFICIENT", 96, FieldType.FLOAT); + public static final Field CRANKING_TPSCOEFFICIENT = Field.create("CRANKING_TPSCOEFFICIENT", 100, FieldType.FLOAT); + public static final Field CRANKING_DURATIONCOEFFICIENT = Field.create("CRANKING_DURATIONCOEFFICIENT", 104, FieldType.FLOAT); + public static final Field CRANKING_FUEL = Field.create("CRANKING_FUEL", 108, FieldType.FLOAT); + public static final Field RUNNING_POSTCRANKINGFUELCORRECTION = Field.create("RUNNING_POSTCRANKINGFUELCORRECTION", 112, FieldType.FLOAT); + public static final Field RUNNING_INTAKETEMPERATURECOEFFICIENT = Field.create("RUNNING_INTAKETEMPERATURECOEFFICIENT", 116, FieldType.FLOAT); + public static final Field RUNNING_COOLANTTEMPERATURECOEFFICIENT = Field.create("RUNNING_COOLANTTEMPERATURECOEFFICIENT", 120, FieldType.FLOAT); + public static final Field RUNNING_TIMESINCECRANKINGINSECS = Field.create("RUNNING_TIMESINCECRANKINGINSECS", 124, FieldType.FLOAT); + public static final Field RUNNING_INJECTORLAG = Field.create("RUNNING_INJECTORLAG", 128, FieldType.FLOAT); + public static final Field RUNNING_PIDCORRECTION = Field.create("RUNNING_PIDCORRECTION", 132, FieldType.FLOAT); + public static final Field RUNNING_BASEFUEL = Field.create("RUNNING_BASEFUEL", 136, FieldType.FLOAT); + 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[] VALUES = { ISTCHARGEAIRMODEL, AIRMASSINONECYLINDER, @@ -66,6 +67,7 @@ public class EngineState { TPSVOLTAGEMCU, TPSVOLTAGEBOARD, CURRENTBAROCORRECTEDVE, + INJECTORFLOWCORRECTION, BAROCORRECTION, ISCRANKINGSTATE, HASETBPEDALPOSITIONSENSOR, diff --git a/java_console/models/src/com/rusefi/config/generated/Fields.java b/java_console/models/src/com/rusefi/config/generated/Fields.java index 6d917ffbc8..4affbb011a 100644 --- a/java_console/models/src/com/rusefi/config/generated/Fields.java +++ b/java_console/models/src/com/rusefi/config/generated/Fields.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Tue Sep 24 16:26:43 EDT 2019 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Tue Sep 24 18:34:53 EDT 2019 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -561,7 +561,7 @@ public class Fields { public static final int fuelPumpPin_offset_hex = 292; public static final int fuelPumpPinMode_offset = 659; public static final int fuelPumpPinMode_offset_hex = 293; - public static final int fuelRailPressure_offset = 980; + public static final int fuelRailPressure_offset = 1756; public static final int fuelRpmBins_offset = 16224; public static final int fuelTable_offset = 15136; public static final String GAUGE_COIL_DWELL_TIME = "dwell: coil charge time"; @@ -1230,10 +1230,10 @@ public class Fields { public static final int unused_former_warmup_target_afr_offset = 2096; public static final int unused_former_warmup_target_afr_offset_hex = 830; public static final int unusedAnotherOne_offset = 744; - public static final int unusedAtBoardConfigurationEnd_offset = 984; + public static final int unusedAtBoardConfigurationEnd_offset = 980; public static final int unusedErrorPin_offset = 2040; public static final int unusedFlexFuelSensor_offset = 3100; - public static final int unusedFormerWarmupAfrPid_offset = 1756; + public static final int unusedFormerWarmupAfrPid_offset = 1760; public static final int unusedMa2_offset = 711; public static final int unusedOldWarmupAfr_offset = 744; public static final int unusedSpiPadding2_offset = 806; @@ -1714,7 +1714,6 @@ public class Fields { public static final Field ETBIDLERANGE = Field.create("ETBIDLERANGE", 972, FieldType.FLOAT); public static final Field CLUTCHUPPININVERTED = Field.create("CLUTCHUPPININVERTED", 976, FieldType.BIT, 0); public static final Field CLUTCHDOWNPININVERTED = Field.create("CLUTCHDOWNPININVERTED", 976, FieldType.BIT, 1); - public static final Field FUELRAILPRESSURE = Field.create("FUELRAILPRESSURE", 980, FieldType.FLOAT); public static final Field VVTDISPLAYINVERTED = Field.create("VVTDISPLAYINVERTED", 1464, FieldType.BIT, 0); public static final Field FUELCLOSEDLOOPCORRECTIONENABLED = Field.create("FUELCLOSEDLOOPCORRECTIONENABLED", 1464, FieldType.BIT, 1); public static final Field ISVERBOSEIAC = Field.create("ISVERBOSEIAC", 1464, FieldType.BIT, 2); @@ -1822,6 +1821,7 @@ public class Fields { public static final Field ETB_PERIODMS = Field.create("ETB_PERIODMS", 1750, FieldType.INT16); public static final Field ETB_MINVALUE = Field.create("ETB_MINVALUE", 1752, FieldType.INT16); public static final Field ETB_MAXVALUE = Field.create("ETB_MAXVALUE", 1754, FieldType.INT16); + public static final Field FUELRAILPRESSURE = Field.create("FUELRAILPRESSURE", 1756, FieldType.FLOAT); public static final Field MAPERRORDETECTIONTOOLOW = Field.create("MAPERRORDETECTIONTOOLOW", 1776, FieldType.FLOAT); public static final Field MAPERRORDETECTIONTOOHIGH = Field.create("MAPERRORDETECTIONTOOHIGH", 1780, FieldType.FLOAT); public static final Field STEP1RPMWINDOW = Field.create("STEP1RPMWINDOW", 1784, FieldType.INT); @@ -2495,7 +2495,6 @@ public class Fields { ETBIDLERANGE, CLUTCHUPPININVERTED, CLUTCHDOWNPININVERTED, - FUELRAILPRESSURE, VVTDISPLAYINVERTED, FUELCLOSEDLOOPCORRECTIONENABLED, ISVERBOSEIAC, @@ -2603,6 +2602,7 @@ public class Fields { ETB_PERIODMS, ETB_MINVALUE, ETB_MAXVALUE, + FUELRAILPRESSURE, MAPERRORDETECTIONTOOLOW, MAPERRORDETECTIONTOOHIGH, STEP1RPMWINDOW, diff --git a/unit_tests/tests/test_fuelCut.cpp b/unit_tests/tests/test_fuelCut.cpp index 128fa005bf..e70ca0301c 100644 --- a/unit_tests/tests/test_fuelCut.cpp +++ b/unit_tests/tests/test_fuelCut.cpp @@ -122,3 +122,9 @@ TEST(fuelCut, criticalEngineTemperature) { ASSERT_TRUE(engine->stopEngineRequestTimeNt > 0); } + + +TEST(fuel, injectorFlowCorrection) { + + +}