diff --git a/firmware/console/binary_log/log_fields_generated.h b/firmware/console/binary_log/log_fields_generated.h index c9c195bd0d..116123c663 100644 --- a/firmware/console/binary_log/log_fields_generated.h +++ b/firmware/console/binary_log/log_fields_generated.h @@ -250,6 +250,12 @@ static constexpr LogField fields[] = { {engine->outputChannels.mafMeasured2, "MAF #2", "kg/h", 1}, {engine->outputChannels.schedulingUsedCount, "schedulingUsedCount", "", 0}, {engine->fuelComputer.totalFuelCorrection, "totalFuelCorrection", "", 0}, + {engine->fuelComputer.running.postCrankingFuelCorrection, "running.postCrankingFuelCorrection", "", 0}, + {engine->fuelComputer.running.intakeTemperatureCoefficient, "fuel: IAT correction", "", 0}, + {engine->fuelComputer.running.coolantTemperatureCoefficient, "fuel: CLT correction", "", 0}, + {engine->fuelComputer.running.timeSinceCrankingInSecs, "running.timeSinceCrankingInSecs", "", 0}, + {engine->fuelComputer.running.baseFuel, "running.baseFuel", "", 0}, + {engine->fuelComputer.running.fuel, "Fuel: actual", "", 0}, {engine->fuelComputer.afrTableYAxis, "afrTableYAxis", "%", 0}, {engine->fuelComputer.targetLambda, "fuel: target lambda", "", 3}, {engine->fuelComputer.targetAFR, "fuel: target AFR", "ratio", 2}, @@ -274,12 +280,6 @@ static constexpr LogField fields[] = { {engine->engineState.crankingFuel.tpsCoefficient, "crankingFuel.tpsCoefficient", "", 0}, {engine->engineState.crankingFuel.durationCoefficient, "crankingFuel.durationCoefficient", "", 0}, {engine->engineState.crankingFuel.fuel, "Fuel: Actual injection", "", 0}, - {engine->engineState.running.postCrankingFuelCorrection, "running.postCrankingFuelCorrection", "", 0}, - {engine->engineState.running.intakeTemperatureCoefficient, "fuel: IAT correction", "", 0}, - {engine->engineState.running.coolantTemperatureCoefficient, "fuel: CLT correction", "", 0}, - {engine->engineState.running.timeSinceCrankingInSecs, "running.timeSinceCrankingInSecs", "", 0}, - {engine->engineState.running.baseFuel, "running.baseFuel", "", 0}, - {engine->engineState.running.fuel, "Fuel: actual", "", 0}, {engine->engineState.sparkDwell, "ignition dwell duration in ms", "", 0}, {engine->engineState.dwellAngle, "ignition dwell duration", "", 0}, {engine->engineState.cltTimingCorrection, "cltTimingCorrection", "deg", 2}, diff --git a/firmware/controllers/algo/engine_state_generated.h b/firmware/controllers/algo/engine_state_generated.h index d31f725560..4500fb1380 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 Mon Jan 02 22:53:02 UTC 2023 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo/engine_state.txt Sat Jan 14 21:07:33 UTC 2023 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -163,42 +163,6 @@ struct cranking_fuel_s { }; static_assert(sizeof(cranking_fuel_s) == 20); -// start of running_fuel_s -struct running_fuel_s { - /** - * offset 0 - */ - float postCrankingFuelCorrection = (float)0; - /** - * @@GAUGE_NAME_FUEL_IAT_CORR@@ - * offset 4 - */ - float intakeTemperatureCoefficient = (float)0; - /** - * @@GAUGE_NAME_FUEL_CLT_CORR@@ - * offset 8 - */ - float coolantTemperatureCoefficient = (float)0; - /** - * offset 12 - */ - float timeSinceCrankingInSecs = (float)0; - /** - * offset 16 - */ - floatms_t baseFuel = (floatms_t)0; - /** - * Fuel: actual - * Actual injection duration with CLT, IAT and TPS acceleration corrections per cycle, as squirt duration. - * Without injector lag. - * @see baseFuel - * @see actualLastInjection - * offset 20 - */ - floatms_t fuel = (floatms_t)0; -}; -static_assert(sizeof(running_fuel_s) == 24); - // start of engine_state_s struct engine_state_s { /** @@ -246,14 +210,10 @@ struct engine_state_s { * offset 56 */ cranking_fuel_s crankingFuel; - /** - * offset 76 - */ - running_fuel_s running; /** * ignition dwell duration in ms * See also dwellAngle - * offset 100 + * offset 76 */ floatms_t sparkDwell = (floatms_t)0; /** @@ -261,184 +221,184 @@ struct engine_state_s { * as crankshaft angle * NAN if engine is stopped * See also sparkDwell - * offset 104 + * offset 80 */ angle_t dwellAngle = (angle_t)0; /** deg - * offset 108 + * offset 84 */ scaled_channel cltTimingCorrection = (int16_t)0; /** deg - * offset 110 + * offset 86 */ scaled_channel timingIatCorrection = (int16_t)0; /** deg - * offset 112 + * offset 88 */ scaled_channel timingPidCorrection = (int16_t)0; /** * Detected Board ID id - * offset 114 + * offset 90 */ int16_t hellenBoardId = (int16_t)0; /** * @@INDICATOR_NAME_CLUTCH_UP@@ - offset 116 bit 0 */ + offset 92 bit 0 */ bool clutchUpState : 1 {}; /** * @@INDICATOR_NAME_CLUTCH_DOWN@@ - offset 116 bit 1 */ + offset 92 bit 1 */ bool clutchDownState : 1 {}; /** * @@INDICATOR_NAME_BRAKE_DOWN@@ - offset 116 bit 2 */ + offset 92 bit 2 */ bool brakePedalState : 1 {}; /** - offset 116 bit 3 */ + offset 92 bit 3 */ bool startStopState : 1 {}; /** - offset 116 bit 4 */ - bool unusedBit_22_4 : 1 {}; + offset 92 bit 4 */ + bool unusedBit_21_4 : 1 {}; /** - offset 116 bit 5 */ - bool unusedBit_22_5 : 1 {}; + offset 92 bit 5 */ + bool unusedBit_21_5 : 1 {}; /** - offset 116 bit 6 */ - bool unusedBit_22_6 : 1 {}; + offset 92 bit 6 */ + bool unusedBit_21_6 : 1 {}; /** - offset 116 bit 7 */ - bool unusedBit_22_7 : 1 {}; + offset 92 bit 7 */ + bool unusedBit_21_7 : 1 {}; /** - offset 116 bit 8 */ - bool unusedBit_22_8 : 1 {}; + offset 92 bit 8 */ + bool unusedBit_21_8 : 1 {}; /** - offset 116 bit 9 */ - bool unusedBit_22_9 : 1 {}; + offset 92 bit 9 */ + bool unusedBit_21_9 : 1 {}; /** - offset 116 bit 10 */ - bool unusedBit_22_10 : 1 {}; + offset 92 bit 10 */ + bool unusedBit_21_10 : 1 {}; /** - offset 116 bit 11 */ - bool unusedBit_22_11 : 1 {}; + offset 92 bit 11 */ + bool unusedBit_21_11 : 1 {}; /** - offset 116 bit 12 */ - bool unusedBit_22_12 : 1 {}; + offset 92 bit 12 */ + bool unusedBit_21_12 : 1 {}; /** - offset 116 bit 13 */ - bool unusedBit_22_13 : 1 {}; + offset 92 bit 13 */ + bool unusedBit_21_13 : 1 {}; /** - offset 116 bit 14 */ - bool unusedBit_22_14 : 1 {}; + offset 92 bit 14 */ + bool unusedBit_21_14 : 1 {}; /** - offset 116 bit 15 */ - bool unusedBit_22_15 : 1 {}; + offset 92 bit 15 */ + bool unusedBit_21_15 : 1 {}; /** - offset 116 bit 16 */ - bool unusedBit_22_16 : 1 {}; + offset 92 bit 16 */ + bool unusedBit_21_16 : 1 {}; /** - offset 116 bit 17 */ - bool unusedBit_22_17 : 1 {}; + offset 92 bit 17 */ + bool unusedBit_21_17 : 1 {}; /** - offset 116 bit 18 */ - bool unusedBit_22_18 : 1 {}; + offset 92 bit 18 */ + bool unusedBit_21_18 : 1 {}; /** - offset 116 bit 19 */ - bool unusedBit_22_19 : 1 {}; + offset 92 bit 19 */ + bool unusedBit_21_19 : 1 {}; /** - offset 116 bit 20 */ - bool unusedBit_22_20 : 1 {}; + offset 92 bit 20 */ + bool unusedBit_21_20 : 1 {}; /** - offset 116 bit 21 */ - bool unusedBit_22_21 : 1 {}; + offset 92 bit 21 */ + bool unusedBit_21_21 : 1 {}; /** - offset 116 bit 22 */ - bool unusedBit_22_22 : 1 {}; + offset 92 bit 22 */ + bool unusedBit_21_22 : 1 {}; /** - offset 116 bit 23 */ - bool unusedBit_22_23 : 1 {}; + offset 92 bit 23 */ + bool unusedBit_21_23 : 1 {}; /** - offset 116 bit 24 */ - bool unusedBit_22_24 : 1 {}; + offset 92 bit 24 */ + bool unusedBit_21_24 : 1 {}; /** - offset 116 bit 25 */ - bool unusedBit_22_25 : 1 {}; + offset 92 bit 25 */ + bool unusedBit_21_25 : 1 {}; /** - offset 116 bit 26 */ - bool unusedBit_22_26 : 1 {}; + offset 92 bit 26 */ + bool unusedBit_21_26 : 1 {}; /** - offset 116 bit 27 */ - bool unusedBit_22_27 : 1 {}; + offset 92 bit 27 */ + bool unusedBit_21_27 : 1 {}; /** - offset 116 bit 28 */ - bool unusedBit_22_28 : 1 {}; + offset 92 bit 28 */ + bool unusedBit_21_28 : 1 {}; /** - offset 116 bit 29 */ - bool unusedBit_22_29 : 1 {}; + offset 92 bit 29 */ + bool unusedBit_21_29 : 1 {}; /** - offset 116 bit 30 */ - bool unusedBit_22_30 : 1 {}; + offset 92 bit 30 */ + bool unusedBit_21_30 : 1 {}; /** - offset 116 bit 31 */ - bool unusedBit_22_31 : 1 {}; + offset 92 bit 31 */ + bool unusedBit_21_31 : 1 {}; /** - * offset 120 + * offset 96 */ uint32_t startStopStateToggleCounter = (uint32_t)0; /** - * offset 124 + * offset 100 */ float egtValue1 = (float)0; /** - * offset 128 + * offset 104 */ float egtValue2 = (float)0; /** * User-defined RPM hard limit rpm - * offset 132 + * offset 108 */ int16_t desiredRpmLimit = (int16_t)0; /** * need 4 byte alignment units - * offset 134 + * offset 110 */ - uint8_t alignmentFill_at_134[2]; + uint8_t alignmentFill_at_110[2]; /** - * offset 136 + * offset 112 */ uint32_t fuelInjectionCounter = (uint32_t)0; /** - * offset 140 + * offset 116 */ uint32_t sparkCounter = (uint32_t)0; /** * @@GAUGE_NAME_FUEL_LOAD@@ - * offset 144 + * offset 120 */ float fuelingLoad = (float)0; /** * @@GAUGE_NAME_IGNITION_LOAD@@ - * offset 148 + * offset 124 */ float ignitionLoad = (float)0; /** % - * offset 152 + * offset 128 */ scaled_channel veTableYAxis = (uint16_t)0; /** * need 4 byte alignment units - * offset 154 + * offset 130 */ - uint8_t alignmentFill_at_154[2]; + uint8_t alignmentFill_at_130[2]; }; -static_assert(sizeof(engine_state_s) == 156); +static_assert(sizeof(engine_state_s) == 132); // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo/engine_state.txt Mon Jan 02 22:53:02 UTC 2023 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo/engine_state.txt Sat Jan 14 21:07:33 UTC 2023 diff --git a/firmware/controllers/algo/fuel/fuel_computer_generated.h b/firmware/controllers/algo/fuel/fuel_computer_generated.h index c7e1aef759..87f519ca8b 100644 --- a/firmware/controllers/algo/fuel/fuel_computer_generated.h +++ b/firmware/controllers/algo/fuel/fuel_computer_generated.h @@ -1,8 +1,44 @@ -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo/fuel/fuel_computer.txt Sat Jan 14 10:41:18 UTC 2023 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo/fuel/fuel_computer.txt Sat Jan 14 21:07:33 UTC 2023 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once #include "rusefi_types.h" +// start of running_fuel_s +struct running_fuel_s { + /** + * offset 0 + */ + float postCrankingFuelCorrection = (float)0; + /** + * @@GAUGE_NAME_FUEL_IAT_CORR@@ + * offset 4 + */ + float intakeTemperatureCoefficient = (float)0; + /** + * @@GAUGE_NAME_FUEL_CLT_CORR@@ + * offset 8 + */ + float coolantTemperatureCoefficient = (float)0; + /** + * offset 12 + */ + float timeSinceCrankingInSecs = (float)0; + /** + * offset 16 + */ + floatms_t baseFuel = (floatms_t)0; + /** + * Fuel: actual + * Actual injection duration with CLT, IAT and TPS acceleration corrections per cycle, as squirt duration. + * Without injector lag. + * @see baseFuel + * @see actualLastInjection + * offset 20 + */ + floatms_t fuel = (floatms_t)0; +}; +static_assert(sizeof(running_fuel_s) == 24); + // start of fuel_computer_s struct fuel_computer_s { /** @@ -10,135 +46,139 @@ struct fuel_computer_s { */ float totalFuelCorrection = (float)0; /** - % * offset 4 */ + running_fuel_s running; + /** + % + * offset 28 + */ scaled_channel afrTableYAxis = (uint16_t)0; /** * @@GAUGE_NAME_TARGET_LAMBDA@@ - * offset 6 + * offset 30 */ scaled_channel targetLambda = (uint16_t)0; /** * @@GAUGE_NAME_TARGET_AFR@@ ratio - * offset 8 + * offset 32 */ scaled_channel targetAFR = (uint16_t)0; /** * fuel: stoich ratio ratio - * offset 10 + * offset 34 */ scaled_channel stoichiometricRatio = (uint16_t)0; /** - * offset 12 + * offset 36 */ float sdTcharge_coff = (float)0; /** * SD cylinder mass * Speed-density logic: calculated air mass in one cylinder, in grams - * offset 16 + * offset 40 */ float sdAirMassInOneCylinder = (float)0; /** - offset 20 bit 0 */ + offset 44 bit 0 */ bool sdIsTChargeAirModel : 1 {}; /** - offset 20 bit 1 */ - bool unusedBit_8_1 : 1 {}; + offset 44 bit 1 */ + bool unusedBit_9_1 : 1 {}; /** - offset 20 bit 2 */ - bool unusedBit_8_2 : 1 {}; + offset 44 bit 2 */ + bool unusedBit_9_2 : 1 {}; /** - offset 20 bit 3 */ - bool unusedBit_8_3 : 1 {}; + offset 44 bit 3 */ + bool unusedBit_9_3 : 1 {}; /** - offset 20 bit 4 */ - bool unusedBit_8_4 : 1 {}; + offset 44 bit 4 */ + bool unusedBit_9_4 : 1 {}; /** - offset 20 bit 5 */ - bool unusedBit_8_5 : 1 {}; + offset 44 bit 5 */ + bool unusedBit_9_5 : 1 {}; /** - offset 20 bit 6 */ - bool unusedBit_8_6 : 1 {}; + offset 44 bit 6 */ + bool unusedBit_9_6 : 1 {}; /** - offset 20 bit 7 */ - bool unusedBit_8_7 : 1 {}; + offset 44 bit 7 */ + bool unusedBit_9_7 : 1 {}; /** - offset 20 bit 8 */ - bool unusedBit_8_8 : 1 {}; + offset 44 bit 8 */ + bool unusedBit_9_8 : 1 {}; /** - offset 20 bit 9 */ - bool unusedBit_8_9 : 1 {}; + offset 44 bit 9 */ + bool unusedBit_9_9 : 1 {}; /** - offset 20 bit 10 */ - bool unusedBit_8_10 : 1 {}; + offset 44 bit 10 */ + bool unusedBit_9_10 : 1 {}; /** - offset 20 bit 11 */ - bool unusedBit_8_11 : 1 {}; + offset 44 bit 11 */ + bool unusedBit_9_11 : 1 {}; /** - offset 20 bit 12 */ - bool unusedBit_8_12 : 1 {}; + offset 44 bit 12 */ + bool unusedBit_9_12 : 1 {}; /** - offset 20 bit 13 */ - bool unusedBit_8_13 : 1 {}; + offset 44 bit 13 */ + bool unusedBit_9_13 : 1 {}; /** - offset 20 bit 14 */ - bool unusedBit_8_14 : 1 {}; + offset 44 bit 14 */ + bool unusedBit_9_14 : 1 {}; /** - offset 20 bit 15 */ - bool unusedBit_8_15 : 1 {}; + offset 44 bit 15 */ + bool unusedBit_9_15 : 1 {}; /** - offset 20 bit 16 */ - bool unusedBit_8_16 : 1 {}; + offset 44 bit 16 */ + bool unusedBit_9_16 : 1 {}; /** - offset 20 bit 17 */ - bool unusedBit_8_17 : 1 {}; + offset 44 bit 17 */ + bool unusedBit_9_17 : 1 {}; /** - offset 20 bit 18 */ - bool unusedBit_8_18 : 1 {}; + offset 44 bit 18 */ + bool unusedBit_9_18 : 1 {}; /** - offset 20 bit 19 */ - bool unusedBit_8_19 : 1 {}; + offset 44 bit 19 */ + bool unusedBit_9_19 : 1 {}; /** - offset 20 bit 20 */ - bool unusedBit_8_20 : 1 {}; + offset 44 bit 20 */ + bool unusedBit_9_20 : 1 {}; /** - offset 20 bit 21 */ - bool unusedBit_8_21 : 1 {}; + offset 44 bit 21 */ + bool unusedBit_9_21 : 1 {}; /** - offset 20 bit 22 */ - bool unusedBit_8_22 : 1 {}; + offset 44 bit 22 */ + bool unusedBit_9_22 : 1 {}; /** - offset 20 bit 23 */ - bool unusedBit_8_23 : 1 {}; + offset 44 bit 23 */ + bool unusedBit_9_23 : 1 {}; /** - offset 20 bit 24 */ - bool unusedBit_8_24 : 1 {}; + offset 44 bit 24 */ + bool unusedBit_9_24 : 1 {}; /** - offset 20 bit 25 */ - bool unusedBit_8_25 : 1 {}; + offset 44 bit 25 */ + bool unusedBit_9_25 : 1 {}; /** - offset 20 bit 26 */ - bool unusedBit_8_26 : 1 {}; + offset 44 bit 26 */ + bool unusedBit_9_26 : 1 {}; /** - offset 20 bit 27 */ - bool unusedBit_8_27 : 1 {}; + offset 44 bit 27 */ + bool unusedBit_9_27 : 1 {}; /** - offset 20 bit 28 */ - bool unusedBit_8_28 : 1 {}; + offset 44 bit 28 */ + bool unusedBit_9_28 : 1 {}; /** - offset 20 bit 29 */ - bool unusedBit_8_29 : 1 {}; + offset 44 bit 29 */ + bool unusedBit_9_29 : 1 {}; /** - offset 20 bit 30 */ - bool unusedBit_8_30 : 1 {}; + offset 44 bit 30 */ + bool unusedBit_9_30 : 1 {}; /** - offset 20 bit 31 */ - bool unusedBit_8_31 : 1 {}; + offset 44 bit 31 */ + bool unusedBit_9_31 : 1 {}; }; -static_assert(sizeof(fuel_computer_s) == 24); +static_assert(sizeof(fuel_computer_s) == 48); // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo/fuel/fuel_computer.txt Sat Jan 14 10:41:18 UTC 2023 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo/fuel/fuel_computer.txt Sat Jan 14 21:07:33 UTC 2023 diff --git a/firmware/controllers/lua/generated/output_lookup_generated.cpp b/firmware/controllers/lua/generated/output_lookup_generated.cpp index a8b22260c4..9f0c0953f9 100644 --- a/firmware/controllers/lua/generated/output_lookup_generated.cpp +++ b/firmware/controllers/lua/generated/output_lookup_generated.cpp @@ -477,6 +477,18 @@ float getOutputValueByName(const char *name) { return engine->outputChannels.schedulingUsedCount; case -1779658835: return engine->fuelComputer.totalFuelCorrection; + case -1288205717: + return engine->fuelComputer.running.postCrankingFuelCorrection; + case 197173469: + return engine->fuelComputer.running.intakeTemperatureCoefficient; + case 1822238385: + return engine->fuelComputer.running.coolantTemperatureCoefficient; + case 526786951: + return engine->fuelComputer.running.timeSinceCrankingInSecs; + case -42886021: + return engine->fuelComputer.running.baseFuel; + case -794283008: + return engine->fuelComputer.running.fuel; case 995190836: return engine->fuelComputer.afrTableYAxis; case -734904659: @@ -537,18 +549,6 @@ float getOutputValueByName(const char *name) { return engine->engineState.crankingFuel.durationCoefficient; case -180401224: return engine->engineState.crankingFuel.fuel; - case -1288205717: - return engine->engineState.running.postCrankingFuelCorrection; - case 197173469: - return engine->engineState.running.intakeTemperatureCoefficient; - case 1822238385: - return engine->engineState.running.coolantTemperatureCoefficient; - case 526786951: - return engine->engineState.running.timeSinceCrankingInSecs; - case -42886021: - return engine->engineState.running.baseFuel; - case -794283008: - return engine->engineState.running.fuel; case -903101570: return engine->engineState.sparkDwell; case -1573373756: diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/AcControl.java b/java_console/models/src/main/java/com/rusefi/config/generated/AcControl.java index bdde965952..1c3c19e9c1 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/AcControl.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/AcControl.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/actuators/ac_control.txt Sat Jan 14 10:41:18 UTC 2023 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators/ac_control.txt Sat Jan 14 21:07:33 UTC 2023 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -401,17 +401,17 @@ public class AcControl { public static final int VM_VVT_INACTIVE = 0; public static final int VR_THRESHOLD_COUNT = 2; public static final int WWAE_TABLE_SIZE = 8; - public static final Field ACBUTTONSTATE = Field.create("ACBUTTONSTATE", 0, FieldType.BIT, 0).setBaseOffset(868); - public static final Field M_ACENABLED = Field.create("M_ACENABLED", 0, FieldType.BIT, 1).setBaseOffset(868); - public static final Field ENGINETOOSLOW = Field.create("ENGINETOOSLOW", 0, FieldType.BIT, 2).setBaseOffset(868); - public static final Field ENGINETOOFAST = Field.create("ENGINETOOFAST", 0, FieldType.BIT, 3).setBaseOffset(868); - public static final Field NOCLT = Field.create("NOCLT", 0, FieldType.BIT, 4).setBaseOffset(868); - public static final Field ENGINETOOHOT = Field.create("ENGINETOOHOT", 0, FieldType.BIT, 5).setBaseOffset(868); - public static final Field TPSTOOHIGH = Field.create("TPSTOOHIGH", 0, FieldType.BIT, 6).setBaseOffset(868); - public static final Field ISDISABLEDBYLUA = Field.create("ISDISABLEDBYLUA", 0, FieldType.BIT, 7).setBaseOffset(868); - public static final Field ACCOMPRESSORSTATE = Field.create("ACCOMPRESSORSTATE", 0, FieldType.BIT, 8).setBaseOffset(868); - public static final Field LATEST_USAGE_AC_CONTROL = Field.create("LATEST_USAGE_AC_CONTROL", 4, FieldType.INT).setScale(1.0).setBaseOffset(868); - public static final Field ACSWITCHLASTCHANGETIMEMS = Field.create("ACSWITCHLASTCHANGETIMEMS", 8, FieldType.INT).setScale(1.0).setBaseOffset(868); + public static final Field ACBUTTONSTATE = Field.create("ACBUTTONSTATE", 0, FieldType.BIT, 0).setBaseOffset(892); + public static final Field M_ACENABLED = Field.create("M_ACENABLED", 0, FieldType.BIT, 1).setBaseOffset(892); + public static final Field ENGINETOOSLOW = Field.create("ENGINETOOSLOW", 0, FieldType.BIT, 2).setBaseOffset(892); + public static final Field ENGINETOOFAST = Field.create("ENGINETOOFAST", 0, FieldType.BIT, 3).setBaseOffset(892); + public static final Field NOCLT = Field.create("NOCLT", 0, FieldType.BIT, 4).setBaseOffset(892); + public static final Field ENGINETOOHOT = Field.create("ENGINETOOHOT", 0, FieldType.BIT, 5).setBaseOffset(892); + public static final Field TPSTOOHIGH = Field.create("TPSTOOHIGH", 0, FieldType.BIT, 6).setBaseOffset(892); + public static final Field ISDISABLEDBYLUA = Field.create("ISDISABLEDBYLUA", 0, FieldType.BIT, 7).setBaseOffset(892); + public static final Field ACCOMPRESSORSTATE = Field.create("ACCOMPRESSORSTATE", 0, FieldType.BIT, 8).setBaseOffset(892); + public static final Field LATEST_USAGE_AC_CONTROL = Field.create("LATEST_USAGE_AC_CONTROL", 4, FieldType.INT).setScale(1.0).setBaseOffset(892); + public static final Field ACSWITCHLASTCHANGETIMEMS = Field.create("ACSWITCHLASTCHANGETIMEMS", 8, FieldType.INT).setScale(1.0).setBaseOffset(892); public static final Field[] VALUES = { ACBUTTONSTATE, M_ACENABLED, diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/AntilagSystem.java b/java_console/models/src/main/java/com/rusefi/config/generated/AntilagSystem.java index c7b76985a5..a706d9c310 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/AntilagSystem.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/AntilagSystem.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/antilag_system_state.txt Sat Jan 14 10:41:18 UTC 2023 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo/antilag_system_state.txt Sat Jan 14 21:07:33 UTC 2023 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -401,18 +401,18 @@ public class AntilagSystem { public static final int VM_VVT_INACTIVE = 0; public static final int VR_THRESHOLD_COUNT = 2; public static final int WWAE_TABLE_SIZE = 8; - public static final Field ISANTILAGCONDITION = Field.create("ISANTILAGCONDITION", 0, FieldType.BIT, 0).setBaseOffset(832); - public static final Field ALSMINRPMCONDITION = Field.create("ALSMINRPMCONDITION", 0, FieldType.BIT, 1).setBaseOffset(832); - public static final Field ALSMAXRPMCONDITION = Field.create("ALSMAXRPMCONDITION", 0, FieldType.BIT, 2).setBaseOffset(832); - public static final Field ALSMINCLTCONDITION = Field.create("ALSMINCLTCONDITION", 0, FieldType.BIT, 3).setBaseOffset(832); - public static final Field ALSMAXCLTCONDITION = Field.create("ALSMAXCLTCONDITION", 0, FieldType.BIT, 4).setBaseOffset(832); - public static final Field ALSMAXTHROTTLEINTENTCONDITION = Field.create("ALSMAXTHROTTLEINTENTCONDITION", 0, FieldType.BIT, 5).setBaseOffset(832); - public static final Field ISALSSWITCHACTIVATED = Field.create("ISALSSWITCHACTIVATED", 0, FieldType.BIT, 6).setBaseOffset(832); - public static final Field ALSACTIVATEPINSTATE = Field.create("ALSACTIVATEPINSTATE", 0, FieldType.BIT, 7).setBaseOffset(832); - public static final Field ALSSWITCHCONDITION = Field.create("ALSSWITCHCONDITION", 0, FieldType.BIT, 8).setBaseOffset(832); - public static final Field FUELALSCORRECTION = Field.create("FUELALSCORRECTION", 4, FieldType.FLOAT).setBaseOffset(832); - public static final Field TIMINGALSCORRECTION = Field.create("TIMINGALSCORRECTION", 8, FieldType.INT16).setScale(0.01).setBaseOffset(832); - public static final Field ALIGNMENTFILL_AT_10 = Field.create("ALIGNMENTFILL_AT_10", 10, FieldType.INT8).setScale(1.0).setBaseOffset(832); + public static final Field ISANTILAGCONDITION = Field.create("ISANTILAGCONDITION", 0, FieldType.BIT, 0).setBaseOffset(856); + public static final Field ALSMINRPMCONDITION = Field.create("ALSMINRPMCONDITION", 0, FieldType.BIT, 1).setBaseOffset(856); + public static final Field ALSMAXRPMCONDITION = Field.create("ALSMAXRPMCONDITION", 0, FieldType.BIT, 2).setBaseOffset(856); + public static final Field ALSMINCLTCONDITION = Field.create("ALSMINCLTCONDITION", 0, FieldType.BIT, 3).setBaseOffset(856); + public static final Field ALSMAXCLTCONDITION = Field.create("ALSMAXCLTCONDITION", 0, FieldType.BIT, 4).setBaseOffset(856); + public static final Field ALSMAXTHROTTLEINTENTCONDITION = Field.create("ALSMAXTHROTTLEINTENTCONDITION", 0, FieldType.BIT, 5).setBaseOffset(856); + public static final Field ISALSSWITCHACTIVATED = Field.create("ISALSSWITCHACTIVATED", 0, FieldType.BIT, 6).setBaseOffset(856); + public static final Field ALSACTIVATEPINSTATE = Field.create("ALSACTIVATEPINSTATE", 0, FieldType.BIT, 7).setBaseOffset(856); + public static final Field ALSSWITCHCONDITION = Field.create("ALSSWITCHCONDITION", 0, FieldType.BIT, 8).setBaseOffset(856); + public static final Field FUELALSCORRECTION = Field.create("FUELALSCORRECTION", 4, FieldType.FLOAT).setBaseOffset(856); + public static final Field TIMINGALSCORRECTION = Field.create("TIMINGALSCORRECTION", 8, FieldType.INT16).setScale(0.01).setBaseOffset(856); + public static final Field ALIGNMENTFILL_AT_10 = Field.create("ALIGNMENTFILL_AT_10", 10, FieldType.INT8).setScale(1.0).setBaseOffset(856); public static final Field[] VALUES = { ISANTILAGCONDITION, ALSMINRPMCONDITION, diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/BoostControl.java b/java_console/models/src/main/java/com/rusefi/config/generated/BoostControl.java index abe696a2fe..3ba04a28c9 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/BoostControl.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/BoostControl.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/actuators/boost_control.txt Sat Jan 14 10:41:18 UTC 2023 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators/boost_control.txt Sat Jan 14 21:07:33 UTC 2023 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -401,18 +401,18 @@ public class BoostControl { public static final int VM_VVT_INACTIVE = 0; public static final int VR_THRESHOLD_COUNT = 2; public static final int WWAE_TABLE_SIZE = 8; - public static final Field ISTPSINVALID = Field.create("ISTPSINVALID", 0, FieldType.BIT, 0).setBaseOffset(844); - public static final Field M_SHOULDRESETPID = Field.create("M_SHOULDRESETPID", 0, FieldType.BIT, 1).setBaseOffset(844); - public static final Field ISBELOWCLOSEDLOOPTHRESHOLD = Field.create("ISBELOWCLOSEDLOOPTHRESHOLD", 0, FieldType.BIT, 2).setBaseOffset(844); - public static final Field ISNOTCLOSEDLOOP = Field.create("ISNOTCLOSEDLOOP", 0, FieldType.BIT, 3).setBaseOffset(844); - public static final Field ISZERORPM = Field.create("ISZERORPM", 0, FieldType.BIT, 4).setBaseOffset(844); - public static final Field LUATARGETADD = Field.create("LUATARGETADD", 4, FieldType.FLOAT).setBaseOffset(844); - public static final Field LUATARGETMULT = Field.create("LUATARGETMULT", 8, FieldType.FLOAT).setBaseOffset(844); - public static final Field OPENLOOPPART = Field.create("OPENLOOPPART", 12, FieldType.FLOAT).setBaseOffset(844); - public static final Field LUAOPENLOOPADD = Field.create("LUAOPENLOOPADD", 16, FieldType.FLOAT).setBaseOffset(844); - public static final Field BOOSTCONTROLLERCLOSEDLOOPPART = Field.create("BOOSTCONTROLLERCLOSEDLOOPPART", 20, FieldType.INT8).setScale(0.5).setBaseOffset(844); - public static final Field ALIGNMENTFILL_AT_21 = Field.create("ALIGNMENTFILL_AT_21", 21, FieldType.INT8).setScale(1.0).setBaseOffset(844); - public static final Field BOOSTCONTROLTARGET = Field.create("BOOSTCONTROLTARGET", 22, FieldType.INT16).setScale(0.03333333333333333).setBaseOffset(844); + public static final Field ISTPSINVALID = Field.create("ISTPSINVALID", 0, FieldType.BIT, 0).setBaseOffset(868); + public static final Field M_SHOULDRESETPID = Field.create("M_SHOULDRESETPID", 0, FieldType.BIT, 1).setBaseOffset(868); + public static final Field ISBELOWCLOSEDLOOPTHRESHOLD = Field.create("ISBELOWCLOSEDLOOPTHRESHOLD", 0, FieldType.BIT, 2).setBaseOffset(868); + public static final Field ISNOTCLOSEDLOOP = Field.create("ISNOTCLOSEDLOOP", 0, FieldType.BIT, 3).setBaseOffset(868); + public static final Field ISZERORPM = Field.create("ISZERORPM", 0, FieldType.BIT, 4).setBaseOffset(868); + public static final Field LUATARGETADD = Field.create("LUATARGETADD", 4, FieldType.FLOAT).setBaseOffset(868); + public static final Field LUATARGETMULT = Field.create("LUATARGETMULT", 8, FieldType.FLOAT).setBaseOffset(868); + public static final Field OPENLOOPPART = Field.create("OPENLOOPPART", 12, FieldType.FLOAT).setBaseOffset(868); + public static final Field LUAOPENLOOPADD = Field.create("LUAOPENLOOPADD", 16, FieldType.FLOAT).setBaseOffset(868); + public static final Field BOOSTCONTROLLERCLOSEDLOOPPART = Field.create("BOOSTCONTROLLERCLOSEDLOOPPART", 20, FieldType.INT8).setScale(0.5).setBaseOffset(868); + public static final Field ALIGNMENTFILL_AT_21 = Field.create("ALIGNMENTFILL_AT_21", 21, FieldType.INT8).setScale(1.0).setBaseOffset(868); + public static final Field BOOSTCONTROLTARGET = Field.create("BOOSTCONTROLTARGET", 22, FieldType.INT16).setScale(0.03333333333333333).setBaseOffset(868); public static final Field[] VALUES = { ISTPSINVALID, M_SHOULDRESETPID, 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 168ecaaa07..aa17865326 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 Sat Jan 14 10:41:18 UTC 2023 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo/engine_state.txt Sat Jan 14 21:07:33 UTC 2023 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -401,56 +401,50 @@ public class EngineState { public static final int VM_VVT_INACTIVE = 0; public static final int VR_THRESHOLD_COUNT = 2; public static final int WWAE_TABLE_SIZE = 8; - public static final Field LUA_FUELADD = Field.create("LUA_FUELADD", 0, FieldType.FLOAT).setBaseOffset(892); - public static final Field LUA_FUELMULT = Field.create("LUA_FUELMULT", 4, FieldType.FLOAT).setBaseOffset(892); - public static final Field LUA_CLUTCHUPSTATE = Field.create("LUA_CLUTCHUPSTATE", 8, FieldType.BIT, 0).setBaseOffset(892); - public static final Field LUA_BRAKEPEDALSTATE = Field.create("LUA_BRAKEPEDALSTATE", 8, FieldType.BIT, 1).setBaseOffset(892); - public static final Field LUA_ACREQUESTSTATE = Field.create("LUA_ACREQUESTSTATE", 8, FieldType.BIT, 2).setBaseOffset(892); - public static final Field LUA_LUADISABLEETB = Field.create("LUA_LUADISABLEETB", 8, FieldType.BIT, 3).setBaseOffset(892); - public static final Field LUA_LUAIGNCUT = Field.create("LUA_LUAIGNCUT", 8, FieldType.BIT, 4).setBaseOffset(892); - public static final Field SD_TCHARGE = Field.create("SD_TCHARGE", 12, FieldType.FLOAT).setBaseOffset(892); - public static final Field SD_TCHARGEK = Field.create("SD_TCHARGEK", 16, FieldType.FLOAT).setBaseOffset(892); - public static final Field SD_AIRFLOW = Field.create("SD_AIRFLOW", 20, FieldType.FLOAT).setBaseOffset(892); - public static final Field ENGINECYCLEDURATIONMS = Field.create("ENGINECYCLEDURATIONMS", 24, FieldType.FLOAT).setBaseOffset(892); - public static final Field MINRPMKCURRENTTPS = Field.create("MINRPMKCURRENTTPS", 28, FieldType.FLOAT).setBaseOffset(892); - public static final Field CURRENTTPSADC = Field.create("CURRENTTPSADC", 32, FieldType.INT).setScale(1.0).setBaseOffset(892); - public static final Field TPSVOLTAGEMCU = Field.create("TPSVOLTAGEMCU", 36, FieldType.FLOAT).setBaseOffset(892); - public static final Field TPSVOLTAGEBOARD = Field.create("TPSVOLTAGEBOARD", 40, FieldType.FLOAT).setBaseOffset(892); - public static final Field CURRENTBAROCORRECTEDVE = Field.create("CURRENTBAROCORRECTEDVE", 44, FieldType.FLOAT).setBaseOffset(892); - public static final Field INJECTORFLOWCORRECTION = Field.create("INJECTORFLOWCORRECTION", 48, FieldType.FLOAT).setBaseOffset(892); - public static final Field BAROCORRECTION = Field.create("BAROCORRECTION", 52, FieldType.FLOAT).setBaseOffset(892); - public static final Field CRANKINGFUEL_BASEFUEL = Field.create("CRANKINGFUEL_BASEFUEL", 56, FieldType.FLOAT).setBaseOffset(892); - public static final Field CRANKINGFUEL_COOLANTTEMPERATURECOEFFICIENT = Field.create("CRANKINGFUEL_COOLANTTEMPERATURECOEFFICIENT", 60, FieldType.FLOAT).setBaseOffset(892); - public static final Field CRANKINGFUEL_TPSCOEFFICIENT = Field.create("CRANKINGFUEL_TPSCOEFFICIENT", 64, FieldType.FLOAT).setBaseOffset(892); - public static final Field CRANKINGFUEL_DURATIONCOEFFICIENT = Field.create("CRANKINGFUEL_DURATIONCOEFFICIENT", 68, FieldType.FLOAT).setBaseOffset(892); - public static final Field CRANKINGFUEL_FUEL = Field.create("CRANKINGFUEL_FUEL", 72, FieldType.FLOAT).setBaseOffset(892); - public static final Field RUNNING_POSTCRANKINGFUELCORRECTION = Field.create("RUNNING_POSTCRANKINGFUELCORRECTION", 76, FieldType.FLOAT).setBaseOffset(892); - public static final Field RUNNING_INTAKETEMPERATURECOEFFICIENT = Field.create("RUNNING_INTAKETEMPERATURECOEFFICIENT", 80, FieldType.FLOAT).setBaseOffset(892); - public static final Field RUNNING_COOLANTTEMPERATURECOEFFICIENT = Field.create("RUNNING_COOLANTTEMPERATURECOEFFICIENT", 84, FieldType.FLOAT).setBaseOffset(892); - public static final Field RUNNING_TIMESINCECRANKINGINSECS = Field.create("RUNNING_TIMESINCECRANKINGINSECS", 88, FieldType.FLOAT).setBaseOffset(892); - public static final Field RUNNING_BASEFUEL = Field.create("RUNNING_BASEFUEL", 92, FieldType.FLOAT).setBaseOffset(892); - public static final Field RUNNING_FUEL = Field.create("RUNNING_FUEL", 96, FieldType.FLOAT).setBaseOffset(892); - public static final Field SPARKDWELL = Field.create("SPARKDWELL", 100, FieldType.FLOAT).setBaseOffset(892); - public static final Field DWELLANGLE = Field.create("DWELLANGLE", 104, FieldType.FLOAT).setBaseOffset(892); - public static final Field CLTTIMINGCORRECTION = Field.create("CLTTIMINGCORRECTION", 108, FieldType.INT16).setScale(0.01).setBaseOffset(892); - public static final Field TIMINGIATCORRECTION = Field.create("TIMINGIATCORRECTION", 110, FieldType.INT16).setScale(0.01).setBaseOffset(892); - public static final Field TIMINGPIDCORRECTION = Field.create("TIMINGPIDCORRECTION", 112, FieldType.INT16).setScale(0.01).setBaseOffset(892); - public static final Field HELLENBOARDID = Field.create("HELLENBOARDID", 114, FieldType.INT16).setScale(1.0).setBaseOffset(892); - public static final Field CLUTCHUPSTATE = Field.create("CLUTCHUPSTATE", 116, FieldType.BIT, 0).setBaseOffset(892); - public static final Field CLUTCHDOWNSTATE = Field.create("CLUTCHDOWNSTATE", 116, FieldType.BIT, 1).setBaseOffset(892); - public static final Field BRAKEPEDALSTATE = Field.create("BRAKEPEDALSTATE", 116, FieldType.BIT, 2).setBaseOffset(892); - public static final Field STARTSTOPSTATE = Field.create("STARTSTOPSTATE", 116, FieldType.BIT, 3).setBaseOffset(892); - public static final Field STARTSTOPSTATETOGGLECOUNTER = Field.create("STARTSTOPSTATETOGGLECOUNTER", 120, FieldType.INT).setScale(1.0).setBaseOffset(892); - public static final Field EGTVALUE1 = Field.create("EGTVALUE1", 124, FieldType.FLOAT).setBaseOffset(892); - public static final Field EGTVALUE2 = Field.create("EGTVALUE2", 128, FieldType.FLOAT).setBaseOffset(892); - public static final Field DESIREDRPMLIMIT = Field.create("DESIREDRPMLIMIT", 132, FieldType.INT16).setScale(1.0).setBaseOffset(892); - public static final Field ALIGNMENTFILL_AT_134 = Field.create("ALIGNMENTFILL_AT_134", 134, FieldType.INT8).setScale(1.0).setBaseOffset(892); - public static final Field FUELINJECTIONCOUNTER = Field.create("FUELINJECTIONCOUNTER", 136, FieldType.INT).setScale(1.0).setBaseOffset(892); - public static final Field SPARKCOUNTER = Field.create("SPARKCOUNTER", 140, FieldType.INT).setScale(1.0).setBaseOffset(892); - public static final Field FUELINGLOAD = Field.create("FUELINGLOAD", 144, FieldType.FLOAT).setBaseOffset(892); - public static final Field IGNITIONLOAD = Field.create("IGNITIONLOAD", 148, FieldType.FLOAT).setBaseOffset(892); - public static final Field VETABLEYAXIS = Field.create("VETABLEYAXIS", 152, FieldType.INT16).setScale(0.01).setBaseOffset(892); - public static final Field ALIGNMENTFILL_AT_154 = Field.create("ALIGNMENTFILL_AT_154", 154, FieldType.INT8).setScale(1.0).setBaseOffset(892); + public static final Field LUA_FUELADD = Field.create("LUA_FUELADD", 0, FieldType.FLOAT).setBaseOffset(916); + public static final Field LUA_FUELMULT = Field.create("LUA_FUELMULT", 4, FieldType.FLOAT).setBaseOffset(916); + public static final Field LUA_CLUTCHUPSTATE = Field.create("LUA_CLUTCHUPSTATE", 8, FieldType.BIT, 0).setBaseOffset(916); + public static final Field LUA_BRAKEPEDALSTATE = Field.create("LUA_BRAKEPEDALSTATE", 8, FieldType.BIT, 1).setBaseOffset(916); + public static final Field LUA_ACREQUESTSTATE = Field.create("LUA_ACREQUESTSTATE", 8, FieldType.BIT, 2).setBaseOffset(916); + public static final Field LUA_LUADISABLEETB = Field.create("LUA_LUADISABLEETB", 8, FieldType.BIT, 3).setBaseOffset(916); + public static final Field LUA_LUAIGNCUT = Field.create("LUA_LUAIGNCUT", 8, FieldType.BIT, 4).setBaseOffset(916); + public static final Field SD_TCHARGE = Field.create("SD_TCHARGE", 12, FieldType.FLOAT).setBaseOffset(916); + public static final Field SD_TCHARGEK = Field.create("SD_TCHARGEK", 16, FieldType.FLOAT).setBaseOffset(916); + public static final Field SD_AIRFLOW = Field.create("SD_AIRFLOW", 20, FieldType.FLOAT).setBaseOffset(916); + public static final Field ENGINECYCLEDURATIONMS = Field.create("ENGINECYCLEDURATIONMS", 24, FieldType.FLOAT).setBaseOffset(916); + public static final Field MINRPMKCURRENTTPS = Field.create("MINRPMKCURRENTTPS", 28, FieldType.FLOAT).setBaseOffset(916); + public static final Field CURRENTTPSADC = Field.create("CURRENTTPSADC", 32, FieldType.INT).setScale(1.0).setBaseOffset(916); + public static final Field TPSVOLTAGEMCU = Field.create("TPSVOLTAGEMCU", 36, FieldType.FLOAT).setBaseOffset(916); + public static final Field TPSVOLTAGEBOARD = Field.create("TPSVOLTAGEBOARD", 40, FieldType.FLOAT).setBaseOffset(916); + public static final Field CURRENTBAROCORRECTEDVE = Field.create("CURRENTBAROCORRECTEDVE", 44, FieldType.FLOAT).setBaseOffset(916); + public static final Field INJECTORFLOWCORRECTION = Field.create("INJECTORFLOWCORRECTION", 48, FieldType.FLOAT).setBaseOffset(916); + public static final Field BAROCORRECTION = Field.create("BAROCORRECTION", 52, FieldType.FLOAT).setBaseOffset(916); + public static final Field CRANKINGFUEL_BASEFUEL = Field.create("CRANKINGFUEL_BASEFUEL", 56, FieldType.FLOAT).setBaseOffset(916); + public static final Field CRANKINGFUEL_COOLANTTEMPERATURECOEFFICIENT = Field.create("CRANKINGFUEL_COOLANTTEMPERATURECOEFFICIENT", 60, FieldType.FLOAT).setBaseOffset(916); + public static final Field CRANKINGFUEL_TPSCOEFFICIENT = Field.create("CRANKINGFUEL_TPSCOEFFICIENT", 64, FieldType.FLOAT).setBaseOffset(916); + public static final Field CRANKINGFUEL_DURATIONCOEFFICIENT = Field.create("CRANKINGFUEL_DURATIONCOEFFICIENT", 68, FieldType.FLOAT).setBaseOffset(916); + public static final Field CRANKINGFUEL_FUEL = Field.create("CRANKINGFUEL_FUEL", 72, FieldType.FLOAT).setBaseOffset(916); + public static final Field SPARKDWELL = Field.create("SPARKDWELL", 76, FieldType.FLOAT).setBaseOffset(916); + public static final Field DWELLANGLE = Field.create("DWELLANGLE", 80, FieldType.FLOAT).setBaseOffset(916); + public static final Field CLTTIMINGCORRECTION = Field.create("CLTTIMINGCORRECTION", 84, FieldType.INT16).setScale(0.01).setBaseOffset(916); + public static final Field TIMINGIATCORRECTION = Field.create("TIMINGIATCORRECTION", 86, FieldType.INT16).setScale(0.01).setBaseOffset(916); + public static final Field TIMINGPIDCORRECTION = Field.create("TIMINGPIDCORRECTION", 88, FieldType.INT16).setScale(0.01).setBaseOffset(916); + public static final Field HELLENBOARDID = Field.create("HELLENBOARDID", 90, FieldType.INT16).setScale(1.0).setBaseOffset(916); + public static final Field CLUTCHUPSTATE = Field.create("CLUTCHUPSTATE", 92, FieldType.BIT, 0).setBaseOffset(916); + public static final Field CLUTCHDOWNSTATE = Field.create("CLUTCHDOWNSTATE", 92, FieldType.BIT, 1).setBaseOffset(916); + public static final Field BRAKEPEDALSTATE = Field.create("BRAKEPEDALSTATE", 92, FieldType.BIT, 2).setBaseOffset(916); + public static final Field STARTSTOPSTATE = Field.create("STARTSTOPSTATE", 92, FieldType.BIT, 3).setBaseOffset(916); + public static final Field STARTSTOPSTATETOGGLECOUNTER = Field.create("STARTSTOPSTATETOGGLECOUNTER", 96, FieldType.INT).setScale(1.0).setBaseOffset(916); + public static final Field EGTVALUE1 = Field.create("EGTVALUE1", 100, FieldType.FLOAT).setBaseOffset(916); + public static final Field EGTVALUE2 = Field.create("EGTVALUE2", 104, FieldType.FLOAT).setBaseOffset(916); + public static final Field DESIREDRPMLIMIT = Field.create("DESIREDRPMLIMIT", 108, FieldType.INT16).setScale(1.0).setBaseOffset(916); + public static final Field ALIGNMENTFILL_AT_110 = Field.create("ALIGNMENTFILL_AT_110", 110, FieldType.INT8).setScale(1.0).setBaseOffset(916); + public static final Field FUELINJECTIONCOUNTER = Field.create("FUELINJECTIONCOUNTER", 112, FieldType.INT).setScale(1.0).setBaseOffset(916); + public static final Field SPARKCOUNTER = Field.create("SPARKCOUNTER", 116, FieldType.INT).setScale(1.0).setBaseOffset(916); + public static final Field FUELINGLOAD = Field.create("FUELINGLOAD", 120, FieldType.FLOAT).setBaseOffset(916); + public static final Field IGNITIONLOAD = Field.create("IGNITIONLOAD", 124, FieldType.FLOAT).setBaseOffset(916); + public static final Field VETABLEYAXIS = Field.create("VETABLEYAXIS", 128, FieldType.INT16).setScale(0.01).setBaseOffset(916); + public static final Field ALIGNMENTFILL_AT_130 = Field.create("ALIGNMENTFILL_AT_130", 130, FieldType.INT8).setScale(1.0).setBaseOffset(916); public static final Field[] VALUES = { LUA_FUELADD, LUA_FUELMULT, @@ -475,12 +469,6 @@ public class EngineState { CRANKINGFUEL_TPSCOEFFICIENT, CRANKINGFUEL_DURATIONCOEFFICIENT, CRANKINGFUEL_FUEL, - RUNNING_POSTCRANKINGFUELCORRECTION, - RUNNING_INTAKETEMPERATURECOEFFICIENT, - RUNNING_COOLANTTEMPERATURECOEFFICIENT, - RUNNING_TIMESINCECRANKINGINSECS, - RUNNING_BASEFUEL, - RUNNING_FUEL, SPARKDWELL, DWELLANGLE, CLTTIMINGCORRECTION, @@ -495,12 +483,12 @@ public class EngineState { EGTVALUE1, EGTVALUE2, DESIREDRPMLIMIT, - ALIGNMENTFILL_AT_134, + ALIGNMENTFILL_AT_110, FUELINJECTIONCOUNTER, SPARKCOUNTER, FUELINGLOAD, IGNITIONLOAD, VETABLEYAXIS, - ALIGNMENTFILL_AT_154, + ALIGNMENTFILL_AT_130, }; } diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/FanControl.java b/java_console/models/src/main/java/com/rusefi/config/generated/FanControl.java index 441cf2a410..6406924a17 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/FanControl.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/FanControl.java @@ -1,18 +1,18 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators/fan_control.txt Sat Jan 14 10:41:18 UTC 2023 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators/fan_control.txt Sat Jan 14 21:07:33 UTC 2023 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; public class FanControl { - public static final Field CRANKING = Field.create("CRANKING", 0, FieldType.BIT, 0).setBaseOffset(880); - public static final Field NOTRUNNING = Field.create("NOTRUNNING", 0, FieldType.BIT, 1).setBaseOffset(880); - public static final Field DISABLEDWHILEENGINESTOPPED = Field.create("DISABLEDWHILEENGINESTOPPED", 0, FieldType.BIT, 2).setBaseOffset(880); - public static final Field BROKENCLT = Field.create("BROKENCLT", 0, FieldType.BIT, 3).setBaseOffset(880); - public static final Field ENABLEDFORAC = Field.create("ENABLEDFORAC", 0, FieldType.BIT, 4).setBaseOffset(880); - public static final Field HOT = Field.create("HOT", 0, FieldType.BIT, 5).setBaseOffset(880); - public static final Field COLD = Field.create("COLD", 0, FieldType.BIT, 6).setBaseOffset(880); + public static final Field CRANKING = Field.create("CRANKING", 0, FieldType.BIT, 0).setBaseOffset(904); + public static final Field NOTRUNNING = Field.create("NOTRUNNING", 0, FieldType.BIT, 1).setBaseOffset(904); + public static final Field DISABLEDWHILEENGINESTOPPED = Field.create("DISABLEDWHILEENGINESTOPPED", 0, FieldType.BIT, 2).setBaseOffset(904); + public static final Field BROKENCLT = Field.create("BROKENCLT", 0, FieldType.BIT, 3).setBaseOffset(904); + public static final Field ENABLEDFORAC = Field.create("ENABLEDFORAC", 0, FieldType.BIT, 4).setBaseOffset(904); + public static final Field HOT = Field.create("HOT", 0, FieldType.BIT, 5).setBaseOffset(904); + public static final Field COLD = Field.create("COLD", 0, FieldType.BIT, 6).setBaseOffset(904); public static final Field[] VALUES = { CRANKING, NOTRUNNING, diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/FuelComputer.java b/java_console/models/src/main/java/com/rusefi/config/generated/FuelComputer.java index ec4d72147d..372ea212fd 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/FuelComputer.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/FuelComputer.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/fuel/fuel_computer.txt Sat Jan 14 10:41:18 UTC 2023 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo/fuel/fuel_computer.txt Sat Jan 14 21:07:33 UTC 2023 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -402,15 +402,27 @@ public class FuelComputer { public static final int VR_THRESHOLD_COUNT = 2; public static final int WWAE_TABLE_SIZE = 8; public static final Field TOTALFUELCORRECTION = Field.create("TOTALFUELCORRECTION", 0, FieldType.FLOAT).setBaseOffset(800); - public static final Field AFRTABLEYAXIS = Field.create("AFRTABLEYAXIS", 4, FieldType.INT16).setScale(0.01).setBaseOffset(800); - public static final Field TARGETLAMBDA = Field.create("TARGETLAMBDA", 6, FieldType.INT16).setScale(1.0E-4).setBaseOffset(800); - public static final Field TARGETAFR = Field.create("TARGETAFR", 8, FieldType.INT16).setScale(0.001).setBaseOffset(800); - public static final Field STOICHIOMETRICRATIO = Field.create("STOICHIOMETRICRATIO", 10, FieldType.INT16).setScale(0.001).setBaseOffset(800); - public static final Field SDTCHARGE_COFF = Field.create("SDTCHARGE_COFF", 12, FieldType.FLOAT).setBaseOffset(800); - public static final Field SDAIRMASSINONECYLINDER = Field.create("SDAIRMASSINONECYLINDER", 16, FieldType.FLOAT).setBaseOffset(800); - public static final Field SDISTCHARGEAIRMODEL = Field.create("SDISTCHARGEAIRMODEL", 20, FieldType.BIT, 0).setBaseOffset(800); + public static final Field RUNNING_POSTCRANKINGFUELCORRECTION = Field.create("RUNNING_POSTCRANKINGFUELCORRECTION", 4, FieldType.FLOAT).setBaseOffset(800); + public static final Field RUNNING_INTAKETEMPERATURECOEFFICIENT = Field.create("RUNNING_INTAKETEMPERATURECOEFFICIENT", 8, FieldType.FLOAT).setBaseOffset(800); + public static final Field RUNNING_COOLANTTEMPERATURECOEFFICIENT = Field.create("RUNNING_COOLANTTEMPERATURECOEFFICIENT", 12, FieldType.FLOAT).setBaseOffset(800); + public static final Field RUNNING_TIMESINCECRANKINGINSECS = Field.create("RUNNING_TIMESINCECRANKINGINSECS", 16, FieldType.FLOAT).setBaseOffset(800); + public static final Field RUNNING_BASEFUEL = Field.create("RUNNING_BASEFUEL", 20, FieldType.FLOAT).setBaseOffset(800); + public static final Field RUNNING_FUEL = Field.create("RUNNING_FUEL", 24, FieldType.FLOAT).setBaseOffset(800); + public static final Field AFRTABLEYAXIS = Field.create("AFRTABLEYAXIS", 28, FieldType.INT16).setScale(0.01).setBaseOffset(800); + public static final Field TARGETLAMBDA = Field.create("TARGETLAMBDA", 30, FieldType.INT16).setScale(1.0E-4).setBaseOffset(800); + public static final Field TARGETAFR = Field.create("TARGETAFR", 32, FieldType.INT16).setScale(0.001).setBaseOffset(800); + public static final Field STOICHIOMETRICRATIO = Field.create("STOICHIOMETRICRATIO", 34, FieldType.INT16).setScale(0.001).setBaseOffset(800); + public static final Field SDTCHARGE_COFF = Field.create("SDTCHARGE_COFF", 36, FieldType.FLOAT).setBaseOffset(800); + public static final Field SDAIRMASSINONECYLINDER = Field.create("SDAIRMASSINONECYLINDER", 40, FieldType.FLOAT).setBaseOffset(800); + public static final Field SDISTCHARGEAIRMODEL = Field.create("SDISTCHARGEAIRMODEL", 44, FieldType.BIT, 0).setBaseOffset(800); public static final Field[] VALUES = { TOTALFUELCORRECTION, + RUNNING_POSTCRANKINGFUELCORRECTION, + RUNNING_INTAKETEMPERATURECOEFFICIENT, + RUNNING_COOLANTTEMPERATURECOEFFICIENT, + RUNNING_TIMESINCECRANKINGINSECS, + RUNNING_BASEFUEL, + RUNNING_FUEL, AFRTABLEYAXIS, TARGETLAMBDA, TARGETAFR, diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/FuelPump.java b/java_console/models/src/main/java/com/rusefi/config/generated/FuelPump.java index aad9763964..22e5eb2571 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/FuelPump.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/FuelPump.java @@ -1,15 +1,15 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators/fuel_pump_control.txt Sat Jan 14 10:41:18 UTC 2023 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators/fuel_pump_control.txt Sat Jan 14 21:07:33 UTC 2023 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; public class FuelPump { - public static final Field ISPRIME = Field.create("ISPRIME", 0, FieldType.BIT, 0).setBaseOffset(884); - public static final Field ENGINETURNEDRECENTLY = Field.create("ENGINETURNEDRECENTLY", 0, FieldType.BIT, 1).setBaseOffset(884); - public static final Field ISFUELPUMPON = Field.create("ISFUELPUMPON", 0, FieldType.BIT, 2).setBaseOffset(884); - public static final Field IGNITIONON = Field.create("IGNITIONON", 0, FieldType.BIT, 3).setBaseOffset(884); + public static final Field ISPRIME = Field.create("ISPRIME", 0, FieldType.BIT, 0).setBaseOffset(908); + public static final Field ENGINETURNEDRECENTLY = Field.create("ENGINETURNEDRECENTLY", 0, FieldType.BIT, 1).setBaseOffset(908); + public static final Field ISFUELPUMPON = Field.create("ISFUELPUMPON", 0, FieldType.BIT, 2).setBaseOffset(908); + public static final Field IGNITIONON = Field.create("IGNITIONON", 0, FieldType.BIT, 3).setBaseOffset(908); public static final Field[] VALUES = { ISPRIME, ENGINETURNEDRECENTLY, diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/LaunchControl.java b/java_console/models/src/main/java/com/rusefi/config/generated/LaunchControl.java index 13ad3dee1d..fa773d1ca5 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/LaunchControl.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/LaunchControl.java @@ -1,22 +1,22 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo/launch_control_state.txt Sat Jan 14 10:41:18 UTC 2023 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo/launch_control_state.txt Sat Jan 14 21:07:33 UTC 2023 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; public class LaunchControl { - public static final Field RETARDTHRESHOLDRPM = Field.create("RETARDTHRESHOLDRPM", 0, FieldType.INT).setScale(1.0).setBaseOffset(824); - public static final Field COMBINEDCONDITIONS = Field.create("COMBINEDCONDITIONS", 4, FieldType.BIT, 0).setBaseOffset(824); - public static final Field LAUNCHACTIVATEPINSTATE = Field.create("LAUNCHACTIVATEPINSTATE", 4, FieldType.BIT, 1).setBaseOffset(824); - public static final Field ISLAUNCHCONDITION = Field.create("ISLAUNCHCONDITION", 4, FieldType.BIT, 2).setBaseOffset(824); - public static final Field ISSWITCHACTIVATED = Field.create("ISSWITCHACTIVATED", 4, FieldType.BIT, 3).setBaseOffset(824); - public static final Field ISCLUTCHACTIVATED = Field.create("ISCLUTCHACTIVATED", 4, FieldType.BIT, 4).setBaseOffset(824); - public static final Field ISVALIDINPUTPIN = Field.create("ISVALIDINPUTPIN", 4, FieldType.BIT, 5).setBaseOffset(824); - public static final Field ACTIVATESWITCHCONDITION = Field.create("ACTIVATESWITCHCONDITION", 4, FieldType.BIT, 6).setBaseOffset(824); - public static final Field RPMCONDITION = Field.create("RPMCONDITION", 4, FieldType.BIT, 7).setBaseOffset(824); - public static final Field SPEEDCONDITION = Field.create("SPEEDCONDITION", 4, FieldType.BIT, 8).setBaseOffset(824); - public static final Field TPSCONDITION = Field.create("TPSCONDITION", 4, FieldType.BIT, 9).setBaseOffset(824); + public static final Field RETARDTHRESHOLDRPM = Field.create("RETARDTHRESHOLDRPM", 0, FieldType.INT).setScale(1.0).setBaseOffset(848); + public static final Field COMBINEDCONDITIONS = Field.create("COMBINEDCONDITIONS", 4, FieldType.BIT, 0).setBaseOffset(848); + public static final Field LAUNCHACTIVATEPINSTATE = Field.create("LAUNCHACTIVATEPINSTATE", 4, FieldType.BIT, 1).setBaseOffset(848); + public static final Field ISLAUNCHCONDITION = Field.create("ISLAUNCHCONDITION", 4, FieldType.BIT, 2).setBaseOffset(848); + public static final Field ISSWITCHACTIVATED = Field.create("ISSWITCHACTIVATED", 4, FieldType.BIT, 3).setBaseOffset(848); + public static final Field ISCLUTCHACTIVATED = Field.create("ISCLUTCHACTIVATED", 4, FieldType.BIT, 4).setBaseOffset(848); + public static final Field ISVALIDINPUTPIN = Field.create("ISVALIDINPUTPIN", 4, FieldType.BIT, 5).setBaseOffset(848); + public static final Field ACTIVATESWITCHCONDITION = Field.create("ACTIVATESWITCHCONDITION", 4, FieldType.BIT, 6).setBaseOffset(848); + public static final Field RPMCONDITION = Field.create("RPMCONDITION", 4, FieldType.BIT, 7).setBaseOffset(848); + public static final Field SPEEDCONDITION = Field.create("SPEEDCONDITION", 4, FieldType.BIT, 8).setBaseOffset(848); + public static final Field TPSCONDITION = Field.create("TPSCONDITION", 4, FieldType.BIT, 9).setBaseOffset(848); public static final Field[] VALUES = { RETARDTHRESHOLDRPM, COMBINEDCONDITIONS, diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/MainRelay.java b/java_console/models/src/main/java/com/rusefi/config/generated/MainRelay.java index ea56b2c308..4af6b406ca 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/MainRelay.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/MainRelay.java @@ -1,15 +1,15 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators/main_relay.txt Sat Jan 14 10:41:18 UTC 2023 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators/main_relay.txt Sat Jan 14 21:07:33 UTC 2023 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; public class MainRelay { - public static final Field ISBENCHTEST = Field.create("ISBENCHTEST", 0, FieldType.BIT, 0).setBaseOffset(888); - public static final Field HASIGNITIONVOLTAGE = Field.create("HASIGNITIONVOLTAGE", 0, FieldType.BIT, 1).setBaseOffset(888); - public static final Field MAINRELAYSTATE = Field.create("MAINRELAYSTATE", 0, FieldType.BIT, 2).setBaseOffset(888); - public static final Field DELAYEDSHUTOFFREQUESTED = Field.create("DELAYEDSHUTOFFREQUESTED", 0, FieldType.BIT, 3).setBaseOffset(888); + public static final Field ISBENCHTEST = Field.create("ISBENCHTEST", 0, FieldType.BIT, 0).setBaseOffset(912); + public static final Field HASIGNITIONVOLTAGE = Field.create("HASIGNITIONVOLTAGE", 0, FieldType.BIT, 1).setBaseOffset(912); + public static final Field MAINRELAYSTATE = Field.create("MAINRELAYSTATE", 0, FieldType.BIT, 2).setBaseOffset(912); + public static final Field DELAYEDSHUTOFFREQUESTED = Field.create("DELAYEDSHUTOFFREQUESTED", 0, FieldType.BIT, 3).setBaseOffset(912); public static final Field[] VALUES = { ISBENCHTEST, HASIGNITIONVOLTAGE,