From 6576acc39ae9b94efd4e74be4d9eee9a1c152408 Mon Sep 17 00:00:00 2001 From: rusefillc Date: Sat, 16 Oct 2021 21:49:38 -0400 Subject: [PATCH] Remove engine load acceleration enrichment fix #3357 --- .../algo/airmass/speed_density_airmass.cpp | 6 +- firmware/controllers/algo/engine_state.txt | 3 - .../controllers/algo/engine_state_generated.h | 114 +++++++-------- .../rusefi/config/generated/EngineState.java | 132 +++++++++--------- 4 files changed, 120 insertions(+), 135 deletions(-) diff --git a/firmware/controllers/algo/airmass/speed_density_airmass.cpp b/firmware/controllers/algo/airmass/speed_density_airmass.cpp index 10050c9eb0..170a3177d2 100644 --- a/firmware/controllers/algo/airmass/speed_density_airmass.cpp +++ b/firmware/controllers/algo/airmass/speed_density_airmass.cpp @@ -15,7 +15,7 @@ AirmassResult SpeedDensityAirmass::getAirmass(int rpm) { auto map = getMap(rpm); - float adjustedMap = engine->engineState.sd.adjustedManifoldAirPressure = map; + float adjustedMap = map; efiAssert(CUSTOM_ERR_ASSERT, !cisnan(adjustedMap), "NaN adjustedMap", {}); float ve = getVe(rpm, adjustedMap); @@ -26,8 +26,8 @@ AirmassResult SpeedDensityAirmass::getAirmass(int rpm) { return {}; } #if EFI_PRINTF_FUEL_DETAILS - printf("getSpeedDensityAirmass map=%.2f adjustedMap=%.2f airMass=%.2f\t\n", - map, adjustedMap, engine->engineState.sd.adjustedManifoldAirPressure); + printf("getSpeedDensityAirmass map=%.2f\n", + map); #endif /*EFI_PRINTF_FUEL_DETAILS */ return { diff --git a/firmware/controllers/algo/engine_state.txt b/firmware/controllers/algo/engine_state.txt index 50f9b8b0c7..e7bd755b69 100644 --- a/firmware/controllers/algo/engine_state.txt +++ b/firmware/controllers/algo/engine_state.txt @@ -15,9 +15,6 @@ float Tcharge_coff floatms_t airFlow -float manifoldAirPressureAccelerationAdjustment; -float adjustedManifoldAirPressure; - ! speed_density_s end_struct diff --git a/firmware/controllers/algo/engine_state_generated.h b/firmware/controllers/algo/engine_state_generated.h index a6088e0551..cabd6c8bed 100644 --- a/firmware/controllers/algo/engine_state_generated.h +++ b/firmware/controllers/algo/engine_state_generated.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo/engine_state.txt Sun Oct 17 01:13:40 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo/engine_state.txt Sat Oct 16 21:46:56 EDT 2021 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -124,15 +124,7 @@ struct speed_density_s { * offset 20 */ floatms_t airFlow = (floatms_t)0; - /** - * offset 24 - */ - float manifoldAirPressureAccelerationAdjustment = (float)0; - /** - * offset 28 - */ - float adjustedManifoldAirPressure = (float)0; - /** total size 32*/ + /** total size 24*/ }; // start of idle_state_s @@ -241,176 +233,176 @@ struct engine_state2_s { */ speed_density_s sd; /** - * offset 32 + * offset 24 */ idle_state_s idle; /** - * offset 52 + * offset 44 */ float targetAFR = (float)0; /** - * offset 56 + * offset 48 */ float engineCycleDurationMs = (float)0; /** - * offset 60 + * offset 52 */ float minRpmKcurrentTPS = (float)0; /** - * offset 64 + * offset 56 */ int currentTpsAdc = (int)0; /** - * offset 68 + * offset 60 */ float tpsVoltageMCU = (float)0; /** - * offset 72 + * offset 64 */ float tpsVoltageBoard = (float)0; /** - * offset 76 + * offset 68 */ float currentBaroCorrectedVE = (float)0; /** - * offset 80 + * offset 72 */ float injectorFlowCorrection = (float)0; /** - * offset 84 + * offset 76 */ float baroCorrection = (float)0; /** - offset 88 bit 0 */ + offset 80 bit 0 */ bool isCrankingState : 1; /** - offset 88 bit 1 */ + offset 80 bit 1 */ bool isAutomaticIdle : 1; /** - offset 88 bit 2 */ + offset 80 bit 2 */ bool unusedBit_13_2 : 1; /** - offset 88 bit 3 */ + offset 80 bit 3 */ bool unusedBit_13_3 : 1; /** - offset 88 bit 4 */ + offset 80 bit 4 */ bool unusedBit_13_4 : 1; /** - offset 88 bit 5 */ + offset 80 bit 5 */ bool unusedBit_13_5 : 1; /** - offset 88 bit 6 */ + offset 80 bit 6 */ bool unusedBit_13_6 : 1; /** - offset 88 bit 7 */ + offset 80 bit 7 */ bool unusedBit_13_7 : 1; /** - offset 88 bit 8 */ + offset 80 bit 8 */ bool unusedBit_13_8 : 1; /** - offset 88 bit 9 */ + offset 80 bit 9 */ bool unusedBit_13_9 : 1; /** - offset 88 bit 10 */ + offset 80 bit 10 */ bool unusedBit_13_10 : 1; /** - offset 88 bit 11 */ + offset 80 bit 11 */ bool unusedBit_13_11 : 1; /** - offset 88 bit 12 */ + offset 80 bit 12 */ bool unusedBit_13_12 : 1; /** - offset 88 bit 13 */ + offset 80 bit 13 */ bool unusedBit_13_13 : 1; /** - offset 88 bit 14 */ + offset 80 bit 14 */ bool unusedBit_13_14 : 1; /** - offset 88 bit 15 */ + offset 80 bit 15 */ bool unusedBit_13_15 : 1; /** - offset 88 bit 16 */ + offset 80 bit 16 */ bool unusedBit_13_16 : 1; /** - offset 88 bit 17 */ + offset 80 bit 17 */ bool unusedBit_13_17 : 1; /** - offset 88 bit 18 */ + offset 80 bit 18 */ bool unusedBit_13_18 : 1; /** - offset 88 bit 19 */ + offset 80 bit 19 */ bool unusedBit_13_19 : 1; /** - offset 88 bit 20 */ + offset 80 bit 20 */ bool unusedBit_13_20 : 1; /** - offset 88 bit 21 */ + offset 80 bit 21 */ bool unusedBit_13_21 : 1; /** - offset 88 bit 22 */ + offset 80 bit 22 */ bool unusedBit_13_22 : 1; /** - offset 88 bit 23 */ + offset 80 bit 23 */ bool unusedBit_13_23 : 1; /** - offset 88 bit 24 */ + offset 80 bit 24 */ bool unusedBit_13_24 : 1; /** - offset 88 bit 25 */ + offset 80 bit 25 */ bool unusedBit_13_25 : 1; /** - offset 88 bit 26 */ + offset 80 bit 26 */ bool unusedBit_13_26 : 1; /** - offset 88 bit 27 */ + offset 80 bit 27 */ bool unusedBit_13_27 : 1; /** - offset 88 bit 28 */ + offset 80 bit 28 */ bool unusedBit_13_28 : 1; /** - offset 88 bit 29 */ + offset 80 bit 29 */ bool unusedBit_13_29 : 1; /** - offset 88 bit 30 */ + offset 80 bit 30 */ bool unusedBit_13_30 : 1; /** - offset 88 bit 31 */ + offset 80 bit 31 */ bool unusedBit_13_31 : 1; /** - * offset 92 + * offset 84 */ cranking_fuel_s cranking; /** - * offset 112 + * offset 104 */ running_fuel_s running; /** - * offset 140 + * offset 132 */ percent_t etbFeedForward = (percent_t)0; /** - * offset 144 + * offset 136 */ percent_t targetFromTable = (percent_t)0; /** * ignition dwell duration in ms * See also dwellAngle - * offset 148 + * offset 140 */ floatms_t sparkDwell = (floatms_t)0; /** * ignition dwell duration as crankshaft angle * NAN if engine is stopped * See also sparkDwell - * offset 152 + * offset 144 */ angle_t dwellAngle = (angle_t)0; /** - * offset 156 + * offset 148 */ angle_t cltTimingCorrection = (angle_t)0; - /** total size 160*/ + /** total size 152*/ }; // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo/engine_state.txt Sun Oct 17 01:13:40 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo/engine_state.txt Sat Oct 16 21:46:56 EDT 2021 diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/EngineState.java b/java_console/models/src/main/java/com/rusefi/config/generated/EngineState.java index 1bf80724eb..1b498e58a9 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/EngineState.java +++ b/java_console/models/src/main/java/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 (unknown script) controllers/algo/engine_state.txt Sun Oct 17 01:13:40 UTC 2021 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo/engine_state.txt Sat Oct 16 21:46:56 EDT 2021 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -43,71 +43,69 @@ public class EngineState { public static final Field TCHARGEK = Field.create("TCHARGEK", 12, FieldType.FLOAT); public static final Field TCHARGE_COFF = Field.create("TCHARGE_COFF", 16, FieldType.FLOAT); public static final Field AIRFLOW = Field.create("AIRFLOW", 20, FieldType.FLOAT); - public static final Field MANIFOLDAIRPRESSUREACCELERATIONADJUSTMENT = Field.create("MANIFOLDAIRPRESSUREACCELERATIONADJUSTMENT", 24, FieldType.FLOAT); - public static final Field ADJUSTEDMANIFOLDAIRPRESSURE = Field.create("ADJUSTEDMANIFOLDAIRPRESSURE", 28, FieldType.FLOAT); - public static final Field IDLESTATE = Field.create("IDLESTATE", 32, FieldType.INT); - public static final Field CURRENTIDLEPOSITION = Field.create("CURRENTIDLEPOSITION", 36, FieldType.FLOAT); - public static final Field BASEIDLEPOSITION = Field.create("BASEIDLEPOSITION", 40, FieldType.FLOAT); - public static final Field THROTTLEPEDALUPSTATE = Field.create("THROTTLEPEDALUPSTATE", 44, FieldType.INT); - public static final Field ETBIDLEADDITION = Field.create("ETBIDLEADDITION", 48, FieldType.FLOAT); - public static final Field TARGETAFR = Field.create("TARGETAFR", 52, FieldType.FLOAT); - public static final Field ENGINECYCLEDURATIONMS = Field.create("ENGINECYCLEDURATIONMS", 56, FieldType.FLOAT); - public static final Field MINRPMKCURRENTTPS = Field.create("MINRPMKCURRENTTPS", 60, FieldType.FLOAT); - public static final Field CURRENTTPSADC = Field.create("CURRENTTPSADC", 64, FieldType.INT); - 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 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 ISAUTOMATICIDLE = Field.create("ISAUTOMATICIDLE", 88, FieldType.BIT, 1); - public static final Field UNUSEDBIT_13_2 = Field.create("UNUSEDBIT_13_2", 88, FieldType.BIT, 2); - public static final Field UNUSEDBIT_13_3 = Field.create("UNUSEDBIT_13_3", 88, FieldType.BIT, 3); - public static final Field UNUSEDBIT_13_4 = Field.create("UNUSEDBIT_13_4", 88, FieldType.BIT, 4); - public static final Field UNUSEDBIT_13_5 = Field.create("UNUSEDBIT_13_5", 88, FieldType.BIT, 5); - public static final Field UNUSEDBIT_13_6 = Field.create("UNUSEDBIT_13_6", 88, FieldType.BIT, 6); - public static final Field UNUSEDBIT_13_7 = Field.create("UNUSEDBIT_13_7", 88, FieldType.BIT, 7); - public static final Field UNUSEDBIT_13_8 = Field.create("UNUSEDBIT_13_8", 88, FieldType.BIT, 8); - public static final Field UNUSEDBIT_13_9 = Field.create("UNUSEDBIT_13_9", 88, FieldType.BIT, 9); - public static final Field UNUSEDBIT_13_10 = Field.create("UNUSEDBIT_13_10", 88, FieldType.BIT, 10); - public static final Field UNUSEDBIT_13_11 = Field.create("UNUSEDBIT_13_11", 88, FieldType.BIT, 11); - public static final Field UNUSEDBIT_13_12 = Field.create("UNUSEDBIT_13_12", 88, FieldType.BIT, 12); - public static final Field UNUSEDBIT_13_13 = Field.create("UNUSEDBIT_13_13", 88, FieldType.BIT, 13); - public static final Field UNUSEDBIT_13_14 = Field.create("UNUSEDBIT_13_14", 88, FieldType.BIT, 14); - public static final Field UNUSEDBIT_13_15 = Field.create("UNUSEDBIT_13_15", 88, FieldType.BIT, 15); - public static final Field UNUSEDBIT_13_16 = Field.create("UNUSEDBIT_13_16", 88, FieldType.BIT, 16); - public static final Field UNUSEDBIT_13_17 = Field.create("UNUSEDBIT_13_17", 88, FieldType.BIT, 17); - public static final Field UNUSEDBIT_13_18 = Field.create("UNUSEDBIT_13_18", 88, FieldType.BIT, 18); - public static final Field UNUSEDBIT_13_19 = Field.create("UNUSEDBIT_13_19", 88, FieldType.BIT, 19); - public static final Field UNUSEDBIT_13_20 = Field.create("UNUSEDBIT_13_20", 88, FieldType.BIT, 20); - public static final Field UNUSEDBIT_13_21 = Field.create("UNUSEDBIT_13_21", 88, FieldType.BIT, 21); - public static final Field UNUSEDBIT_13_22 = Field.create("UNUSEDBIT_13_22", 88, FieldType.BIT, 22); - public static final Field UNUSEDBIT_13_23 = Field.create("UNUSEDBIT_13_23", 88, FieldType.BIT, 23); - public static final Field UNUSEDBIT_13_24 = Field.create("UNUSEDBIT_13_24", 88, FieldType.BIT, 24); - public static final Field UNUSEDBIT_13_25 = Field.create("UNUSEDBIT_13_25", 88, FieldType.BIT, 25); - public static final Field UNUSEDBIT_13_26 = Field.create("UNUSEDBIT_13_26", 88, FieldType.BIT, 26); - public static final Field UNUSEDBIT_13_27 = Field.create("UNUSEDBIT_13_27", 88, FieldType.BIT, 27); - public static final Field UNUSEDBIT_13_28 = Field.create("UNUSEDBIT_13_28", 88, FieldType.BIT, 28); - public static final Field UNUSEDBIT_13_29 = Field.create("UNUSEDBIT_13_29", 88, FieldType.BIT, 29); - public static final Field UNUSEDBIT_13_30 = Field.create("UNUSEDBIT_13_30", 88, FieldType.BIT, 30); - public static final Field UNUSEDBIT_13_31 = Field.create("UNUSEDBIT_13_31", 88, FieldType.BIT, 31); - 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_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 SPARKDWELL = Field.create("SPARKDWELL", 148, FieldType.FLOAT); - public static final Field DWELLANGLE = Field.create("DWELLANGLE", 152, FieldType.FLOAT); - public static final Field CLTTIMINGCORRECTION = Field.create("CLTTIMINGCORRECTION", 156, FieldType.FLOAT); + public static final Field IDLESTATE = Field.create("IDLESTATE", 24, FieldType.INT); + public static final Field CURRENTIDLEPOSITION = Field.create("CURRENTIDLEPOSITION", 28, FieldType.FLOAT); + public static final Field BASEIDLEPOSITION = Field.create("BASEIDLEPOSITION", 32, FieldType.FLOAT); + public static final Field THROTTLEPEDALUPSTATE = Field.create("THROTTLEPEDALUPSTATE", 36, FieldType.INT); + public static final Field ETBIDLEADDITION = Field.create("ETBIDLEADDITION", 40, FieldType.FLOAT); + public static final Field TARGETAFR = Field.create("TARGETAFR", 44, FieldType.FLOAT); + public static final Field ENGINECYCLEDURATIONMS = Field.create("ENGINECYCLEDURATIONMS", 48, FieldType.FLOAT); + public static final Field MINRPMKCURRENTTPS = Field.create("MINRPMKCURRENTTPS", 52, FieldType.FLOAT); + public static final Field CURRENTTPSADC = Field.create("CURRENTTPSADC", 56, FieldType.INT); + public static final Field TPSVOLTAGEMCU = Field.create("TPSVOLTAGEMCU", 60, FieldType.FLOAT); + public static final Field TPSVOLTAGEBOARD = Field.create("TPSVOLTAGEBOARD", 64, FieldType.FLOAT); + public static final Field CURRENTBAROCORRECTEDVE = Field.create("CURRENTBAROCORRECTEDVE", 68, FieldType.FLOAT); + public static final Field INJECTORFLOWCORRECTION = Field.create("INJECTORFLOWCORRECTION", 72, FieldType.FLOAT); + public static final Field BAROCORRECTION = Field.create("BAROCORRECTION", 76, FieldType.FLOAT); + public static final Field ISCRANKINGSTATE = Field.create("ISCRANKINGSTATE", 80, FieldType.BIT, 0); + public static final Field ISAUTOMATICIDLE = Field.create("ISAUTOMATICIDLE", 80, FieldType.BIT, 1); + public static final Field UNUSEDBIT_13_2 = Field.create("UNUSEDBIT_13_2", 80, FieldType.BIT, 2); + public static final Field UNUSEDBIT_13_3 = Field.create("UNUSEDBIT_13_3", 80, FieldType.BIT, 3); + public static final Field UNUSEDBIT_13_4 = Field.create("UNUSEDBIT_13_4", 80, FieldType.BIT, 4); + public static final Field UNUSEDBIT_13_5 = Field.create("UNUSEDBIT_13_5", 80, FieldType.BIT, 5); + public static final Field UNUSEDBIT_13_6 = Field.create("UNUSEDBIT_13_6", 80, FieldType.BIT, 6); + public static final Field UNUSEDBIT_13_7 = Field.create("UNUSEDBIT_13_7", 80, FieldType.BIT, 7); + public static final Field UNUSEDBIT_13_8 = Field.create("UNUSEDBIT_13_8", 80, FieldType.BIT, 8); + public static final Field UNUSEDBIT_13_9 = Field.create("UNUSEDBIT_13_9", 80, FieldType.BIT, 9); + public static final Field UNUSEDBIT_13_10 = Field.create("UNUSEDBIT_13_10", 80, FieldType.BIT, 10); + public static final Field UNUSEDBIT_13_11 = Field.create("UNUSEDBIT_13_11", 80, FieldType.BIT, 11); + public static final Field UNUSEDBIT_13_12 = Field.create("UNUSEDBIT_13_12", 80, FieldType.BIT, 12); + public static final Field UNUSEDBIT_13_13 = Field.create("UNUSEDBIT_13_13", 80, FieldType.BIT, 13); + public static final Field UNUSEDBIT_13_14 = Field.create("UNUSEDBIT_13_14", 80, FieldType.BIT, 14); + public static final Field UNUSEDBIT_13_15 = Field.create("UNUSEDBIT_13_15", 80, FieldType.BIT, 15); + public static final Field UNUSEDBIT_13_16 = Field.create("UNUSEDBIT_13_16", 80, FieldType.BIT, 16); + public static final Field UNUSEDBIT_13_17 = Field.create("UNUSEDBIT_13_17", 80, FieldType.BIT, 17); + public static final Field UNUSEDBIT_13_18 = Field.create("UNUSEDBIT_13_18", 80, FieldType.BIT, 18); + public static final Field UNUSEDBIT_13_19 = Field.create("UNUSEDBIT_13_19", 80, FieldType.BIT, 19); + public static final Field UNUSEDBIT_13_20 = Field.create("UNUSEDBIT_13_20", 80, FieldType.BIT, 20); + public static final Field UNUSEDBIT_13_21 = Field.create("UNUSEDBIT_13_21", 80, FieldType.BIT, 21); + public static final Field UNUSEDBIT_13_22 = Field.create("UNUSEDBIT_13_22", 80, FieldType.BIT, 22); + public static final Field UNUSEDBIT_13_23 = Field.create("UNUSEDBIT_13_23", 80, FieldType.BIT, 23); + public static final Field UNUSEDBIT_13_24 = Field.create("UNUSEDBIT_13_24", 80, FieldType.BIT, 24); + public static final Field UNUSEDBIT_13_25 = Field.create("UNUSEDBIT_13_25", 80, FieldType.BIT, 25); + public static final Field UNUSEDBIT_13_26 = Field.create("UNUSEDBIT_13_26", 80, FieldType.BIT, 26); + public static final Field UNUSEDBIT_13_27 = Field.create("UNUSEDBIT_13_27", 80, FieldType.BIT, 27); + public static final Field UNUSEDBIT_13_28 = Field.create("UNUSEDBIT_13_28", 80, FieldType.BIT, 28); + public static final Field UNUSEDBIT_13_29 = Field.create("UNUSEDBIT_13_29", 80, FieldType.BIT, 29); + public static final Field UNUSEDBIT_13_30 = Field.create("UNUSEDBIT_13_30", 80, FieldType.BIT, 30); + public static final Field UNUSEDBIT_13_31 = Field.create("UNUSEDBIT_13_31", 80, FieldType.BIT, 31); + public static final Field CRANKING_BASEFUEL = Field.create("CRANKING_BASEFUEL", 84, FieldType.FLOAT); + public static final Field CRANKING_COOLANTTEMPERATURECOEFFICIENT = Field.create("CRANKING_COOLANTTEMPERATURECOEFFICIENT", 88, FieldType.FLOAT); + public static final Field CRANKING_TPSCOEFFICIENT = Field.create("CRANKING_TPSCOEFFICIENT", 92, FieldType.FLOAT); + public static final Field CRANKING_DURATIONCOEFFICIENT = Field.create("CRANKING_DURATIONCOEFFICIENT", 96, FieldType.FLOAT); + public static final Field CRANKING_FUEL = Field.create("CRANKING_FUEL", 100, FieldType.FLOAT); + public static final Field RUNNING_POSTCRANKINGFUELCORRECTION = Field.create("RUNNING_POSTCRANKINGFUELCORRECTION", 104, FieldType.FLOAT); + public static final Field RUNNING_INTAKETEMPERATURECOEFFICIENT = Field.create("RUNNING_INTAKETEMPERATURECOEFFICIENT", 108, FieldType.FLOAT); + public static final Field RUNNING_COOLANTTEMPERATURECOEFFICIENT = Field.create("RUNNING_COOLANTTEMPERATURECOEFFICIENT", 112, FieldType.FLOAT); + public static final Field RUNNING_TIMESINCECRANKINGINSECS = Field.create("RUNNING_TIMESINCECRANKINGINSECS", 116, FieldType.FLOAT); + public static final Field RUNNING_INJECTORLAG = Field.create("RUNNING_INJECTORLAG", 120, FieldType.FLOAT); + public static final Field RUNNING_BASEFUEL = Field.create("RUNNING_BASEFUEL", 124, FieldType.FLOAT); + public static final Field RUNNING_FUEL = Field.create("RUNNING_FUEL", 128, FieldType.FLOAT); + public static final Field ETBFEEDFORWARD = Field.create("ETBFEEDFORWARD", 132, FieldType.FLOAT); + public static final Field TARGETFROMTABLE = Field.create("TARGETFROMTABLE", 136, FieldType.FLOAT); + public static final Field SPARKDWELL = Field.create("SPARKDWELL", 140, FieldType.FLOAT); + public static final Field DWELLANGLE = Field.create("DWELLANGLE", 144, FieldType.FLOAT); + public static final Field CLTTIMINGCORRECTION = Field.create("CLTTIMINGCORRECTION", 148, FieldType.FLOAT); public static final Field[] VALUES = { ISTCHARGEAIRMODEL, UNUSEDBIT_1_1, @@ -146,8 +144,6 @@ public class EngineState { TCHARGEK, TCHARGE_COFF, AIRFLOW, - MANIFOLDAIRPRESSUREACCELERATIONADJUSTMENT, - ADJUSTEDMANIFOLDAIRPRESSURE, IDLESTATE, CURRENTIDLEPOSITION, BASEIDLEPOSITION,